diff --git a/images/gpu/ollama/Dockerfile b/images/gpu/ollama/Dockerfile index 079fb3b20..ff7d72db3 100644 --- a/images/gpu/ollama/Dockerfile +++ b/images/gpu/ollama/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/r/ollama/ollama -FROM ollama/ollama:0.1.13 +FROM ollama/ollama:0.1.26 ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin ENV OLLAMA_ORIGINS=* diff --git a/images/gpu/ollama/Dockerfile.bench b/images/gpu/ollama/bench/Dockerfile similarity index 88% rename from images/gpu/ollama/Dockerfile.bench rename to images/gpu/ollama/bench/Dockerfile index 59e7fc904..7ca9d194c 100644 --- a/images/gpu/ollama/Dockerfile.bench +++ b/images/gpu/ollama/bench/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/r/ollama/ollama -FROM ollama/ollama:0.1.18 +FROM ollama/ollama:0.1.26 ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin ENV OLLAMA_ORIGINS=* @@ -19,6 +19,8 @@ RUN bash -c ' \ ollama pull llama2:70b-chat && \ ollama pull mistral:7b-instruct && \ ollama pull mixtral:instruct && \ + ollama pull gemma:2b-instruct && \ + ollama pull gemma:7b-instruct && \ kill "$serverpid" && \ wait "$serverpid" \ ' diff --git a/test/gpu/ollama/ollama.go b/test/gpu/ollama/ollama.go index 1cab3443f..fb3ef520d 100644 --- a/test/gpu/ollama/ollama.go +++ b/test/gpu/ollama/ollama.go @@ -123,9 +123,9 @@ func New(ctx context.Context, server Server, logger testutil.Logger) (*Ollama, e return nil, fmt.Errorf("could not get logs: %w", err) } switch { - case strings.Contains(logs, "check that you have installed GPU drivers"): + case strings.Contains(logs, "no GPU detected"): llm.HasGPU = false - case strings.Contains(logs, "VRAM available"): + case strings.Contains(logs, "Nvidia GPU detected"): llm.HasGPU = true default: return nil, fmt.Errorf("cannot determine whether ollama is using GPU from logs:\n%s", logs)