From e9caab61a28ab0752832ca24a8152553b08801c6 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sat, 17 Feb 2024 17:50:39 +0200 Subject: [PATCH 1/2] ggml : no cpu_set_t on Android --- ggml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml.c b/ggml.c index 4e302fb7d..5dd3b086a 100644 --- a/ggml.c +++ b/ggml.c @@ -1959,7 +1959,7 @@ struct ggml_numa_nodes { uint32_t n_nodes; uint32_t total_cpus; // hardware threads on system uint32_t current_node; // node on which main process is execting -#ifdef __linux__ +#if defined(__linux__) && !defined(__ANDROID__) cpu_set_t cpuset; // cpuset from numactl #else uint32_t cpuset; // no NUMA support outside of Linux at this time. Use a portable datatype From 974e3cadff6aaedb0308d02fb0b7073f9dbed31b Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sat, 17 Feb 2024 18:14:35 +0200 Subject: [PATCH 2/2] ggml : try another fix --- ggml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml.c b/ggml.c index 5dd3b086a..d5a018c3b 100644 --- a/ggml.c +++ b/ggml.c @@ -1959,7 +1959,7 @@ struct ggml_numa_nodes { uint32_t n_nodes; uint32_t total_cpus; // hardware threads on system uint32_t current_node; // node on which main process is execting -#if defined(__linux__) && !defined(__ANDROID__) +#if defined(__linux__) && !defined(BIONIC) cpu_set_t cpuset; // cpuset from numactl #else uint32_t cpuset; // no NUMA support outside of Linux at this time. Use a portable datatype