ggerganov commited on
Commit
1344fc4
·
unverified ·
1 Parent(s): 9908abb

ggml : fix MIN / MAX macro re-definition

Browse files
Files changed (1) hide show
  1. ggml.c +6 -6
ggml.c CHANGED
@@ -143,12 +143,6 @@ void ggml_print_backtrace(void) {
143
  }
144
  #endif
145
 
146
- #undef MIN
147
- #undef MAX
148
-
149
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
150
- #define MAX(a, b) ((a) > (b) ? (a) : (b))
151
-
152
  /*#define GGML_PERF*/
153
  #define GGML_DEBUG 0
154
  #define GGML_GELU_FP16
@@ -277,6 +271,12 @@ inline static void * ggml_aligned_malloc(size_t size) {
277
  // floating point type used to accumulate sums
278
  typedef double ggml_float;
279
 
 
 
 
 
 
 
280
  //
281
  // global data
282
  //
 
143
  }
144
  #endif
145
 
 
 
 
 
 
 
146
  /*#define GGML_PERF*/
147
  #define GGML_DEBUG 0
148
  #define GGML_GELU_FP16
 
271
  // floating point type used to accumulate sums
272
  typedef double ggml_float;
273
 
274
+ #undef MIN
275
+ #undef MAX
276
+
277
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
278
+ #define MAX(a, b) ((a) > (b) ? (a) : (b))
279
+
280
  //
281
  // global data
282
  //