mirror/whisper.cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2024-04-25 15:12:28 +03:00
parent 63fd148d8f
commit a15fb5cd79
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ggml-impl.h
View File

@ -11,6 +11,12 @@
#include <string.h> // memcpy #include <string.h> // memcpy
#include <math.h> // fabsf #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 #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

6
ggml-quants.c
View File

@ -20,12 +20,6 @@
#pragma warning(disable: 4244 4267) #pragma warning(disable: 4244 4267)
#endif #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 #define UNUSED GGML_UNUSED
// some compilers don't provide _mm256_set_m128i, e.g. gcc 7 // some compilers don't provide _mm256_set_m128i, e.g. gcc 7