ggml : fix GGML_MAX_N_THREADS + improve formatting (ggerganov#969)

bssrdf · Sep 24, 2024 · 5d80b25 · 5d80b25
1 parent 6cb634a
commit 5d80b25
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/include/ggml.h b/include/ggml.h
@@ -229,14 +229,16 @@
 #define GGML_MAX_PARAMS 2048
 #define GGML_MAX_CONTEXTS 64
 #define GGML_MAX_SRC 10
-#ifndef GGML_MAX_NAME
-#define GGML_MAX_NAME 64
 #define GGML_MAX_N_THREADS 512
+#define GGML_MAX_OP_PARAMS 64
 
+#ifndef GGML_MAX_NAME
+# define GGML_MAX_NAME 64
 #endif
-#define GGML_MAX_OP_PARAMS 64
+
 #define GGML_DEFAULT_N_THREADS 4
 #define GGML_DEFAULT_GRAPH_SIZE 2048
+
 #if UINTPTR_MAX == 0xFFFFFFFF
  #define GGML_MEM_ALIGN 4
 #else
@@ -259,21 +261,21 @@
 #define GGML_PAD(x, n) (((x) + (n) - 1) & ~((n) - 1))
 
 #ifndef NDEBUG
-#define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
+# define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
 #elif defined(__GNUC__)
-#define GGML_UNREACHABLE() __builtin_unreachable()
+# define GGML_UNREACHABLE() __builtin_unreachable()
 #elif defined(_MSC_VER)
-#define GGML_UNREACHABLE() __assume(0)
+# define GGML_UNREACHABLE() __assume(0)
 #else
-#define GGML_UNREACHABLE() ((void) 0)
+# define GGML_UNREACHABLE() ((void) 0)
 #endif
 
 #ifdef __cplusplus
-#define GGML_NORETURN [[noreturn]]
+# define GGML_NORETURN [[noreturn]]
 #elif defined(_MSC_VER)
-#define GGML_NORETURN __declspec(noreturn)
+# define GGML_NORETURN __declspec(noreturn)
 #else
-#define GGML_NORETURN _Noreturn
+# define GGML_NORETURN _Noreturn
 #endif
 
 #define GGML_ABORT(...) ggml_abort(__FILE__, __LINE__, __VA_ARGS__)