Skip to content

Commit 9fc1ed1

Browse files
author
Olivier Chafik
committed
set CMAKE_HIP_COMPILER_LAUNCHER env var, not cmake var
1 parent 7a8bb50 commit 9fc1ed1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ jobs:
11861186
run: |
11871187
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
11881188
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
1189+
$env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
11891190
cmake -G "Unix Makefiles" -B build -S . `
11901191
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
11911192
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
@@ -1236,6 +1237,7 @@ jobs:
12361237
run: |
12371238
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
12381239
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
1240+
$env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
12391241
cmake -G "Unix Makefiles" -B build -S . `
12401242
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
12411243
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `

ggml/src/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ if (GGML_CCACHE)
100100
set(GGML_CCACHE_VARIANT ccache)
101101
else()
102102
set(GGML_CCACHE_VARIANT sccache)
103-
if(GGML_HIP)
104-
# TODO: should not be set globally
105-
set(GLOBAL CMAKE_HIP_COMPILER_LAUNCHER sccache)
106-
endif()
107103
endif()
108104
# TODO: should not be set globally
109105
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${GGML_CCACHE_VARIANT}")

0 commit comments

Comments
 (0)