orca-zhang
diff --git a/Collapse file
‎Makefile‎
Copy file name to clipboardExpand all lines: Makefile
+8Lines changed: 8 additions & 0 deletions b/Collapse file
‎Makefile‎
Copy file name to clipboardExpand all lines: Makefile
+8Lines changed: 8 additions & 0 deletions
diff --git a/Collapse file
‎ggml.c‎
Copy file name to clipboardExpand all lines: ggml.c
+1-3Lines changed: 1 addition & 3 deletions b/Collapse file
‎ggml.c‎
Copy file name to clipboardExpand all lines: ggml.c
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/Collapse file
‎llama-util.h‎
Copy file name to clipboardExpand all lines: llama-util.h
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎llama-util.h‎
Copy file name to clipboardExpand all lines: llama-util.h
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎llama.cpp‎
Copy file name to clipboardExpand all lines: llama.cpp
-8Lines changed: 0 additions & 8 deletions b/Collapse file
‎llama.cpp‎
Copy file name to clipboardExpand all lines: llama.cpp
-8Lines changed: 0 additions & 8 deletions
@@ -49,6 +49,14 @@ CFLAGS   = -I.              $(OPT) -std=c11   -fPIC
 CXXFLAGS = -I. -I./examples $(OPT) -std=c++11 -fPIC
 LDFLAGS  =
 
+# clock_gettime came in POSIX.1b (1993)
+# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
+# posix_memalign came in POSIX.1-2001 / SUSv3
+# M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985)
+# ref: https://github.com/ggerganov/whisper.cpp/pull/1027
+CFLAGS   += -D_XOPEN_SOURCE=600
+CXXFLAGS += -D_XOPEN_SOURCE=600
+
 ifdef LLAMA_DEBUG
 	CFLAGS   += -O0 -g
 	CXXFLAGS += -O0 -g
 
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE // Defines CLOCK_MONOTONIC on Linux
 #define _CRT_SECURE_NO_DEPRECATE // Disables ridiculous "unsafe" warnigns on Windows
 
 #include "ggml.h"
@@ -13387,8 +13386,7 @@ static void ggml_compute_forward_conv_2d_sk_p0_f16_f32(
     const int nk1 = ne01;
 
     // size of the convolution row - the kernel size unrolled across all channels
-    // round-up so it is more suitable for SIMD
-    const int ew0 = ggml_up32(nk0*nk1*ne02);
+    const int ew0 = nk0*nk1*ne02;
 
     GGML_ASSERT(nb00 == sizeof(ggml_fp16_t));
     GGML_ASSERT(nb10 == sizeof(float));
 
@@ -53,6 +53,7 @@ __attribute__((format(gnu_printf, 1, 2)))
 __attribute__((format(printf, 1, 2)))
 #endif
 #endif
+
 static std::string format(const char * fmt, ...) {
     va_list ap, ap2;
     va_start(ap, fmt);
 
@@ -1,11 +1,3 @@
-// Defines fileno on msys:
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#endif
-
 #include "llama-util.h"
 #include "llama.h"