Skip to content

Commit d3a8a5a

Browse files
maksleventalolegshyshkov
authored andcommitted
[BACKEND] fix inconsistent use of DLLVM_ENABLE_ZSTD (triton-lang#6726)
see recent failures to build like https://github.com/triton-lang/triton/actions/runs/14864637012/job/41738239612?pr=6586
1 parent de2ba39 commit d3a8a5a

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/workflows/llvm-build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ jobs:
136136
-DLLVM_INSTALL_UTILS=ON
137137
-DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU"
138138
-DLLVM_ENABLE_TERMINFO=OFF
139+
-DLLVM_ENABLE_ZSTD=OFF
139140
llvm-project/llvm
140141
141142
ninja -C llvm-project/build check-mlir install
@@ -296,15 +297,15 @@ jobs:
296297
${{ github.workspace }}/llvm-*-${{ matrix.config.target-os }}-${{ matrix.config.arch }}.tar.gz
297298
298299
- name: Azure Login
299-
if: ${{ (github.repository == 'triton-lang/triton') }}
300+
if: ${{ (github.repository == 'triton-lang/triton') && github.ref_name == 'llvm-head' }}
300301
uses: azure/login@v2
301302
with:
302303
client-id: ${{ secrets.AZURE_CLIENT_ID }}
303304
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
304305
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
305306

306307
- name: Upload LLVM Artifacts to Azure
307-
if: ${{ (github.repository == 'triton-lang/triton') }}
308+
if: ${{ (github.repository == 'triton-lang/triton') && github.ref_name == 'llvm-head' }}
308309
shell: bash -el {0}
309310
run: |
310311
az storage blob upload --account-name oaitriton --auth-mode login --container-name public --file "${{ env.llvm_install_dir }}.tar.gz" --name "llvm-builds/${{ env.llvm_install_dir }}.tar.gz" --overwrite
@@ -313,7 +314,7 @@ jobs:
313314
echo "Blob URL: ${URL}"
314315
315316
- name: Azure Logout
316-
if: ${{ (github.repository == 'triton-lang/triton') }}
317+
if: ${{ (github.repository == 'triton-lang/triton') && github.ref_name == 'llvm-head' }}
317318
run: |
318319
az logout
319320
az cache purge

.github/workflows/llvm-build/almalinux.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN cmake -GNinja -Bbuild \
3434
-DLLVM_ENABLE_TERMINFO=OFF \
3535
-DLLVM_INSTALL_UTILS=ON \
3636
-DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU" \
37+
-DLLVM_ENABLE_ZSTD=OFF \
3738
/source/llvm-project/llvm
3839

3940
RUN ninja -C build install

.github/workflows/llvm-build/centos.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ RUN cmake -GNinja -Bbuild \
5151
-DLLVM_ENABLE_TERMINFO=OFF \
5252
-DLLVM_INSTALL_UTILS=ON \
5353
-DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU" \
54+
-DLLVM_ENABLE_ZSTD=OFF \
5455
/source/llvm-project/llvm
5556

5657
RUN ninja -C build install

scripts/build-llvm-project.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ if [ -z "$CMAKE_ARGS" ]; then
2222
-DCMAKE_CXX_COMPILER=clang++
2323
-DLLVM_ENABLE_LLD=ON
2424
-DLLVM_OPTIMIZED_TABLEGEN=ON
25+
-DLLVM_ENABLE_ZSTD=OFF
2526
-DLLVM_TARGETS_TO_BUILD="$LLVM_TARGETS"
2627
-DCMAKE_EXPORT_COMPILE_COMMANDS=1
2728
-DLLVM_ENABLE_PROJECTS="$LLVM_PROJECTS"

0 commit comments

Comments
 (0)