From 404c8468b1d5d73f7744d78a7c2b4cafce4ff286 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 30 Jan 2025 20:16:04 +0000 Subject: [PATCH 1/2] Re-enable windows Thrust CI. Fixed by rapidsai/devcontainers#463. --- ci/matrix.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ci/matrix.yaml b/ci/matrix.yaml index 5ec715fb59b..29ae09ca34f 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -19,11 +19,8 @@ workflows: - {jobs: ['build'], std: 'max', cxx: ['msvc2019']} - {jobs: ['build'], std: 'all', cxx: ['gcc', 'clang', 'msvc']} # Current CTK testing: - - {jobs: ['test'], project: ['thrust'], std: 'max', cxx: ['gcc', 'clang'], gpu: 'rtx4090'} - - {jobs: ['test'], project: ['libcudacxx'], std: 'max', cxx: ['gcc', 'clang'], gpu: 'rtx2080'} - # Disabled until we figure out the issue with the TBB dll - #- {jobs: ['test'], project: ['thrust'], std: 'max', cxx: ['msvc'], gpu: 'rtx4090'} - - {jobs: ['test'], project: ['libcudacxx'], std: 'max', cxx: ['msvc'], gpu: 'rtx2080'} + - {jobs: ['test'], project: ['thrust'], std: 'max', cxx: ['gcc', 'clang', 'msvc'], gpu: 'rtx4090'} + - {jobs: ['test'], project: ['libcudacxx'], std: 'max', cxx: ['gcc', 'clang', 'msvc'], gpu: 'rtx2080'} # Split up cub tests: - {jobs: ['test_nolid', 'test_lid0'], project: ['cub'], std: 'max', cxx: ['gcc'], gpu: 'rtxa6000'} - {jobs: ['test_lid1', 'test_lid2'], project: ['cub'], std: 'max', cxx: ['gcc'], gpu: 'rtxa6000'} From e9dede27de15e52fdaa61d1637a2458c158ccaa4 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 30 Jan 2025 22:31:13 +0000 Subject: [PATCH 2/2] temp debugging [skip-rapids][skip-vdc][skip-docs] --- ci/matrix.yaml | 5 +++-- ci/windows/build_thrust.ps1 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/matrix.yaml b/ci/matrix.yaml index 29ae09ca34f..8c829ee3cbe 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -8,6 +8,7 @@ workflows: # - {jobs: ['test'], project: 'thrust', std: 17, ctk: 'curr', cxx: ['gcc12', 'clang16']} # override: + - {jobs: ['test_cpu'], project: 'thrust', std: 'max', cxx: 'msvc'} pull_request: # Old CTK/compiler @@ -51,7 +52,7 @@ workflows: - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 'all', cxx: ['gcc', 'clang'], cpu: 'arm64'} - {jobs: ['test'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['gcc12', 'clang', 'msvc'], gpu: 'rtx2080'} # Python and c/parallel jobs: - - {jobs: ['test'], project: ['cccl_c_parallel', 'python'], ctk: '12.6', gpu: 'rtx2080'} + - {jobs: ['test'], project: ['cccl_c_parallel', 'python'], gpu: 'rtx2080'} # cccl-infra: - {jobs: ['infra'], project: 'cccl', ctk: '12.0', cxx: ['gcc12', 'clang14'], gpu: 'rtx2080'} - {jobs: ['infra'], project: 'cccl', ctk: 'curr', cxx: ['gcc', 'clang'], gpu: 'rtx2080'} @@ -113,7 +114,7 @@ all_stds: [17, 20] ctk_versions: 12.0: { stds: [17, 20] } 12.5: { stds: [17, 20] } - 12.6: { stds: [17, 20], aka: 'curr' } + 12.8: { stds: [17, 20], aka: 'curr' } device_compilers: nvcc: # Version / stds are taken from CTK diff --git a/ci/windows/build_thrust.ps1 b/ci/windows/build_thrust.ps1 index bda86859fd4..21a04522394 100644 --- a/ci/windows/build_thrust.ps1 +++ b/ci/windows/build_thrust.ps1 @@ -10,6 +10,9 @@ Param( [int]$CUDA_ARCH = 0 ) +Write-Host "TBB_ROOT: $env:TBB_ROOT" +Write-Host "PATH: $env:PATH" + $ErrorActionPreference = "Stop" $CURRENT_PATH = Split-Path $pwd -leaf