diff options
| author | Georgi Gerganov <ggerganov@gmail.com> | 2024-04-25 15:12:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 15:12:28 +0300 |
| commit | 54770413c484660d021dd51b5dbacab7880b8827 (patch) | |
| tree | 79ccb8884aa8f15aae6e5e68e64e96abd08712bc | |
| parent | aa750c1ede6232c91de890a14a7731d6daa2bc8e (diff) | |
ggml : fix MIN / MAX macros (#6904)
ggml-ci
| -rw-r--r-- | ggml-impl.h | 6 | ||||
| -rw-r--r-- | ggml-quants.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ggml-impl.h b/ggml-impl.h index 2ffacc29..2087f7de 100644 --- a/ggml-impl.h +++ b/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/ggml-quants.c b/ggml-quants.c index 11e11c21..c147531d 100644 --- a/ggml-quants.c +++ b/ggml-quants.c @@ -14,12 +14,6 @@ #include <stdlib.h> // for qsort #include <stdio.h> // 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 |