From 47c356a6cdbd07a8560738bf54716243306a38cf Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 22 Sep 2024 13:27:17 -0400 Subject: [PATCH] disable avx while still allowing gpu support as per discussion for this issue and the most recent comment on how to fix this issue, at least temporarily, here: https://github.com/ollama/ollama/issues/2187#issuecomment-2262876198 --- gpu/cpu_common.go | 3 ++- llm/generate/gen_linux.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gpu/cpu_common.go b/gpu/cpu_common.go index 34edcdc5..68e8d3f0 100644 --- a/gpu/cpu_common.go +++ b/gpu/cpu_common.go @@ -17,7 +17,8 @@ func GetCPUCapability() CPUCapability { return CPUCapabilityAVX } // else LCD - return CPUCapabilityNone + //return CPUCapabilityNone + return CPUCapabilityAVX } func IsNUMA() bool { diff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.sh index 48d08fd0..0968abfa 100755 --- a/llm/generate/gen_linux.sh +++ b/llm/generate/gen_linux.sh @@ -52,7 +52,8 @@ if [ -z "${CUDACXX}" ]; then export CUDACXX=$(command -v nvcc) fi fi -COMMON_CMAKE_DEFS="-DCMAKE_SKIP_RPATH=on -DBUILD_SHARED_LIBS=on -DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_AVX=on -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off -DGGML_OPENMP=off" +# COMMON_CMAKE_DEFS="-DCMAKE_SKIP_RPATH=on -DBUILD_SHARED_LIBS=on -DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_AVX=on -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off -DGGML_OPENMP=off" +COMMON_CMAKE_DEFS="-DCMAKE_SKIP_RPATH=on -DBUILD_SHARED_LIBS=on -DCMAKE_POSITION_INDEPENDENT_CODE=on -DGGML_NATIVE=off -DGGML_AVX=off -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off -DGGML_OPENMP=off" source $(dirname $0)/gen_common.sh init_vars git_module_setup