From 4f0e454a359b6a418bfef39e3a032674dc381271 Mon Sep 17 00:00:00 2001 From: Paulius Velesko Date: Wed, 14 Oct 2026 15:33:24 +0300 Subject: [PATCH] Revert "ci: work around meatloaf's stale chipStar install paths" This reverts commit 01124df6822f837478d57af9fef807c1cd35105c. meatloaf's HIP/chipStar/main install was rebuilt from chipStar main e57c54f5, whose generated .hipInfo and hip-targets.cmake resolve the install prefix correctly. The workaround copied hip-targets.cmake into $RUNNER_TEMP, and the new file locates the install relative to itself, so the copy now points at a nonexistent libCHIP.so and CMake configure fails. The job can use the module's hipcc and CMAKE_PREFIX_PATH directly again. --- .github/workflows/presubmit.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 941c8bdad..d0a6bd023 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -35,15 +35,9 @@ jobs: module use /space/pvelesko/modulefiles module load oneapi/2025.0.4 llvm/22.0-native HIP/chipStar/main level-zero/dgpu module list - # This install names a deleted CI staging dir; use copies of its config that name the install. - stale=$(sed -n 's/^HIP_PATH=//p' "$HIP_PATH/share/.hipInfo") - hip="$RUNNER_TEMP/chipstar-main" - rm -rf "$hip" && mkdir -p "$hip/bin" "$hip/share" "$hip/lib/cmake" - cp "$HIP_PATH/bin/hipcc" "$hip/bin/" && cp "$HIP_PATH/share/.hipInfo" "$hip/share/" && cp -r "$HIP_PATH/lib/cmake/hip" "$hip/lib/cmake/" - sed -i "s|$stale|$HIP_PATH|g" "$hip/share/.hipInfo" "$hip"/lib/cmake/hip/*.cmake rm -rf ~/.cache/chipStar build cmake -S . -B build \ - -DCMAKE_CXX_COMPILER="$hip/bin/hipcc" -Dhip_DIR="$hip/lib/cmake/hip" \ + -DCMAKE_CXX_COMPILER="$(which hipcc)" \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TEST=ON -DBUILD_BENCHMARK=OFF \ -DAMDGPU_TEST_TARGETS="" \