mirror of
https://github.com/ollama/ollama.git
synced 2026-04-26 10:45:57 +02:00
merge fixes
This commit is contained in:
@@ -3,7 +3,6 @@ package discover
|
|||||||
// Runner based GPU discovery
|
// Runner based GPU discovery
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ func (l GpuInfoList) FlashAttentionSupported() bool {
|
|||||||
supportsFA := gpu.Library == "cpu" ||
|
supportsFA := gpu.Library == "cpu" ||
|
||||||
gpu.Name == "Metal" || gpu.Library == "Metal" ||
|
gpu.Name == "Metal" || gpu.Library == "Metal" ||
|
||||||
(gpu.Library == "CUDA" && gpu.DriverMajor >= 7) ||
|
(gpu.Library == "CUDA" && gpu.DriverMajor >= 7) ||
|
||||||
gpu.Library == "ROCm"
|
gpu.Library == "ROCm" ||
|
||||||
gpu.Library == "Vulkan"
|
gpu.Library == "Vulkan"
|
||||||
|
|
||||||
if !supportsFA {
|
if !supportsFA {
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"maps"
|
"maps"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|||||||
Reference in New Issue
Block a user