From 8bcbc6f89d5dac57006ab12bf0434053e10f7ba0 Mon Sep 17 00:00:00 2001 From: leejet Date: Fri, 26 Jun 2026 21:36:20 +0800 Subject: [PATCH 1/5] fix(ci): disable dynamic CPU backends for arm64 CUDA image --- .github/workflows/build.yml | 1 + Dockerfile.cuda | 33 +++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b42846fb..393559cac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -207,6 +207,7 @@ jobs: UBUNTU_VERSION=24.04 CUDA_ARCHITECTURES=121 GGML_CUDA_FA_ALL_QUANTS=ON + GGML_CUDA_ENABLE_DYNAMIC_CPU_BACKENDS=OFF env: REGISTRY: ghcr.io diff --git a/Dockerfile.cuda b/Dockerfile.cuda index 33e66426f..1859bd942 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -23,18 +23,27 @@ COPY . . ARG CUDACXX=/usr/local/cuda/bin/nvcc ARG CUDA_ARCHITECTURES="" ARG GGML_CUDA_FA_ALL_QUANTS="" - -RUN cmake . -B ./build \ - -DSD_CUDA=ON \ - -DSD_BUILD_SHARED_LIBS=ON \ - -DGGML_NATIVE=OFF \ - -DSD_BUILD_SHARED_GGML_LIB=ON \ - -DGGML_BACKEND_DL=ON \ - -DGGML_CPU_ALL_VARIANTS=ON \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -DCMAKE_INSTALL_RPATH='$ORIGIN' \ - ${CUDA_ARCHITECTURES:+-DCMAKE_CUDA_ARCHITECTURES="${CUDA_ARCHITECTURES}"} \ - ${GGML_CUDA_FA_ALL_QUANTS:+-DGGML_CUDA_FA_ALL_QUANTS=${GGML_CUDA_FA_ALL_QUANTS}} +ARG GGML_CUDA_ENABLE_DYNAMIC_CPU_BACKENDS=ON + +RUN set -- \ + -DSD_CUDA=ON \ + -DSD_BUILD_SHARED_LIBS=ON \ + -DGGML_NATIVE=OFF \ + -DSD_BUILD_SHARED_GGML_LIB=ON; \ + if [ "${GGML_CUDA_ENABLE_DYNAMIC_CPU_BACKENDS}" = "ON" ]; then \ + set -- "$@" \ + -DGGML_BACKEND_DL=ON \ + -DGGML_CPU_ALL_VARIANTS=ON \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + "-DCMAKE_INSTALL_RPATH=\$ORIGIN"; \ + fi; \ + if [ -n "${CUDA_ARCHITECTURES}" ]; then \ + set -- "$@" "-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}"; \ + fi; \ + if [ -n "${GGML_CUDA_FA_ALL_QUANTS}" ]; then \ + set -- "$@" "-DGGML_CUDA_FA_ALL_QUANTS=${GGML_CUDA_FA_ALL_QUANTS}"; \ + fi; \ + cmake . -B ./build "$@" RUN cmake --build ./build --config Release -j$(nproc) FROM nvidia/cuda:${CUDA_VERSION}-cudnn-runtime-ubuntu${UBUNTU_VERSION} AS runtime From 618d6476a491cd5d2b216f40d42d30ec10b11eef Mon Sep 17 00:00:00 2001 From: leejet Date: Fri, 26 Jun 2026 21:38:16 +0800 Subject: [PATCH 2/5] debug --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 393559cac..ac75f28da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -180,7 +180,6 @@ jobs: build-and-push-docker-images: name: Build and push container images - if: ${{ github.event_name != 'pull_request' }} runs-on: ${{ matrix.runner }} permissions: From 4269a5b8774303b9a733b18ef532798f54ebd580 Mon Sep 17 00:00:00 2001 From: leejet Date: Fri, 26 Jun 2026 22:14:49 +0800 Subject: [PATCH 3/5] fix --- Dockerfile.cuda | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.cuda b/Dockerfile.cuda index 1859bd942..3e51bda60 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -26,12 +26,12 @@ ARG GGML_CUDA_FA_ALL_QUANTS="" ARG GGML_CUDA_ENABLE_DYNAMIC_CPU_BACKENDS=ON RUN set -- \ - -DSD_CUDA=ON \ - -DSD_BUILD_SHARED_LIBS=ON \ - -DGGML_NATIVE=OFF \ - -DSD_BUILD_SHARED_GGML_LIB=ON; \ + -DSD_CUDA=ON; \ if [ "${GGML_CUDA_ENABLE_DYNAMIC_CPU_BACKENDS}" = "ON" ]; then \ set -- "$@" \ + -DSD_BUILD_SHARED_LIBS=ON \ + -DGGML_NATIVE=OFF \ + -DSD_BUILD_SHARED_GGML_LIB=ON \ -DGGML_BACKEND_DL=ON \ -DGGML_CPU_ALL_VARIANTS=ON \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ From 102e1a2286754b4c81910b565bd66bff09a99af4 Mon Sep 17 00:00:00 2001 From: leejet Date: Sat, 27 Jun 2026 00:21:55 +0800 Subject: [PATCH 4/5] fix --- Dockerfile.vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.vulkan b/Dockerfile.vulkan index 2a832976e..518482602 100644 --- a/Dockerfile.vulkan +++ b/Dockerfile.vulkan @@ -28,7 +28,7 @@ RUN cmake . -B ./build \ -DGGML_CPU_ALL_VARIANTS=ON \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DCMAKE_INSTALL_RPATH='$ORIGIN' -RUN cmake --build ./build --config Release --parallel +RUN cmake --build ./build --config Release -j$(nproc) FROM ubuntu:$UBUNTU_VERSION AS runtime From 072c8e0d761232ed14d8223398af7667ec2db79f Mon Sep 17 00:00:00 2001 From: leejet Date: Sat, 27 Jun 2026 00:48:58 +0800 Subject: [PATCH 5/5] revert "debug" This reverts commit 618d6476a491cd5d2b216f40d42d30ec10b11eef. --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac75f28da..393559cac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -180,6 +180,7 @@ jobs: build-and-push-docker-images: name: Build and push container images + if: ${{ github.event_name != 'pull_request' }} runs-on: ${{ matrix.runner }} permissions: