vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 17:44:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'upstream' into concedo_experimental

Browse source 
# Conflicts:
#	.devops/full-cuda.Dockerfile
#	.devops/llama-cli-cann.Dockerfile
#	.devops/llama-cli-cuda.Dockerfile
#	.devops/llama-cli-intel.Dockerfile
#	.devops/llama-cli-musa.Dockerfile
#	.devops/llama-cli-vulkan.Dockerfile
#	.devops/llama-server-cuda.Dockerfile
#	.devops/llama-server-intel.Dockerfile
#	.devops/llama-server-musa.Dockerfile
#	.devops/llama-server-vulkan.Dockerfile
#	.gitignore
#	CMakeLists.txt
#	Makefile
#	cmake/llama-config.cmake.in
#	docs/backend/SYCL.md
#	docs/build.md
#	examples/llama-bench/llama-bench.cpp
#	flake.lock
#	ggml/CMakeLists.txt
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-backend.cpp
#	ggml/src/ggml-blas/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	ggml/src/ggml-cpu/ggml-cpu.c
#	ggml/src/ggml-cuda/CMakeLists.txt
#	ggml/src/ggml-hip/CMakeLists.txt
#	ggml/src/ggml-metal/CMakeLists.txt
#	ggml/src/ggml-musa/CMakeLists.txt
#	ggml/src/ggml-sycl/CMakeLists.txt
#	scripts/sync-ggml.last
#	tests/test-backend-ops.cpp
This commit is contained in:
Concedo 2024-11-21 16:26:24 +08:00
commit 091a432cf6
38 changed files with 167475 additions and 136736 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ggml/src/ggml-cpu/ggml-cpu.c
View file

@ -2372,15 +2372,15 @@ void ggml_numa_init(enum ggml_numa_strategy numa_flag) {
// figure out which node we're on
uint current_cpu;
int getcpu_ret = 0;
// #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 28) || defined(__COSMOPOLITAN__)
// getcpu_ret = getcpu(&current_cpu, &g_state.numa.current_node);
// #else
// // old glibc doesn't have a wrapper for this call. Fall back on direct syscall
// # if !defined(SYS_getcpu) && defined(SYS_get_cpu)
// # define SYS_getcpu SYS_get_cpu // some older glibc versions use this name
// # endif
// getcpu_ret = syscall(SYS_getcpu, &current_cpu, &g_state.numa.current_node);
// #endif
//#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 33) || defined(__COSMOPOLITAN__)
// getcpu_ret = getcpu(&current_cpu, &g_state.numa.current_node);
//#else
// // old glibc doesn't have a wrapper for this call. Fall back on direct syscall
//# if !defined(SYS_getcpu) && defined(SYS_get_cpu)
//# define SYS_getcpu SYS_get_cpu // some older glibc versions use this name
//# endif
// getcpu_ret = syscall(SYS_getcpu, &current_cpu, &g_state.numa.current_node);
//#endif
// koboldcpp fix: we don't use numa and this thing breaks runpod
if (g_state.numa.n_nodes < 1 || g_state.numa.total_cpus < 1 || getcpu_ret != 0) {