Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
cpu: always ensure LibOllamaPath included (#12890)
Daniel Hiltgen3bee3af6ed6a
diff --git a/discover/runner.go b/discover/runner.goindex caaef222e..9ae5b3ffd 100644--- a/discover/runner.go+++ b/discover/runner.go@@ -53,7 +53,7 @@ func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.if eval, err := filepath.EvalSymlinks(exe); err == nil {exe = eval}- files, err := filepath.Glob(filepath.Join(LibOllamaPath, "*", "*ggml-*"))+ files, err := filepath.Glob(filepath.Join(ml.LibOllamaPath, "*", "*ggml-*"))if err != nil {slog.Debug("unable to lookup runner library directories", "error", err)}@@ -64,7 +64,7 @@ func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.// Our current packaging model places ggml-hip in the main directory// but keeps rocm in an isolated directory. We have to add it to// the [LD_LIBRARY_]PATH so ggml-hip will load properly- rocmDir = filepath.Join(LibOllamaPath, "rocm")+ rocmDir = filepath.Join(ml.LibOllamaPath, "rocm")if _, err := os.Stat(rocmDir); err != nil {rocmDir = ""}@@ -95,9 +95,9 @@ func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.}}if dir == "" {- dirs = []string{LibOllamaPath}+ dirs = []string{ml.LibOllamaPath}} else {- dirs = []string{LibOllamaPath, dir}+ dirs = []string{ml.LibOllamaPath, dir}}// ROCm can take a long time on some systems, so give it more time before giving up@@ -249,7 +249,7 @@ func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.libDirs = make(map[string]struct{})for _, dev := range devices {dir := dev.LibraryPath[len(dev.LibraryPath)-1]- if dir != LibOllamaPath {+ if dir != ml.LibOllamaPath {libDirs[dir] = struct{}{}}}@@ -339,7 +339,7 @@ func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.devFilter := ml.GetVisibleDevicesEnv(devices)for dir := range libDirs {- updatedDevices := bootstrapDevices(ctx, []string{LibOllamaPath, dir}, devFilter)+ updatedDevices := bootstrapDevices(ctx, []string{ml.LibOllamaPath, dir}, devFilter)for _, u := range updatedDevices {for i := range devices {if u.DeviceID == devices[i].DeviceID && u.PCIID == devices[i].PCIID {diff --git a/ml/device.go b/ml/device.goindex 57c3976bb..1fbe365e0 100644--- a/ml/device.go+++ b/ml/device.go@@ -361,7 +361,7 @@ func ByLibrary(l []DeviceInfo) [][]DeviceInfo {}func LibraryPaths(l []DeviceInfo) []string {- var gpuLibs []string+ gpuLibs := []string{LibOllamaPath}for _, gpu := range l {for _, dir := range gpu.LibraryPath {needed := truediff --git a/discover/path.go b/ml/path.gosimilarity index 98%rename from discover/path.gorename to ml/path.goindex 68e63009a..ac93af403 100644--- a/discover/path.go+++ b/ml/path.go@@ -1,4 +1,4 @@-package discover+package mlimport ("os"