Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
4072b587
Unverified
Commit
4072b587
authored
Jan 28, 2024
by
Daniel Hiltgen
Committed by
GitHub
Jan 28, 2024
Browse files
Merge pull request #2246 from dhiltgen/reject_cuda_without_avx
Don't disable GPUs on arm without AVX
parents
f2245c7c
15562e88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
gpu/gpu.go
gpu/gpu.go
+4
-4
No files found.
gpu/gpu.go
View file @
4072b587
...
@@ -122,15 +122,15 @@ func GetGPUInfo() GpuInfo {
...
@@ -122,15 +122,15 @@ func GetGPUInfo() GpuInfo {
initGPUHandles
()
initGPUHandles
()
}
}
// All our GPU builds have AVX enabled, so fallback to CPU if we don't detect at least AVX
// All our GPU builds
on x86
have AVX enabled, so fallback to CPU if we don't detect at least AVX
cpuVariant
:=
GetCPUVariant
()
cpuVariant
:=
GetCPUVariant
()
if
cpuVariant
==
""
{
if
cpuVariant
==
""
&&
runtime
.
GOARCH
==
"amd64"
{
slog
.
Warn
(
"CPU does not have AVX or AVX2, disabling GPU support."
)
slog
.
Warn
(
"CPU does not have AVX or AVX2, disabling GPU support."
)
}
}
var
memInfo
C
.
mem_info_t
var
memInfo
C
.
mem_info_t
resp
:=
GpuInfo
{}
resp
:=
GpuInfo
{}
if
gpuHandles
.
cuda
!=
nil
&&
cpuVariant
!=
""
{
if
gpuHandles
.
cuda
!=
nil
&&
(
cpuVariant
!=
""
||
runtime
.
GOARCH
!=
"amd64"
)
{
C
.
cuda_check_vram
(
*
gpuHandles
.
cuda
,
&
memInfo
)
C
.
cuda_check_vram
(
*
gpuHandles
.
cuda
,
&
memInfo
)
if
memInfo
.
err
!=
nil
{
if
memInfo
.
err
!=
nil
{
slog
.
Info
(
fmt
.
Sprintf
(
"error looking up CUDA GPU memory: %s"
,
C
.
GoString
(
memInfo
.
err
)))
slog
.
Info
(
fmt
.
Sprintf
(
"error looking up CUDA GPU memory: %s"
,
C
.
GoString
(
memInfo
.
err
)))
...
@@ -149,7 +149,7 @@ func GetGPUInfo() GpuInfo {
...
@@ -149,7 +149,7 @@ func GetGPUInfo() GpuInfo {
slog
.
Info
(
fmt
.
Sprintf
(
"CUDA GPU is too old. Falling back to CPU mode. Compute Capability detected: %d.%d"
,
cc
.
major
,
cc
.
minor
))
slog
.
Info
(
fmt
.
Sprintf
(
"CUDA GPU is too old. Falling back to CPU mode. Compute Capability detected: %d.%d"
,
cc
.
major
,
cc
.
minor
))
}
}
}
}
}
else
if
gpuHandles
.
rocm
!=
nil
&&
cpuVariant
!=
""
{
}
else
if
gpuHandles
.
rocm
!=
nil
&&
(
cpuVariant
!=
""
||
runtime
.
GOARCH
!=
"amd64"
)
{
C
.
rocm_check_vram
(
*
gpuHandles
.
rocm
,
&
memInfo
)
C
.
rocm_check_vram
(
*
gpuHandles
.
rocm
,
&
memInfo
)
if
memInfo
.
err
!=
nil
{
if
memInfo
.
err
!=
nil
{
slog
.
Info
(
fmt
.
Sprintf
(
"error looking up ROCm GPU memory: %s"
,
C
.
GoString
(
memInfo
.
err
)))
slog
.
Info
(
fmt
.
Sprintf
(
"error looking up ROCm GPU memory: %s"
,
C
.
GoString
(
memInfo
.
err
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment