baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let gpu.go and gen_linux.sh also find CUDA on Arch Linux

Browse source
This commit is contained in:
Alexander F. Rødseth 2024-01-14 13:40:36 +01:00
parent 557110d0ba
commit f4bf1d514f
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gpu/gpu.go
View file

@ -39,6 +39,7 @@ var CudaLinuxGlobs = []string{
"/usr/lib/x86_64-linux-gnu/libnvidia-ml.so*", "/usr/lib/x86_64-linux-gnu/libnvidia-ml.so*",
"/usr/lib/wsl/lib/libnvidia-ml.so*", "/usr/lib/wsl/lib/libnvidia-ml.so*",
"/opt/cuda/lib64/libnvidia-ml.so*", "/opt/cuda/lib64/libnvidia-ml.so*",
"/opt/cuda/targets/x86_64-linux/lib/stubs/libnvidia-ml.so*",
"/usr/lib*/libnvidia-ml.so*", "/usr/lib*/libnvidia-ml.so*",
"/usr/local/lib*/libnvidia-ml.so*", "/usr/local/lib*/libnvidia-ml.so*",
"/usr/lib/aarch64-linux-gnu/nvidia/current/libnvidia-ml.so*", "/usr/lib/aarch64-linux-gnu/nvidia/current/libnvidia-ml.so*",

28
llm/generate/gen_linux.sh
View file

@ -109,31 +109,33 @@ else
echo "Skipping CPU generation step as requested" echo "Skipping CPU generation step as requested"
fi fi
if [ -d /usr/local/cuda/lib64/ ]; then for cudalibpath in "/usr/local/cuda/lib64" "/opt/cuda/targets/x86_64-linux/lib"; do
if [ -d "$cudalibpath" ]; then
echo "CUDA libraries detected - building dynamic CUDA library" echo "CUDA libraries detected - building dynamic CUDA library"
init_vars init_vars
CUDA_MAJOR=$(ls /usr/local/cuda/lib64/libcudart.so.* | head -1 | cut -f3 -d. || true) CUDA_MAJOR=$(find "$cudalibpath" -name 'libcudart.so.*' -print | head -1 | cut -f3 -d. || true)
if [ -n "${CUDA_MAJOR}" ]; then if [ -n "${CUDA_MAJOR}" ]; then
CUDA_VARIANT=_v${CUDA_MAJOR} CUDA_VARIANT="_v${CUDA_MAJOR}"
fi fi
CMAKE_DEFS="-DLLAMA_CUBLAS=on ${COMMON_CMAKE_DEFS} ${CMAKE_DEFS}" CMAKE_DEFS="-DLLAMA_CUBLAS=on ${COMMON_CMAKE_DEFS} ${CMAKE_DEFS}"
BUILD_DIR="${LLAMACPP_DIR}/build/linux/cuda${CUDA_VARIANT}" BUILD_DIR="${LLAMACPP_DIR}/build/linux/cuda${CUDA_VARIANT}"
CUDA_LIB_DIR=/usr/local/cuda/lib64 CUDA_LIB_DIR="$cudalibpath"
build build
install install
gcc -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.so \ gcc -fPIC -g -shared -o "${BUILD_DIR}/lib/libext_server.so" \
-Wl,--whole-archive \ -Wl,--whole-archive \
${BUILD_DIR}/lib/libext_server.a \ "${BUILD_DIR}/lib/libext_server.a" \
${BUILD_DIR}/lib/libcommon.a \ "${BUILD_DIR}/lib/libcommon.a" \
${BUILD_DIR}/lib/libllama.a \ "${BUILD_DIR}/lib/libllama.a" \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
${CUDA_LIB_DIR}/libcudart_static.a \ "${CUDA_LIB_DIR}/libcudart_static.a" \
${CUDA_LIB_DIR}/libcublas_static.a \ "${CUDA_LIB_DIR}/libcublas_static.a" \
${CUDA_LIB_DIR}/libcublasLt_static.a \ "${CUDA_LIB_DIR}/libcublasLt_static.a" \
${CUDA_LIB_DIR}/libcudadevrt.a \ "${CUDA_LIB_DIR}/libcudadevrt.a" \
${CUDA_LIB_DIR}/libculibos.a \ "${CUDA_LIB_DIR}/libculibos.a" \
-lrt -lpthread -ldl -lstdc++ -lm -lrt -lpthread -ldl -lstdc++ -lm
fi fi
done
if [ -z "${ROCM_PATH}" ]; then if [ -z "${ROCM_PATH}" ]; then
# Try the default location in case it exists # Try the default location in case it exists