ggerganov commited on
Commit
ad34655
·
1 Parent(s): 2dafb8e

ggml : fix GGML_MAX_N_THREADS + improve formatting (ggml/969)

Browse files
Files changed (1) hide show
  1. ggml/include/ggml.h +12 -10
ggml/include/ggml.h CHANGED
@@ -229,14 +229,16 @@
229
  #define GGML_MAX_PARAMS 2048
230
  #define GGML_MAX_CONTEXTS 64
231
  #define GGML_MAX_SRC 10
232
- #ifndef GGML_MAX_NAME
233
- #define GGML_MAX_NAME 64
234
  #define GGML_MAX_N_THREADS 512
 
235
 
 
 
236
  #endif
237
- #define GGML_MAX_OP_PARAMS 64
238
  #define GGML_DEFAULT_N_THREADS 4
239
  #define GGML_DEFAULT_GRAPH_SIZE 2048
 
240
  #if UINTPTR_MAX == 0xFFFFFFFF
241
  #define GGML_MEM_ALIGN 4
242
  #else
@@ -259,21 +261,21 @@
259
  #define GGML_PAD(x, n) (((x) + (n) - 1) & ~((n) - 1))
260
 
261
  #ifndef NDEBUG
262
- #define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
263
  #elif defined(__GNUC__)
264
- #define GGML_UNREACHABLE() __builtin_unreachable()
265
  #elif defined(_MSC_VER)
266
- #define GGML_UNREACHABLE() __assume(0)
267
  #else
268
- #define GGML_UNREACHABLE() ((void) 0)
269
  #endif
270
 
271
  #ifdef __cplusplus
272
- #define GGML_NORETURN [[noreturn]]
273
  #elif defined(_MSC_VER)
274
- #define GGML_NORETURN __declspec(noreturn)
275
  #else
276
- #define GGML_NORETURN _Noreturn
277
  #endif
278
 
279
  #define GGML_ABORT(...) ggml_abort(__FILE__, __LINE__, __VA_ARGS__)
 
229
  #define GGML_MAX_PARAMS 2048
230
  #define GGML_MAX_CONTEXTS 64
231
  #define GGML_MAX_SRC 10
 
 
232
  #define GGML_MAX_N_THREADS 512
233
+ #define GGML_MAX_OP_PARAMS 64
234
 
235
+ #ifndef GGML_MAX_NAME
236
+ # define GGML_MAX_NAME 64
237
  #endif
238
+
239
  #define GGML_DEFAULT_N_THREADS 4
240
  #define GGML_DEFAULT_GRAPH_SIZE 2048
241
+
242
  #if UINTPTR_MAX == 0xFFFFFFFF
243
  #define GGML_MEM_ALIGN 4
244
  #else
 
261
  #define GGML_PAD(x, n) (((x) + (n) - 1) & ~((n) - 1))
262
 
263
  #ifndef NDEBUG
264
+ # define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
265
  #elif defined(__GNUC__)
266
+ # define GGML_UNREACHABLE() __builtin_unreachable()
267
  #elif defined(_MSC_VER)
268
+ # define GGML_UNREACHABLE() __assume(0)
269
  #else
270
+ # define GGML_UNREACHABLE() ((void) 0)
271
  #endif
272
 
273
  #ifdef __cplusplus
274
+ # define GGML_NORETURN [[noreturn]]
275
  #elif defined(_MSC_VER)
276
+ # define GGML_NORETURN __declspec(noreturn)
277
  #else
278
+ # define GGML_NORETURN _Noreturn
279
  #endif
280
 
281
  #define GGML_ABORT(...) ggml_abort(__FILE__, __LINE__, __VA_ARGS__)