ggml : fix MIN / MAX macros (llama/6904)

ggml-ci

diff --git a/src/ggml-impl.h b/src/ggml-impl.h
index 2ffacc299e4f186f48947bc694cee7820428342b..2087f7ded7b9977a006ed87e20f1d1f62f1ec642 100644 (file)
--- a/src/ggml-impl.h
+++ b/src/ggml-impl.h
@@ -11,6 +11,12 @@
 #include <string.h> // memcpy
 #include <math.h>   // fabsf
 
+#undef MIN
+#undef MAX
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/ggml-quants.c b/src/ggml-quants.c
index e4f96e399d49a9dbe54f9c9f534394f631077587..7d54730eecb5774ce563e0e9e7aa41f520741b3d 100644 (file)
--- a/src/ggml-quants.c
+++ b/src/ggml-quants.c
@@ -20,12 +20,6 @@
 #pragma warning(disable: 4244 4267)
 #endif
 
-#undef MIN
-#undef MAX
-
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
 #define UNUSED GGML_UNUSED
 
 // some compilers don't provide _mm256_set_m128i, e.g. gcc 7