From 61995718ffe45fa019f17099a0d9ea277a1eeaf6 Mon Sep 17 00:00:00 2001 From: Michael Goin Date: Fri, 14 Nov 2025 13:31:46 -0700 Subject: [PATCH 1/6] Fix macos smoke test workflow Signed-off-by: Michael Goin --- .github/workflows/macos-smoke-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-smoke-test.yml b/.github/workflows/macos-smoke-test.yml index 8d40aa587bf0..bddfc5d3f334 100644 --- a/.github/workflows/macos-smoke-test.yml +++ b/.github/workflows/macos-smoke-test.yml @@ -21,11 +21,11 @@ jobs: - name: Install dependencies run: | - uv pip install -r requirements/cpu-build.txt - uv pip install -r requirements/cpu.txt + uv pip install --system -r requirements/cpu-build.txt + uv pip install --system -r requirements/cpu.txt - name: Build vLLM - run: uv pip install -v -e . + run: uv pip install --system -v -e . env: CMAKE_BUILD_PARALLEL_LEVEL: 4 From ff600b13580f4185185e7ce7c6d8045e773911bd Mon Sep 17 00:00:00 2001 From: mgoin Date: Fri, 14 Nov 2025 15:39:16 -0500 Subject: [PATCH 2/6] Fix Signed-off-by: mgoin --- .github/workflows/macos-smoke-test.yml | 9 +++------ requirements/cpu-build.txt | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos-smoke-test.yml b/.github/workflows/macos-smoke-test.yml index bddfc5d3f334..79aa008335c5 100644 --- a/.github/workflows/macos-smoke-test.yml +++ b/.github/workflows/macos-smoke-test.yml @@ -19,13 +19,10 @@ jobs: pyproject.toml python-version: '3.12' - - name: Install dependencies + - name: Install dependencies and build vLLM run: | - uv pip install --system -r requirements/cpu-build.txt - uv pip install --system -r requirements/cpu.txt - - - name: Build vLLM - run: uv pip install --system -v -e . + uv pip install --system -r requirements/cpu.txt --index-strategy unsafe-best-match + uv pip install --system -e . env: CMAKE_BUILD_PARALLEL_LEVEL: 4 diff --git a/requirements/cpu-build.txt b/requirements/cpu-build.txt index 331d02be6621..81d429a5e5f8 100644 --- a/requirements/cpu-build.txt +++ b/requirements/cpu-build.txt @@ -4,8 +4,9 @@ packaging>=24.2 setuptools>=77.0.3,<81.0.0 setuptools-scm>=8 --extra-index-url https://download.pytorch.org/whl/cpu -torch==2.8.0+cpu; platform_machine == "x86_64" -torch==2.8.0; platform_machine == "ppc64le" or platform_machine == "aarch64" or platform_system == "Darwin" +torch==2.8.0+cpu; platform_machine == "x86_64" or platform_machine == "s390x" +torch==2.9.0; platform_system == "Darwin" +torch==2.8.0; platform_machine == "ppc64le" or platform_machine == "aarch64" scons; platform_machine == "aarch64" # needed to build Arm Compute Library (ACL) wheel jinja2>=3.1.6 From 161a4e95a21ef3261f71258c83756fd9d65ae9b4 Mon Sep 17 00:00:00 2001 From: mgoin Date: Fri, 14 Nov 2025 17:05:20 -0500 Subject: [PATCH 3/6] Fix attn impl Signed-off-by: mgoin --- csrc/cpu/cpu_attn_impl.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/csrc/cpu/cpu_attn_impl.hpp b/csrc/cpu/cpu_attn_impl.hpp index 5de8a114b2b5..00153532041a 100644 --- a/csrc/cpu/cpu_attn_impl.hpp +++ b/csrc/cpu/cpu_attn_impl.hpp @@ -754,11 +754,12 @@ class AttentionScheduler { return l2_cache_size >> 1; // use 50% of L2 cache } // Fallback if sysctlbyname fails - return 128 * 1024 >> 1; // use 50% of 128KB + constexpr int64_t default_l2_cache_size = int64_t{128} * 1024; + return default_l2_cache_size >> 1; // use 50% of 128KB #else long l2_cache_size = sysconf(_SC_LEVEL2_CACHE_SIZE); TORCH_CHECK_NE(l2_cache_size, -1); - return l2_cache_size >> 1; // use 50% of L2 cache + return static_cast(l2_cache_size) >> 1; // use 50% of L2 cache #endif }(); return size; From 2f4a6b6e685bfd71e8edd77e4fb53bb9917aab33 Mon Sep 17 00:00:00 2001 From: mgoin Date: Mon, 17 Nov 2025 14:10:08 -0500 Subject: [PATCH 4/6] Fix system python Signed-off-by: mgoin --- .github/workflows/macos-smoke-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-smoke-test.yml b/.github/workflows/macos-smoke-test.yml index 79aa008335c5..030698ef98b4 100644 --- a/.github/workflows/macos-smoke-test.yml +++ b/.github/workflows/macos-smoke-test.yml @@ -7,6 +7,8 @@ jobs: macos-m1-smoke-test: runs-on: macos-latest timeout-minutes: 20 + env: + UV_SYSTEM_PYTHON: 1 steps: - uses: actions/checkout@v4 @@ -21,8 +23,8 @@ jobs: - name: Install dependencies and build vLLM run: | - uv pip install --system -r requirements/cpu.txt --index-strategy unsafe-best-match - uv pip install --system -e . + uv pip install -r requirements/cpu.txt --index-strategy unsafe-best-match + uv pip install -e . env: CMAKE_BUILD_PARALLEL_LEVEL: 4 From ca410a175fddbabc8d86afc0a4d6f12c56ec2cd9 Mon Sep 17 00:00:00 2001 From: mgoin Date: Mon, 17 Nov 2025 14:21:32 -0500 Subject: [PATCH 5/6] Fix venv Signed-off-by: mgoin --- .github/workflows/macos-smoke-test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-smoke-test.yml b/.github/workflows/macos-smoke-test.yml index 030698ef98b4..9b312ec46249 100644 --- a/.github/workflows/macos-smoke-test.yml +++ b/.github/workflows/macos-smoke-test.yml @@ -7,8 +7,6 @@ jobs: macos-m1-smoke-test: runs-on: macos-latest timeout-minutes: 20 - env: - UV_SYSTEM_PYTHON: 1 steps: - uses: actions/checkout@v4 @@ -21,6 +19,11 @@ jobs: pyproject.toml python-version: '3.12' + - name: Create virtual environment + run: | + uv venv + echo "$GITHUB_WORKSPACE/.venv/bin" >> "$GITHUB_PATH" + - name: Install dependencies and build vLLM run: | uv pip install -r requirements/cpu.txt --index-strategy unsafe-best-match From 13ebc78da0aa8ab728515fdc1c35d41e64e66aea Mon Sep 17 00:00:00 2001 From: mgoin Date: Mon, 17 Nov 2025 16:24:08 -0500 Subject: [PATCH 6/6] Trigger on main Signed-off-by: mgoin --- .github/workflows/macos-smoke-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-smoke-test.yml b/.github/workflows/macos-smoke-test.yml index 9b312ec46249..42b05ecd5ac0 100644 --- a/.github/workflows/macos-smoke-test.yml +++ b/.github/workflows/macos-smoke-test.yml @@ -1,6 +1,9 @@ name: macOS Apple Silicon Smoke Test on: + push: + branches: + - main workflow_dispatch: # Manual trigger jobs: