Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-12 05:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

common : try to fix Android CI (#6780)

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

* common : another try
This commit is contained in:
Georgi Gerganov 2024-04-20 13:27:12 +03:00 committed by GitHub
parent 0e4802b2ec
commit aed82f6837
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common.cpp
View File

@ -108,7 +108,7 @@ int32_t get_num_physical_cores() {
return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4; 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> #include <pthread.h>
static void cpuid(unsigned leaf, unsigned subleaf, 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. * Returns number of CPUs on system that are useful for math.
*/ */
int get_math_cpu_count() { 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); int cpu_count = sysconf(_SC_NPROCESSORS_ONLN);
if (cpu_count < 1) { if (cpu_count < 1) {
return get_num_physical_cores(); return get_num_physical_cores();