Merge pull request #1999 from lainedfles/termux_android_cpu_only

Fix CPU-only build under Android Termux enviornment.
This commit is contained in:
Daniel Hiltgen 2024-01-18 17:16:53 -08:00 committed by GitHub
commit 62976087c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -63,6 +63,7 @@ func initGPUHandles() {
// TODO - if the ollama build is CPU only, don't do these checks as they're irrelevant and confusing // TODO - if the ollama build is CPU only, don't do these checks as they're irrelevant and confusing
gpuHandles = &handles{nil, nil}
var cudaMgmtName string var cudaMgmtName string
var cudaMgmtPatterns []string var cudaMgmtPatterns []string
var rocmMgmtName string var rocmMgmtName string
@ -87,7 +88,6 @@ func initGPUHandles() {
} }
slog.Info("Detecting GPU type") slog.Info("Detecting GPU type")
gpuHandles = &handles{nil, nil}
cudaLibPaths := FindGPULibs(cudaMgmtName, cudaMgmtPatterns) cudaLibPaths := FindGPULibs(cudaMgmtName, cudaMgmtPatterns)
if len(cudaLibPaths) > 0 { if len(cudaLibPaths) > 0 {
cuda := LoadCUDAMgmt(cudaLibPaths) cuda := LoadCUDAMgmt(cudaLibPaths)