mirror of
https://github.com/ollama/ollama.git
synced 2026-04-26 02:36:09 +02:00
merge fixes
This commit is contained in:
@@ -3,7 +3,6 @@ package discover
|
||||
// Runner based GPU discovery
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -18,7 +18,6 @@ import (
|
||||
"log/slog"
|
||||
"maps"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"slices"
|
||||
"strconv"
|
||||
|
||||
Reference in New Issue
Block a user