Skip to content

Commit 1b88a41

Browse files
Merge commit '66012fcb0e796511762c2de062b6a86bcddf8aac'
2 parents cb53aed + 66012fc commit 1b88a41

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.github/workflows/integration-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
path: |
310310
~/.triton/cache
311311
~/.ccache
312-
key: ${{ steps.restore-build-cache.outputs.cache-primary-key }}
312+
key: triton-artifacts-${{ runner.os }}-${{ runner.arch }}-${{ env.RUNNER_TYPE }}-llvm-${{ steps.cache-key.outputs.llvm }}-${{ steps.cache-key.outputs.datetime }}
313313
Integration-Tests-AMD:
314314
needs: Runner-Preparation
315315
if: needs.Runner-Preparation.outputs.matrix-HIP != ''
@@ -477,15 +477,15 @@ jobs:
477477
path: |
478478
~/.triton/cache
479479
~/.ccache
480-
key: ${{ steps.restore-build-cache.outputs.cache-primary-key }}
480+
key: triton-artifacts-${{ runner.os }}-${{ runner.arch }}-${{ env.RUNNER_TYPE }}-llvm-${{ steps.cache-key.outputs.llvm }}-${{ steps.cache-key.outputs.datetime }}
481481
- name: Clean up caches
482482
run: |
483483
rm -rf ~/.triton/cache
484484
Build-Tests:
485485
needs: Runner-Preparation
486486
if: needs.Runner-Preparation.outputs.matrix-MACOS != ''
487487
runs-on: ${{ matrix.runner }}
488-
timeout-minutes: 30
488+
timeout-minutes: 40
489489
strategy:
490490
matrix:
491491
runner: ${{fromJson(needs.Runner-Preparation.outputs.matrix-MACOS)}}
@@ -605,4 +605,4 @@ jobs:
605605
path: |
606606
~/.triton/cache
607607
~/.ccache
608-
key: ${{ steps.restore-build-cache.outputs.cache-primary-key }}
608+
key: triton-artifacts-${{ runner.os }}-${{ runner.arch }}-${{ env.RUNNER_TYPE }}-llvm-${{ steps.cache-key.outputs.llvm }}-${{ steps.cache-key.outputs.datetime }}

.github/workflows/integration-tests.yml.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
path: |
350350
~/.triton/cache
351351
~/.ccache
352-
key: ${{ steps.restore-build-cache.outputs.cache-primary-key }}
352+
key: triton-artifacts-${{ runner.os }}-${{ runner.arch }}-${{ env.RUNNER_TYPE }}-llvm-${{ steps.cache-key.outputs.llvm }}-${{ steps.cache-key.outputs.datetime }}
353353

354354
Integration-Tests-AMD:
355355
needs: Runner-Preparation
@@ -452,7 +452,7 @@ jobs:
452452
needs: Runner-Preparation
453453
if: needs.Runner-Preparation.outputs.matrix-MACOS != ''
454454
runs-on: ${{ matrix.runner }}
455-
timeout-minutes: 30
455+
timeout-minutes: 40
456456
strategy:
457457
matrix:
458458
runner: ${{fromJson(needs.Runner-Preparation.outputs.matrix-MACOS)}}

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ if(TRITON_BUILD_WITH_CCACHE)
4545
endif()
4646
endif()
4747

48+
set(TRITON_PARALLEL_LINK_JOBS "" CACHE STRING
49+
"Define the maximum number of concurrent link jobs (Ninja only).")
50+
if (TRITON_PARALLEL_LINK_JOBS)
51+
set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${TRITON_PARALLEL_LINK_JOBS})
52+
set(CMAKE_JOB_POOL_LINK link_job_pool)
53+
endif()
54+
4855

4956
# Ensure Python3 vars are set correctly
5057
# used conditionally in this file and by lit tests

python/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ def build_extension(self, ext):
523523
"TRITON_BUILD_PROTON",
524524
"TRITON_BUILD_TUTORIALS",
525525
"TRITON_BUILD_WITH_CCACHE",
526+
"TRITON_PARALLEL_LINK_JOBS",
526527
]
527528
cmake_args += [f"-D{option}={os.getenv(option)}" for option in passthrough_args if option in os.environ]
528529

0 commit comments

Comments
 (0)