vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

set CMAKE_HIP_COMPILER_LAUNCHER env var, not cmake var

Browse source
This commit is contained in:
Olivier Chafik 2025-01-31 18:23:08 +00:00
parent 7a8bb50714
commit 9fc1ed18ac
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -1186,6 +1186,7 @@ jobs:
run: |
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
$env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
cmake -G "Unix Makefiles" -B build -S . `
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
@ -1236,6 +1237,7 @@ jobs:
run: |
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
$env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
cmake -G "Unix Makefiles" -B build -S . `
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `

4
ggml/src/CMakeLists.txt
View file

@ -100,10 +100,6 @@ if (GGML_CCACHE)
set(GGML_CCACHE_VARIANT ccache)
else()
set(GGML_CCACHE_VARIANT sccache)
if(GGML_HIP)
# TODO: should not be set globally
set(GLOBAL CMAKE_HIP_COMPILER_LAUNCHER sccache)
endif()
endif()
# TODO: should not be set globally
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${GGML_CCACHE_VARIANT}")