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

ggml : fix MIN / MAX macro re-definition

Browse Source
This commit is contained in:
Georgi Gerganov 2023-11-07 16:08:46 +02:00
parent 2cdfc4e025
commit 0cbef75422
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ggml.c
View File

@ -143,12 +143,6 @@ void ggml_print_backtrace(void) {
} }
#endif #endif
#undef MIN
#undef MAX
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
/*#define GGML_PERF*/ /*#define GGML_PERF*/
#define GGML_DEBUG 0 #define GGML_DEBUG 0
#define GGML_GELU_FP16 #define GGML_GELU_FP16
@ -277,6 +271,12 @@ inline static void * ggml_aligned_malloc(size_t size) {
// floating point type used to accumulate sums // floating point type used to accumulate sums
typedef double ggml_float; typedef double ggml_float;
#undef MIN
#undef MAX
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
// //
// global data // global data
// //