Skip to content

Commit 0a86385

Browse files
committed
common : disable get_math_cpu_count() until Android CI gets fixed
1 parent 0e4802b commit 0a86385

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

common/common.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ int32_t get_num_physical_cores() {
108108
return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4;
109109
}
110110

111-
#if defined(__x86_64__) && defined(__linux__)
111+
// TODO: disabled until Android CI is fixed
112+
// https://github.com/ggerganov/llama.cpp/pull/6780
113+
#if defined(__x86_64__) && defined(__linux__) && defined(__TMP_DISABLED__)
112114
#include <pthread.h>
113115

114116
static void cpuid(unsigned leaf, unsigned subleaf,
@@ -162,7 +164,9 @@ static int count_math_cpus(int cpu_count) {
162164
* Returns number of CPUs on system that are useful for math.
163165
*/
164166
int get_math_cpu_count() {
165-
#if defined(__x86_64__) && defined(__linux__)
167+
// TODO: disabled until Android CI is fixed
168+
// https://github.com/ggerganov/llama.cpp/pull/6780
169+
#if defined(__x86_64__) && defined(__linux__) && defined(__TMP_DISABLED__)
166170
int cpu_count = sysconf(_SC_NPROCESSORS_ONLN);
167171
if (cpu_count < 1) {
168172
return get_num_physical_cores();

0 commit comments

Comments
 (0)