Skip to content

Commit 6084bfb

Browse files
committed
ggml : fix GGML_MAX_N_THREADS + improve formatting (ggml/969)
1 parent faac0ba commit 6084bfb

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

ggml/include/ggml.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,16 @@
229229
#define GGML_MAX_PARAMS 2048
230230
#define GGML_MAX_CONTEXTS 64
231231
#define GGML_MAX_SRC 10
232-
#ifndef GGML_MAX_NAME
233-
#define GGML_MAX_NAME 64
234232
#define GGML_MAX_N_THREADS 512
233+
#define GGML_MAX_OP_PARAMS 64
235234

235+
#ifndef GGML_MAX_NAME
236+
# define GGML_MAX_NAME 64
236237
#endif
237-
#define GGML_MAX_OP_PARAMS 64
238+
238239
#define GGML_DEFAULT_N_THREADS 4
239240
#define GGML_DEFAULT_GRAPH_SIZE 2048
241+
240242
#if UINTPTR_MAX == 0xFFFFFFFF
241243
#define GGML_MEM_ALIGN 4
242244
#else
@@ -259,21 +261,21 @@
259261
#define GGML_PAD(x, n) (((x) + (n) - 1) & ~((n) - 1))
260262

261263
#ifndef NDEBUG
262-
#define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
264+
# define GGML_UNREACHABLE() do { fprintf(stderr, "statement should be unreachable\n"); abort(); } while(0)
263265
#elif defined(__GNUC__)
264-
#define GGML_UNREACHABLE() __builtin_unreachable()
266+
# define GGML_UNREACHABLE() __builtin_unreachable()
265267
#elif defined(_MSC_VER)
266-
#define GGML_UNREACHABLE() __assume(0)
268+
# define GGML_UNREACHABLE() __assume(0)
267269
#else
268-
#define GGML_UNREACHABLE() ((void) 0)
270+
# define GGML_UNREACHABLE() ((void) 0)
269271
#endif
270272

271273
#ifdef __cplusplus
272-
#define GGML_NORETURN [[noreturn]]
274+
# define GGML_NORETURN [[noreturn]]
273275
#elif defined(_MSC_VER)
274-
#define GGML_NORETURN __declspec(noreturn)
276+
# define GGML_NORETURN __declspec(noreturn)
275277
#else
276-
#define GGML_NORETURN _Noreturn
278+
# define GGML_NORETURN _Noreturn
277279
#endif
278280

279281
#define GGML_ABORT(...) ggml_abort(__FILE__, __LINE__, __VA_ARGS__)

0 commit comments

Comments
 (0)