fix the threads number larger than numa node numbers

boltliu85 · boltliu85 · commit 23fe7d38d2c5 · 2025-05-20T10:04:52.000Z
diff --git a/ggml/src/ggml-cpu/ggml-cpu.c b/ggml/src/ggml-cpu/ggml-cpu.c
@@ -593,7 +593,7 @@ void ggml_barrier_numa_aware(struct ggml_threadpool * tp, int ith, int node_n) {
     int cores_per_numa = g_state.numa.nodes[0].n_cpus;
     int numa_nodes = n_threads / cores_per_numa;
     int remaining_cores = n_threads % cores_per_numa;
-    if (numa_nodes <= 1 || remaining_cores) {
+    if ((numa_nodes != GGML_NUMA_MIGRATE_NODES) || remaining_cores) {
         ggml_barrier(tp);
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ void ggml_barrier_numa_aware(struct ggml_threadpool * tp, int ith, int node_n) {`
`593`	`593`	`int cores_per_numa = g_state.numa.nodes[0].n_cpus;`
`594`	`594`	`int numa_nodes = n_threads / cores_per_numa;`
`595`	`595`	`int remaining_cores = n_threads % cores_per_numa;`
`596`		`- if (numa_nodes <= 1 \|\| remaining_cores) {`
	`596`	`+ if ((numa_nodes != GGML_NUMA_MIGRATE_NODES) \|\| remaining_cores) {`
`597`	`597`	`ggml_barrier(tp);`
`598`	`598`	`return;`
`599`	`599`	`}`