From 54770413c484660d021dd51b5dbacab7880b8827 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 25 Apr 2024 15:12:28 +0300 Subject: [PATCH] ggml : fix MIN / MAX macros (#6904) ggml-ci --- ggml-impl.h | 6 ++++++ ggml-quants.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ggml-impl.h b/ggml-impl.h index 2ffacc299..2087f7ded 100644 --- a/ggml-impl.h +++ b/ggml-impl.h @@ -11,6 +11,12 @@ #include // memcpy #include // 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/ggml-quants.c b/ggml-quants.c index 11e11c219..c147531df 100644 --- a/ggml-quants.c +++ b/ggml-quants.c @@ -14,12 +14,6 @@ #include // for qsort #include // for GGML_ASSERT -#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