Skip to content

Commit 4dc2e03

Browse files
committed
ggml : do not use _GNU_SOURCE gratuitously
1 parent 447ccbe commit 4dc2e03

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ CFLAGS = -I. $(OPT) -std=c11 -fPIC
4949
CXXFLAGS = -I. -I./examples $(OPT) -std=c++11 -fPIC
5050
LDFLAGS =
5151

52+
# clock_gettime came in POSIX.1b (1993)
53+
# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
54+
# posix_memalign came in POSIX.1-2001 / SUSv3
55+
# M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985)
56+
# ref: https://github.com/ggerganov/whisper.cpp/pull/1027
57+
CFLAGS += -D_XOPEN_SOURCE=600
58+
CXXFLAGS += -D_XOPEN_SOURCE=600
59+
5260
ifdef LLAMA_DEBUG
5361
CFLAGS += -O0 -g
5462
CXXFLAGS += -O0 -g

ggml.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define _GNU_SOURCE // Defines CLOCK_MONOTONIC on Linux
21
#define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
32

43
#include "ggml.h"
@@ -13387,8 +13386,7 @@ static void ggml_compute_forward_conv_2d_sk_p0_f16_f32(
1338713386
const int nk1 = ne01;
1338813387

1338913388
// size of the convolution row - the kernel size unrolled across all channels
13390-
// round-up so it is more suitable for SIMD
13391-
const int ew0 = ggml_up32(nk0*nk1*ne02);
13389+
const int ew0 = nk0*nk1*ne02;
1339213390

1339313391
GGML_ASSERT(nb00 == sizeof(ggml_fp16_t));
1339413392
GGML_ASSERT(nb10 == sizeof(float));

0 commit comments

Comments
 (0)