From 198986875ec9f4dd62771d4f9a36ad903207fe52 Mon Sep 17 00:00:00 2001
From: Allison Piper <alliepiper16@gmail.com>
Date: Fri, 5 Apr 2024 19:25:04 +0000
Subject: [PATCH] More matrix/devcontainer updates.

---
 .../cuda12.4-oneapi2023.2.0/devcontainer.json | 46 -------------------
 ci/matrix.yaml                                | 14 ------
 2 files changed, 60 deletions(-)
 delete mode 100644 .devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json

diff --git a/.devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json b/.devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json
deleted file mode 100644
index 04d71c2..0000000
--- a/.devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.06-cpp-oneapi2023.2.0-cuda12.4-ubuntu22.04",
-  "hostRequirements": {
-    "gpu": "optional"
-  },
-  "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.4-oneapi2023.2.0",
-    "CCCL_CUDA_VERSION": "12.4",
-    "CCCL_HOST_COMPILER": "oneapi",
-    "CCCL_HOST_COMPILER_VERSION": "2023.2.0",
-    "CCCL_BUILD_INFIX": "cuda12.4-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.4-oneapi2023.2.0"
-}
diff --git a/ci/matrix.yaml b/ci/matrix.yaml
index cc85f5f..26d4162 100644
--- a/ci/matrix.yaml
+++ b/ci/matrix.yaml
@@ -4,24 +4,16 @@ cuda_prev_max: &cuda_prev_max '11.8'
 cuda_curr_min: &cuda_curr_min '12.0'
 cuda_curr_max: &cuda_curr_max '12.4'
 
-# The GPUs to test on
-gpus:
-  - 'a100'
-  - 'v100'
-
 # The version of the devcontainer images to use from https://hub.docker.com/r/rapidsai/devcontainers
 devcontainer_version: '24.06'
 
 # gcc compiler configurations
-gcc6: &gcc6 { name: 'gcc', version: '6', exe: 'g++' }
 gcc7: &gcc7 { name: 'gcc', version: '7', exe: 'g++' }
 gcc8: &gcc8 { name: 'gcc', version: '8', exe: 'g++' }
 gcc9: &gcc9 { name: 'gcc', version: '9', exe: 'g++' }
 gcc10: &gcc10 { name: 'gcc', version: '10', exe: 'g++' }
 gcc11: &gcc11 { name: 'gcc', version: '11', exe: 'g++' }
 gcc12: &gcc12 { name: 'gcc', version: '12', exe: 'g++' }
-gcc-oldest: &gcc-oldest { name: 'gcc', version: '6', exe: 'g++' }
-gcc-newest: &gcc-newest { name: 'gcc', version: '12', exe: 'g++' }
 
 # LLVM Compiler configurations
 llvm9: &llvm9 { name: 'llvm', version: '9', exe: 'clang++' }
@@ -32,17 +24,12 @@ llvm13: &llvm13 { name: 'llvm', version: '13', exe: 'clang++' }
 llvm14: &llvm14 { name: 'llvm', version: '14', exe: 'clang++' }
 llvm15: &llvm15 { name: 'llvm', version: '15', exe: 'clang++' }
 llvm16: &llvm16 { name: 'llvm', version: '16', exe: 'clang++' }
-llvm-oldest: &llvm-oldest { name: 'llvm', version: '9', exe: 'clang++' }
-llvm-newest: &llvm-newest { name: 'llvm', version: '16', exe: 'clang++' }
 
 # MSVC configs
 msvc2017: &msvc2017 { name: 'cl', version: '14.16', exe: 'cl++' }
 msvc2019: &msvc2019 { name: 'cl', version: '14.29', exe: 'cl++' }
 msvc2022: &msvc2022 { name: 'cl', version: '14.39', exe: 'cl++' }
 
-# oneAPI configs
-oneapi: &oneapi { name: 'oneapi', version: '2023.2.0', exe: 'icpc' }
-
 # Each environment below will generate a unique build/test job
 # See the "compute-matrix" job in the workflow for how this is parsed and used
 # cuda: The CUDA Toolkit version
@@ -94,4 +81,3 @@ pull_request:
     - {cuda: *cuda_curr_max, os: 'windows2022', cpu: 'amd64', compiler: *msvc2017, std: [17]}
     - {cuda: *cuda_curr_max, os: 'windows2022', cpu: 'amd64', compiler: *msvc2019, std: [17]}
     - {cuda: *cuda_curr_max, os: 'windows2022', cpu: 'amd64', compiler: *msvc2022, std: [17]}
-    - {cuda: *cuda_curr_max, os: 'ubuntu22.04', cpu: 'amd64', compiler: *oneapi,   std: [17]}