From c4d8c75e542324dab82b939a4e75b6e9d3de9820 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 4 Oct 2025 15:27:52 +0200 Subject: [PATCH] merge fixes --- discover/runner.go | 1 - discover/types.go | 2 +- ml/backend/ggml/ggml.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/discover/runner.go b/discover/runner.go index d173959ad..e9d34ba8d 100644 --- a/discover/runner.go +++ b/discover/runner.go @@ -3,7 +3,6 @@ package discover // Runner based GPU discovery import ( - "bytes" "context" "encoding/json" "fmt" diff --git a/discover/types.go b/discover/types.go index bbd22a13d..a294f26b7 100644 --- a/discover/types.go +++ b/discover/types.go @@ -174,7 +174,7 @@ func (l GpuInfoList) FlashAttentionSupported() bool { supportsFA := gpu.Library == "cpu" || gpu.Name == "Metal" || gpu.Library == "Metal" || (gpu.Library == "CUDA" && gpu.DriverMajor >= 7) || - gpu.Library == "ROCm" + gpu.Library == "ROCm" || gpu.Library == "Vulkan" if !supportsFA { diff --git a/ml/backend/ggml/ggml.go b/ml/backend/ggml/ggml.go index ccdee03c0..dc71c8de4 100644 --- a/ml/backend/ggml/ggml.go +++ b/ml/backend/ggml/ggml.go @@ -18,7 +18,6 @@ import ( "log/slog" "maps" "os" - "path/filepath" "runtime" "slices" "strconv"