Add icc compiler to CI matrix

.devcontainer/cuda11.1-gcc6/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc6-cuda11.1-ubuntu18.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc6-cuda11.1-ubuntu18.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda11.1-gcc7/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc7-cuda11.1-ubuntu18.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc7-cuda11.1-ubuntu18.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda11.1-gcc8/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc8-cuda11.1-ubuntu18.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc8-cuda11.1-ubuntu18.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda11.1-gcc9/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc9-cuda11.1-ubuntu18.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc9-cuda11.1-ubuntu18.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda11.1-llvm9/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm9-cuda11.1-ubuntu18.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm9-cuda11.1-ubuntu18.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc10/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc10-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc10-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc11/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc11-cuda12.3-ubuntu22.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc11-cuda12.3-ubuntu22.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc12/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc12-cuda12.3-ubuntu22.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc12-cuda12.3-ubuntu22.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc7/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc7-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc7-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc8/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc8-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc8-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-gcc9/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc9-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc9-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm10/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm10-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm10-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm11/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm11-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm11-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm12/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm12-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm12-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm13/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm13-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm13-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm14/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm14-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm14-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm15/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm15-cuda12.3-ubuntu22.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm15-cuda12.3-ubuntu22.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm16/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda12.3-ubuntu22.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.3-ubuntu22.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-llvm9/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-llvm9-cuda12.3-ubuntu20.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-llvm9-cuda12.3-ubuntu20.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/cuda12.3-oneapi2023.2.0/devcontainer.json

@@ -0,0 +1,46 @@
+{
+  "shutdownAction": "stopContainer",
+  "image": "rapidsai/devcontainers:24.02-cpp-oneapi2023.2.0-cuda12.3-ubuntu22.04",
+  "hostRequirements": {
+    "gpu": true
+  },
+  "initializeCommand": [
+    "/bin/bash",
+    "-c",
+    "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
+  ],
+  "containerEnv": {
+    "SCCACHE_REGION": "us-east-2",
+    "SCCACHE_BUCKET": "rapids-sccache-devs",
+    "VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
+    "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
+    "DEVCONTAINER_NAME": "cuda12.3-oneapi2023.2.0",
+    "CCCL_CUDA_VERSION": "12.3",
+    "CCCL_HOST_COMPILER": "oneapi",
+    "CCCL_HOST_COMPILER_VERSION": "2023.2.0",
+    "CCCL_BUILD_INFIX": "cuda12.3-oneapi2023.2.0"
+  },
+  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
+  "mounts": [
+    "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "llvm-vs-code-extensions.vscode-clangd",
+        "xaver.clang-format"
+      ],
+      "settings": {
+        "editor.defaultFormatter": "xaver.clang-format",
+        "clang-format.executable": "/usr/local/bin/clang-format",
+        "clangd.arguments": [
+          "--compile-commands-dir=${workspaceFolder}"
+        ]
+      }
+    }
+  },
+  "name": "cuda12.3-oneapi2023.2.0"
+}

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.12-cpp-gcc12-cuda12.3-ubuntu22.04",
+  "image": "rapidsai/devcontainers:24.02-cpp-gcc12-cuda12.3-ubuntu22.04",
   "hostRequirements": {
     "gpu": true
   },

.devcontainer/verify_devcontainer.sh

@@ -32,6 +32,13 @@ check_host_compiler_version() {
             exit 1
         fi
         expected_compiler="llvm"
+    elif [[ "$CXX" == "icpc" ]]; then
+        local actual_version=$(echo "$version_output" | head -n 1 | cut -d ' ' -f 3 )
+        # The icpc compiler version of oneAPI release 2023.2.0 is 2021.10.0
+        if [[ "$actual_version" == "2021.10.0" ]]; then
+            actual_version="2023.2.0"
+        fi
+        expected_compiler="oneapi"
     else
         echo "::error:: Unexpected CXX value ($CXX)."
         exit 1

.github/actions/compute-matrix/compute-matrix.sh

@@ -21,12 +21,14 @@ extract_matrix() {
   local type="$2"
   local matrix=$(yq -o=json "$file" | jq -cr ".$type")
   write_output "DEVCONTAINER_VERSION" "$(yq -o json "$file" | jq -cr '.devcontainer_version')"
+
   local nvcc_full_matrix="$(echo "$matrix" | jq -cr '.nvcc' | explode_std_versions )"
-  write_output "NVCC_FULL_MATRIX" "$nvcc_full_matrix"
-  write_output "CUDA_VERSIONS" "$(echo "$nvcc_full_matrix" | jq -cr '[.[] | .cuda] | unique')"
-  write_output "HOST_COMPILERS" "$(echo "$nvcc_full_matrix" | jq -cr '[.[] | .compiler.name] | unique')"
-  write_output "PER_CUDA_COMPILER_MATRIX" "$(echo "$nvcc_full_matrix" | jq -cr ' group_by(.cuda + .compiler.name) | map({(.[0].cuda + "-" + .[0].compiler.name): .}) | add')"
+  local per_cuda_compiler_matrix="$(echo "$nvcc_full_matrix" | jq -cr ' group_by(.cuda + .compiler.name) | map({(.[0].cuda + "-" + .[0].compiler.name): .}) | add')"
+  write_output "PER_CUDA_COMPILER_MATRIX"  "$per_cuda_compiler_matrix"
+  write_output "PER_CUDA_COMPILER_KEYS" "$(echo "$per_cuda_compiler_matrix" | jq -r 'keys | @json')"
+
   write_output "NVRTC_MATRIX" "$(echo "$matrix" | jq '.nvrtc' | explode_std_versions)"
+
   local clang_cuda_matrix="$(echo "$matrix" | jq -cr '.["clang-cuda"]' | explode_std_versions | explode_libs)"
   write_output "CLANG_CUDA_MATRIX" "$clang_cuda_matrix"
   write_output "CCCL_INFRA_MATRIX" "$(echo "$matrix" | jq -cr '.["cccl-infra"]' )"

.github/workflows/pr.yml

@@ -40,10 +40,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       DEVCONTAINER_VERSION: ${{steps.set-outputs.outputs.DEVCONTAINER_VERSION}}
-      NVCC_FULL_MATRIX: ${{steps.set-outputs.outputs.NVCC_FULL_MATRIX}}
-      CUDA_VERSIONS: ${{steps.set-outputs.outputs.CUDA_VERSIONS}}
-      HOST_COMPILERS: ${{steps.set-outputs.outputs.HOST_COMPILERS}}
       PER_CUDA_COMPILER_MATRIX: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX}}
+      PER_CUDA_COMPILER_KEYS: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_KEYS}}
       NVRTC_MATRIX: ${{steps.set-outputs.outputs.NVRTC_MATRIX}}
       CLANG_CUDA_MATRIX: ${{steps.set-outputs.outputs.CLANG_CUDA_MATRIX}}
       CCCL_INFRA_MATRIX: ${{steps.set-outputs.outputs.CCCL_INFRA_MATRIX}}
@@ -56,7 +54,7 @@ jobs:
           .github/actions/compute-matrix/compute-matrix.sh ci/matrix.yaml pull_request
 
   nvrtc:
-    name: NVRTC CUDA${{matrix.cuda}} C++${{matrix.std}}
+    name: NVRTC CUDA${{matrix.cuda}}
     permissions:
       id-token: write
       contents: read
@@ -68,14 +66,14 @@ jobs:
       matrix:
         include: ${{ fromJSON(needs.compute-matrix.outputs.NVRTC_MATRIX) }}
     with:
-      name: NVRTC CUDA${{matrix.cuda}} C++${{matrix.std}}
+      name: Build and Test libcudacxx CUDA${{matrix.cuda}} C++${{matrix.std}}
       runner: linux-${{matrix.cpu}}-gpu-v100-latest-1
       image: rapidsai/devcontainers:${{needs.compute-matrix.outputs.DEVCONTAINER_VERSION}}-cpp-gcc12-cuda${{matrix.cuda}}-${{matrix.os}}
       command: |
         ./ci/nvrtc_libcudacxx.sh -cxx g++ -std ${{matrix.std}}
 
   thrust:
-    name: Thrust CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }}
+    name: Thrust CUDA${{ matrix.cuda_host_combination }}
     permissions:
       id-token: write
       contents: read
@@ -84,16 +82,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cuda_version: ${{ fromJSON(needs.compute-matrix.outputs.CUDA_VERSIONS) }}
-        compiler: ${{ fromJSON(needs.compute-matrix.outputs.HOST_COMPILERS) }}
+        cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
     with:
       project_name: "thrust"
-      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
+      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
       devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
-      is_windows: ${{ contains(matrix.compiler, 'cl') }}
+      is_windows: ${{ contains(matrix.cuda_host_combination, 'cl') }}
 
   cub:
-    name: CUB CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }}
+    name: CUB CUDA${{ matrix.cuda_host_combination }}
     permissions:
       id-token: write
       contents: read
@@ -102,16 +99,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cuda_version: ${{ fromJSON(needs.compute-matrix.outputs.CUDA_VERSIONS) }}
-        compiler: ${{ fromJSON(needs.compute-matrix.outputs.HOST_COMPILERS) }}
+        cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
     with:
       project_name: "cub"
-      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
+      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
       devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
-      is_windows: ${{ contains(matrix.compiler, 'cl') }}
+      is_windows: ${{ contains(matrix.cuda_host_combination, 'cl') }}
 
   libcudacxx:
-    name: libcudacxx CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }}
+    name: libcudacxx CUDA${{ matrix.cuda_host_combination }}
     permissions:
       id-token: write
       contents: read
@@ -120,16 +116,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cuda_version: ${{ fromJSON(needs.compute-matrix.outputs.CUDA_VERSIONS) }}
-        compiler: ${{ fromJSON(needs.compute-matrix.outputs.HOST_COMPILERS) }}
+        cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
     with:
       project_name: "libcudacxx"
-      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
+      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
       devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
-      is_windows: ${{ contains(matrix.compiler, 'cl') }}
+      is_windows: ${{ contains(matrix.cuda_host_combination, 'cl') }}
 
   clang-cuda:
-    name: ${{matrix.lib}} ${{matrix.cpu}}/CTK${{matrix.cuda}}/clang-cuda
+    name: ${{matrix.lib}} Clang CUDA
     permissions:
       id-token: write
       contents: read
@@ -140,7 +135,7 @@ jobs:
         include: ${{ fromJSON(needs.compute-matrix.outputs.CLANG_CUDA_MATRIX) }}
     uses: ./.github/workflows/run-as-coder.yml
     with:
-      name: ${{matrix.lib}} CTK${{matrix.cuda}} clang-cuda${{matrix.compiler.version}}/${{matrix.std}}
+      name: Build ${{matrix.lib}} ${{matrix.cpu}}/clang-cuda${{matrix.compiler.version}}/C++${{matrix.std}}
       runner: linux-${{matrix.cpu}}-cpu16
       image: rapidsai/devcontainers:${{needs.compute-matrix.outputs.DEVCONTAINER_VERSION}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
       command: |

.github/workflows/verify-devcontainers.yml

@@ -28,9 +28,10 @@ jobs:
         ./.devcontainer/make_devcontainers.sh --verbose
     - name: Check for changes
       run: |
-        if [[ $(git diff --stat) != '' ]]; then
+        if [[ $(git diff --stat) != '' || $(git status --porcelain | grep '^??') != '' ]]; then
           git diff --minimal
-          echo "::error:: Dev Container files are out of date. Run the .devcontainer/make_devcontainers.sh script and commit the changes."
+          git status --porcelain
+          echo "::error:: Dev Container files are out of date or there are untracked files. Run the .devcontainer/make_devcontainers.sh script and commit the changes."
           exit 1
         else
           echo "::note::Dev Container files are up-to-date."

ci/build_cub.sh

@@ -29,6 +29,10 @@ else
     echo "nvcc version is not determined (likely using a non-NVCC compiler). Not building CUB benchmarks."
 fi
 
+if [[ "$HOST_COMPILER" == *icpc* ]]; then
+    ENABLE_CUB_BENCHMARKS="false"
+fi
+
 PRESET="cub-cpp$CXX_STANDARD"
 
 CMAKE_OPTIONS="