vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common : disable get_math_cpu_count() until Android CI gets fixed

Browse source
This commit is contained in:
Georgi Gerganov 2024-04-20 11:20:07 +03:00
parent 0e4802b2ec
commit 0a86385703
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/common.cpp
View file

@ -108,7 +108,9 @@ 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__) // TODO: disabled until Android CI is fixed
// https://github.com/ggerganov/llama.cpp/pull/6780
#if defined(__x86_64__) && defined(__linux__) && defined(__TMP_DISABLED__)
#include <pthread.h> #include <pthread.h>
static void cpuid(unsigned leaf, unsigned subleaf, static void cpuid(unsigned leaf, unsigned subleaf,
@ -162,7 +164,9 @@ 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__) // TODO: disabled until Android CI is fixed
// https://github.com/ggerganov/llama.cpp/pull/6780
#if defined(__x86_64__) && defined(__linux__) && defined(__TMP_DISABLED__)
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();