Skip to content

Commit aca45f4

Browse files
JavaPythonAIForBATclaude
JavaPythonAIForBAT
and
claude
committed
ci: derive CANN version dynamically in build cache key
Follow-up to 0ab9915 and per review on #483. The previous commit removed the cann version segment from the cache key entirely, which was wrong: BUILD_HASH only covers source files, so an image bump that changes only the container CANN version (without touching csrc/cmake/ python) would silently reuse stale .so artifacts and produce an ABI mismatch. Reviewer's intent was to avoid the hardcoded literal, not to drop the version dimension. Restore the version segment, but derive it at runtime from /usr/local/Ascend/ascend-toolkit/latest/version.cfg inside the container, so the YAML no longer contains the literal "8.5.0" and the cache key still tracks the actual CANN version of whichever image the job is running on. Falls back to "unknown" if the version file is unreadable; the echo in the step log makes the resolved value visible per run so we can spot regressions in image layout early. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 0ab9915 commit aca45f4

2 files changed

Lines changed: 35 additions & 5 deletions

File tree

‎.github/workflows/pr-test-npu.yml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,18 @@ jobs:
8989
-type f -not -path '*/.*' 2>/dev/null | sort | xargs sha256sum | sha256sum | awk '{print $1}')
9090
echo "BUILD_HASH=$BUILD_HASH" >> $GITHUB_OUTPUT
9191
92+
CANN_RAW=$(cat /usr/local/Ascend/ascend-toolkit/latest/version.cfg 2>/dev/null || echo "unknown")
93+
CANN_VERSION=$(echo "$CANN_RAW" | tr -cd '[:alnum:].-' | head -c 32)
94+
[ -z "$CANN_VERSION" ] && CANN_VERSION="unknown"
95+
echo "CANN_VERSION=$CANN_VERSION" >> $GITHUB_OUTPUT
96+
echo "Resolved CANN version: $CANN_VERSION (raw: $CANN_RAW)"
97+
9298
- name: Restore build cache
9399
id: cache-build
94100
uses: runs-on/cache@v4
95101
with:
96102
path: output
97-
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-${{ steps.get_build_hash.outputs.BUILD_HASH }}
103+
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-cann${{ steps.get_build_hash.outputs.CANN_VERSION }}-${{ steps.get_build_hash.outputs.BUILD_HASH }}
98104

99105
- name: Install dependencies
100106
run: |
@@ -460,12 +466,18 @@ jobs:
460466
-type f -not -path '*/.*' 2>/dev/null | sort | xargs sha256sum | sha256sum | awk '{print $1}')
461467
echo "BUILD_HASH=$BUILD_HASH" >> $GITHUB_OUTPUT
462468
469+
CANN_RAW=$(cat /usr/local/Ascend/ascend-toolkit/latest/version.cfg 2>/dev/null || echo "unknown")
470+
CANN_VERSION=$(echo "$CANN_RAW" | tr -cd '[:alnum:].-' | head -c 32)
471+
[ -z "$CANN_VERSION" ] && CANN_VERSION="unknown"
472+
echo "CANN_VERSION=$CANN_VERSION" >> $GITHUB_OUTPUT
473+
echo "Resolved CANN version: $CANN_VERSION (raw: $CANN_RAW)"
474+
463475
- name: Restore build cache
464476
id: cache-build
465477
uses: runs-on/cache@v4
466478
with:
467479
path: output
468-
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-${{ steps.get_build_hash.outputs.BUILD_HASH }}
480+
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-cann${{ steps.get_build_hash.outputs.CANN_VERSION }}-${{ steps.get_build_hash.outputs.BUILD_HASH }}
469481

470482
- name: Install dependencies
471483
run: |
@@ -837,12 +849,18 @@ jobs:
837849
-type f -not -path '*/.*' 2>/dev/null | sort | xargs sha256sum | sha256sum | awk '{print $1}')
838850
echo "BUILD_HASH=$BUILD_HASH" >> $GITHUB_OUTPUT
839851
852+
CANN_RAW=$(cat /usr/local/Ascend/ascend-toolkit/latest/version.cfg 2>/dev/null || echo "unknown")
853+
CANN_VERSION=$(echo "$CANN_RAW" | tr -cd '[:alnum:].-' | head -c 32)
854+
[ -z "$CANN_VERSION" ] && CANN_VERSION="unknown"
855+
echo "CANN_VERSION=$CANN_VERSION" >> $GITHUB_OUTPUT
856+
echo "Resolved CANN version: $CANN_VERSION (raw: $CANN_RAW)"
857+
840858
- name: Restore build cache
841859
id: cache-build
842860
uses: runs-on/cache@v4
843861
with:
844862
path: output
845-
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a2-${{ steps.get_build_hash.outputs.BUILD_HASH }}
863+
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a2-cann${{ steps.get_build_hash.outputs.CANN_VERSION }}-${{ steps.get_build_hash.outputs.BUILD_HASH }}
846864

847865
- name: Install dependencies
848866
run: |

‎.github/workflows/push_build_cache.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,18 @@ jobs:
4343
-type f -not -path '*/.*' 2>/dev/null | sort | xargs sha256sum | sha256sum | awk '{print $1}')
4444
echo "BUILD_HASH=$BUILD_HASH" >> $GITHUB_OUTPUT
4545
46+
CANN_RAW=$(cat /usr/local/Ascend/ascend-toolkit/latest/version.cfg 2>/dev/null || echo "unknown")
47+
CANN_VERSION=$(echo "$CANN_RAW" | tr -cd '[:alnum:].-' | head -c 32)
48+
[ -z "$CANN_VERSION" ] && CANN_VERSION="unknown"
49+
echo "CANN_VERSION=$CANN_VERSION" >> $GITHUB_OUTPUT
50+
echo "Resolved CANN version: $CANN_VERSION (raw: $CANN_RAW)"
51+
4652
- name: Restore build cache
4753
id: cache-build
4854
uses: runs-on/cache@v4
4955
with:
5056
path: output
51-
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-${{ steps.get_build_hash.outputs.BUILD_HASH }}
57+
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a3-cann${{ steps.get_build_hash.outputs.CANN_VERSION }}-${{ steps.get_build_hash.outputs.BUILD_HASH }}
5258

5359
- name: Install dependencies
5460
if: steps.cache-build.outputs.cache-hit != 'true'
@@ -94,12 +100,18 @@ jobs:
94100
-type f -not -path '*/.*' 2>/dev/null | sort | xargs sha256sum | sha256sum | awk '{print $1}')
95101
echo "BUILD_HASH=$BUILD_HASH" >> $GITHUB_OUTPUT
96102
103+
CANN_RAW=$(cat /usr/local/Ascend/ascend-toolkit/latest/version.cfg 2>/dev/null || echo "unknown")
104+
CANN_VERSION=$(echo "$CANN_RAW" | tr -cd '[:alnum:].-' | head -c 32)
105+
[ -z "$CANN_VERSION" ] && CANN_VERSION="unknown"
106+
echo "CANN_VERSION=$CANN_VERSION" >> $GITHUB_OUTPUT
107+
echo "Resolved CANN version: $CANN_VERSION (raw: $CANN_RAW)"
108+
97109
- name: Restore build cache
98110
id: cache-build
99111
uses: runs-on/cache@v4
100112
with:
101113
path: output
102-
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a2-${{ steps.get_build_hash.outputs.BUILD_HASH }}
114+
key: sgl-kernel-npu-build-v2-${{ runner.os }}-a2-cann${{ steps.get_build_hash.outputs.CANN_VERSION }}-${{ steps.get_build_hash.outputs.BUILD_HASH }}
103115

104116
- name: Install dependencies
105117
if: steps.cache-build.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)