From: Georgi Gerganov <redacted>
Date: Sat, 20 Apr 2024 10:27:12 +0000 (+0300)
Subject: common : try to fix Android CI (#6780)
X-Git-Tag: upstream/0.0.4488~1787
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=aed82f6837a3ea515f4d50201cfc77effc7d41b4;p=pkg%2Fggml%2Fsources%2Fllama.cpp

common : try to fix Android CI (#6780)

* common : disable get_math_cpu_count() until Android CI gets fixed

* common : another try
---

diff --git a/common/common.cpp b/common/common.cpp
index cf69535e..b6143e41 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -108,7 +108,7 @@ int32_t get_num_physical_cores() {
     return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4;
 }
 
-#if defined(__x86_64__) && defined(__linux__)
+#if defined(__x86_64__) && defined(__linux__) && !defined(__ANDROID__)
 #include <pthread.h>
 
 static void cpuid(unsigned leaf, unsigned subleaf,
@@ -162,7 +162,7 @@ static int count_math_cpus(int cpu_count) {
  * Returns number of CPUs on system that are useful for math.
  */
 int get_math_cpu_count() {
-#if defined(__x86_64__) && defined(__linux__)
+#if defined(__x86_64__) && defined(__linux__) && !defined(__ANDROID__)
     int cpu_count = sysconf(_SC_NPROCESSORS_ONLN);
     if (cpu_count < 1) {
         return get_num_physical_cores();