diff --git a/.github/workflows/unsloth-sd-prebuilt.yml b/.github/workflows/unsloth-sd-prebuilt.yml index 4997219464..80a7e0a7f4 100644 --- a/.github/workflows/unsloth-sd-prebuilt.yml +++ b/.github/workflows/unsloth-sd-prebuilt.yml @@ -264,7 +264,9 @@ jobs: matrix: include: - label: Darwin-macOS-arm64 - runner: macos-14 + # macos-14 runners are retired. The deployment target below still pins the binaries to macOS 14, + # and the macOS load gate checks it. + runner: macos-15 arch: arm64 # Static: apple_m1 variant drops FP16_VA (~40% slower). BLAS explicit: sd.cpp routes big matmuls to it. defines: "-DSD_METAL=ON -DGGML_METAL_EMBED_LIBRARY=ON -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=Apple -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0" @@ -340,13 +342,12 @@ jobs: working-directory: src run: | set -euo pipefail - CPU_VARIANTS="" + # sd-cli and sd-server share one libstable-diffusion instead of each embedding it. + # The rpath is relative, never an absolute path into the build tree. + if [ "$(uname -s)" = "Darwin" ]; then RPATH='@loader_path'; else RPATH='$ORIGIN'; fi + CPU_VARIANTS="-DSD_BUILD_SHARED_LIBS=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_INSTALL_RPATH=$RPATH" if [ -n "${{ matrix.cpu_floor }}" ]; then - CPU_VARIANTS="-DSD_BUILD_SHARED_GGML_LIB=ON -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON" - # macOS: @loader_path only, never an absolute rpath into the build tree. - if [ "$(uname -s)" = "Darwin" ]; then - CPU_VARIANTS="$CPU_VARIANTS -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_INSTALL_RPATH=@loader_path" - fi + CPU_VARIANTS="$CPU_VARIANTS -DSD_BUILD_SHARED_GGML_LIB=ON -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON" fi cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ @@ -561,6 +562,7 @@ jobs: -DSD_WEBP=OFF -DSD_WEBM=OFF \ -DGGML_NATIVE=OFF \ -DSD_CUDA=ON \ + -DSD_BUILD_SHARED_LIBS=ON \ -DSD_BUILD_SHARED_GGML_LIB=ON \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_CUDA_COMPILER="$CUDA_PATH/bin/nvcc" \ @@ -769,6 +771,7 @@ jobs: -DSD_WEBP=OFF -DSD_WEBM=OFF ` -DGGML_NATIVE=OFF ` -DSD_CUDA=ON ` + -DSD_BUILD_SHARED_LIBS=ON ` -DSD_BUILD_SHARED_GGML_LIB=ON ` -DBUILD_SHARED_LIBS=ON ` -DCMAKE_CUDA_ARCHITECTURES='${{ matrix.archs }}' ` @@ -935,6 +938,7 @@ jobs: -DSD_SERVER_BUILD_FRONTEND=OFF ` -DSD_WEBP=OFF -DSD_WEBM=OFF ` -DSD_VULKAN=${{ matrix.vulkan }} ` + -DSD_BUILD_SHARED_LIBS=ON ` -DGGML_NATIVE=OFF ` @cpuVariants if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }