Skip to content

Commit f930d21

Browse files
committed
ci: fix HIP/MUSA kvarn build break and bump deprecated Node 20 actions
kvarn.cu's profiling helpers use cudaEventDefault and cudaEventElapsedTime, which were never added to the CUDA->HIP/MUSA vendor shims. This broke the Ubuntu ROCm and Windows HIP release builds with 'use of undeclared identifier' errors. Add the two missing event mappings to hip.h and musa.h. Also bump the three Node 20 actions in the local ccache composite actions to their Node 24 majors ahead of the 2026-06-16 enforcement: actions/cache/restore@v4 -> v5, actions/cache/save@v4 -> v5, actions/github-script@v7 -> v8.
1 parent 7c2c763 commit f930d21

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

.github/actions/save-rolling-ccache/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ runs:
4343
fi
4444
4545
- name: Delete previous cache
46-
uses: actions/github-script@v7
46+
uses: actions/github-script@v8
4747
env:
4848
CACHE_KEY: ${{ inputs.key }}
4949
CACHE_REF: ${{ inputs.ref }}
@@ -85,7 +85,7 @@ runs:
8585
: `Deleted ${deleted} previous cache entr${deleted === 1 ? "y" : "ies"} for ${key} on ${ref}.`);
8686
8787
- name: Save refreshed cache
88-
uses: actions/cache/save@v4
88+
uses: actions/cache/save@v5
8989
with:
9090
path: ${{ steps.ccache-path.outputs.path }}
9191
key: ${{ inputs.key }}

.github/actions/setup-ccache/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ runs:
7575
7676
- name: Restore ccache
7777
id: restore-cache
78-
uses: actions/cache/restore@v4
78+
uses: actions/cache/restore@v5
7979
with:
8080
path: ${{ steps.ccache-path.outputs.path }}
8181
key: ${{ inputs.key }}

ggml/src/ggml-cuda/vendors/hip.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@
7777
#define cudaErrorPeerAccessAlreadyEnabled hipErrorPeerAccessAlreadyEnabled
7878
#define cudaErrorPeerAccessNotEnabled hipErrorPeerAccessNotEnabled
7979
#define cudaEventCreateWithFlags hipEventCreateWithFlags
80+
#define cudaEventDefault hipEventDefault
8081
#define cudaEventDisableTiming hipEventDisableTiming
82+
#define cudaEventElapsedTime hipEventElapsedTime
8183
#define cudaEventRecord hipEventRecord
8284
#define cudaEventSynchronize hipEventSynchronize
8385
#define cudaEvent_t hipEvent_t

ggml/src/ggml-cuda/vendors/musa.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
#define cudaErrorPeerAccessAlreadyEnabled musaErrorPeerAccessAlreadyEnabled
4949
#define cudaErrorPeerAccessNotEnabled musaErrorPeerAccessNotEnabled
5050
#define cudaEventCreateWithFlags musaEventCreateWithFlags
51+
#define cudaEventDefault musaEventDefault
5152
#define cudaEventDisableTiming musaEventDisableTiming
53+
#define cudaEventElapsedTime musaEventElapsedTime
5254
#define cudaEventRecord musaEventRecord
5355
#define cudaEventSynchronize musaEventSynchronize
5456
#define cudaEvent_t musaEvent_t

0 commit comments

Comments
 (0)