From a8057b952c5f07b96f18437ea45b612fad3a5085 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 26 Jul 2025 08:30:59 +0200 Subject: [PATCH] fix(cuda): be consistent with image tag naming (#5916) Signed-off-by: Ettore Di Giacinto --- .github/workflows/image-pr.yml | 2 +- .github/workflows/image.yml | 4 ++-- Makefile | 2 +- backend/python/common/libbackend.sh | 2 +- docs/content/docs/features/GPU-acceleration.md | 4 ++-- docs/content/docs/getting-started/container-images.md | 8 ++++---- docs/static/install.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/image-pr.yml b/.github/workflows/image-pr.yml index 262412237..efb5eebb2 100644 --- a/.github/workflows/image-pr.yml +++ b/.github/workflows/image-pr.yml @@ -39,7 +39,7 @@ jobs: cuda-minor-version: "0" platforms: 'linux/amd64' tag-latest: 'false' - tag-suffix: '-gpu-nvidia-cuda12' + tag-suffix: '-gpu-nvidia-cuda-12' runs-on: 'ubuntu-latest' base-image: "ubuntu:22.04" makeflags: "--jobs=3 --output-sync=target" diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index bba0a6498..f9a90c78b 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -83,7 +83,7 @@ jobs: cuda-minor-version: "7" platforms: 'linux/amd64' tag-latest: 'auto' - tag-suffix: '-gpu-nvidia-cuda11' + tag-suffix: '-gpu-nvidia-cuda-11' runs-on: 'ubuntu-latest' base-image: "ubuntu:22.04" makeflags: "--jobs=4 --output-sync=target" @@ -94,7 +94,7 @@ jobs: cuda-minor-version: "0" platforms: 'linux/amd64' tag-latest: 'auto' - tag-suffix: '-gpu-nvidia-cuda12' + tag-suffix: '-gpu-nvidia-cuda-12' runs-on: 'ubuntu-latest' base-image: "ubuntu:22.04" skip-drivers: 'false' diff --git a/Makefile b/Makefile index 03496c202..e36c72a1d 100644 --- a/Makefile +++ b/Makefile @@ -322,7 +322,7 @@ docker-cuda11: --build-arg GO_TAGS="$(GO_TAGS)" \ --build-arg MAKEFLAGS="$(DOCKER_MAKEFLAGS)" \ --build-arg BUILD_TYPE=$(BUILD_TYPE) \ - -t $(DOCKER_IMAGE)-cuda11 . + -t $(DOCKER_IMAGE)-cuda-11 . docker-aio: @echo "Building AIO image with base $(BASE_IMAGE) as $(DOCKER_AIO_IMAGE)" diff --git a/backend/python/common/libbackend.sh b/backend/python/common/libbackend.sh index f8e411c77..282266850 100644 --- a/backend/python/common/libbackend.sh +++ b/backend/python/common/libbackend.sh @@ -111,7 +111,7 @@ function ensureVenv() { # - requirements-${BUILD_TYPE}.txt # - requirements-${BUILD_PROFILE}.txt # -# BUILD_PROFILE is a pore specific version of BUILD_TYPE, ex: cuda11 or cuda12 +# BUILD_PROFILE is a pore specific version of BUILD_TYPE, ex: cuda-11 or cuda-12 # it can also include some options that we do not have BUILD_TYPES for, ex: intel # # NOTE: for BUILD_PROFILE==intel, this function does NOT automatically use the Intel python package index. diff --git a/docs/content/docs/features/GPU-acceleration.md b/docs/content/docs/features/GPU-acceleration.md index 7a953d25c..7b8ba65dd 100644 --- a/docs/content/docs/features/GPU-acceleration.md +++ b/docs/content/docs/features/GPU-acceleration.md @@ -81,8 +81,8 @@ To use CUDA, use the images with the `cublas` tag, for example. The image list is on [quay](https://quay.io/repository/go-skynet/local-ai?tab=tags): -- CUDA `11` tags: `master-gpu-nvidia-cuda11`, `v1.40.0-gpu-nvidia-cuda11`, ... -- CUDA `12` tags: `master-gpu-nvidia-cuda12`, `v1.40.0-gpu-nvidia-cuda12`, ... +- CUDA `11` tags: `master-gpu-nvidia-cuda-11`, `v1.40.0-gpu-nvidia-cuda-11`, ... +- CUDA `12` tags: `master-gpu-nvidia-cuda-12`, `v1.40.0-gpu-nvidia-cuda-12`, ... In addition to the commands to run LocalAI normally, you need to specify `--gpus all` to docker, for example: diff --git a/docs/content/docs/getting-started/container-images.md b/docs/content/docs/getting-started/container-images.md index a3b39f0a3..8369c97ac 100644 --- a/docs/content/docs/getting-started/container-images.md +++ b/docs/content/docs/getting-started/container-images.md @@ -163,9 +163,9 @@ Standard container images do not have pre-installed models. | Description | Quay | Docker Hub | | --- | --- |-------------------------------------------------------------| -| Latest images from the branch (development) | `quay.io/go-skynet/local-ai:master-gpu-nvidia-cuda11` | `localai/localai:master-gpu-nvidia-cuda11` | +| Latest images from the branch (development) | `quay.io/go-skynet/local-ai:master-gpu-nvidia-cuda-11` | `localai/localai:master-gpu-nvidia-cuda-11` | | Latest tag | `quay.io/go-skynet/local-ai:latest-gpu-nvidia-cuda-11` | `localai/localai:latest-gpu-nvidia-cuda-11` | -| Versioned image | `quay.io/go-skynet/local-ai:{{< version >}}-gpu-nvidia-cuda11` | `localai/localai:{{< version >}}-gpu-nvidia-cuda11` | +| Versioned image | `quay.io/go-skynet/local-ai:{{< version >}}-gpu-nvidia-cuda-11` | `localai/localai:{{< version >}}-gpu-nvidia-cuda-11` | {{% /tab %}} @@ -173,9 +173,9 @@ Standard container images do not have pre-installed models. | Description | Quay | Docker Hub | | --- | --- |-------------------------------------------------------------| -| Latest images from the branch (development) | `quay.io/go-skynet/local-ai:master-gpu-nvidia-cuda12` | `localai/localai:master-gpu-nvidia-cuda12` | +| Latest images from the branch (development) | `quay.io/go-skynet/local-ai:master-gpu-nvidia-cuda-12` | `localai/localai:master-gpu-nvidia-cuda12` | | Latest tag | `quay.io/go-skynet/local-ai:latest-gpu-nvidia-cuda-12` | `localai/localai:latest-gpu-nvidia-cuda-12` | -| Versioned image | `quay.io/go-skynet/local-ai:{{< version >}}-gpu-nvidia-cuda12` | `localai/localai:{{< version >}}-gpu-nvidia-cuda12` | +| Versioned image | `quay.io/go-skynet/local-ai:{{< version >}}-gpu-nvidia-cuda-12` | `localai/localai:{{< version >}}-gpu-nvidia-cuda-12` | {{% /tab %}} diff --git a/docs/static/install.sh b/docs/static/install.sh index 321da8d62..6624c86d4 100755 --- a/docs/static/install.sh +++ b/docs/static/install.sh @@ -672,7 +672,7 @@ install_docker() { -d -p $PORT:8080 --name local-ai localai/localai:$IMAGE_TAG $STARTCOMMAND elif [ "$HAS_CUDA" ]; then # Default to CUDA 12 - IMAGE_TAG=${LOCALAI_VERSION}-gpu-nvidia-cuda12 + IMAGE_TAG=${LOCALAI_VERSION}-gpu-nvidia-cuda-12 # AIO if [ "$USE_AIO" = true ]; then IMAGE_TAG=${LOCALAI_VERSION}-aio-gpu-nvidia-cuda-12