Revert "Merge branch 'branch-24.04' into branch-24.02"

This reverts commit 03d3fd4, reversing
changes made to 635876f.

.devcontainer/build-rapids.sh

@@ -47,7 +47,7 @@ build_rapids() {
     (
         echo "building cuDF";
         clean-cudf;
-        build-cudf -DBUILD_BENCHMARKS=ON --verbose
+        build-cudf -DBUILD_BENCHMARKS=ON -DNVBench_ENABLE_CUPTI=OFF --verbose
         sccache -s;
     ) 2>&1 | maybe_write_build_log cudf;
 

.devcontainer/cuda11.8-conda/devcontainer.json

@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:24.04-cpp-cuda11.8-mambaforge-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.02-cpp-cuda11.8-mambaforge-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},

.devcontainer/cuda11.8-pip/devcontainer.json

@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda11.8-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda11.8-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},

.devcontainer/cuda12.0-conda/devcontainer.json

@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:24.04-cpp-mambaforge-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.02-cpp-mambaforge-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},

.devcontainer/cuda12.0-pip/devcontainer.json

@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda12.0-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.0-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},

.github/actions/setup-runner-env/action.yml

@@ -5,46 +5,35 @@ description: Setup self-hosted runner environment
 runs:
   using: composite
   steps:
-    - name: Dump env
-      shell: bash -eo pipefail {0}
-      run: echo "${{ toJSON(env) }}"
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
     - name: Create docker context
       shell: bash
       run: docker context create builder
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
-      name: Setup docker buildx on github-hosted runners
-      uses: docker/setup-buildx-action@v2
-      with:
-        buildkitd-flags: --debug
-        endpoint: builder
-
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
-      name: Setup docker buildx on self-hosted runners
+    - name: Setup docker buildx
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug --config /etc/buildkit/buildkitd.toml

USAGE.md

@@ -19,11 +19,11 @@ The features that comprise the image are noted in the image tags. If no version
 
 The pre-built images can be used as the `"image"`, or as the base of a Dockerfile in `"build"`, in `devcontainer.json`:
 
-<details><summary>devcontainer.json using pre-built image</summary><pre>{<br/>  "image": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda12.0-nvhpc23.5-ubuntu22.04",<br/>  "hostRequirements": { "gpu": true },<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
+<details><summary>devcontainer.json using pre-built image</summary><pre>{<br/>  "image": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.0-nvhpc23.5-ubuntu22.04",<br/>  "hostRequirements": { "gpu": true },<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
 
 You can also build a custom devcontainer by composing individual features:
 
-<details><summary>devcontainer.json using individual features</summary><pre>{<br/>  "image": "ubuntu:22.04",<br/>  "features": {<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake:24.04": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja:24.04": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache:24.04": {<br/>      "version": "0.5.4"<br/>    }<br/>  },<br/>  "overrideFeatureInstallOrder": [<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake",<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja",<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache"<br/>  ],<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
+<details><summary>devcontainer.json using individual features</summary><pre>{<br/>  "image": "ubuntu:22.04",<br/>  "features": {<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake:24.02": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja:24.02": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache:24.02": {<br/>      "version": "0.5.4"<br/>    }<br/>  },<br/>  "overrideFeatureInstallOrder": [<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake",<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja",<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache"<br/>  ],<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
 
 > **NOTE:** Feature updates published since your most recent image build will invalidate your docker image layer cache, meaning it can take the [devcontainers CLI](https://github.com/devcontainers/cli) longer to initialize containers composed from individual features.
 

features/src/cccl-dev/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "24.4.0",
+  "version": "24.2.2",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {

features/src/cmake/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "CMake",
   "id": "cmake",
-  "version": "24.4.0",
+  "version": "24.2.0",
   "description": "A feature to install CMake",
   "options": {
     "version": {

features/src/cuda/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.4.0",
+  "version": "24.2.2",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {
@@ -23,94 +23,94 @@
       "description": "Version of the CUDA Toolkit to install."
     },
     "installCompilers": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install NVIDIA CUDA Compiler (nvcc)"
+        "type": "boolean",
+        "default": true,
+        "description": "Install NVIDIA CUDA Compiler (nvcc)"
     },
     "installProfilers": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install NVIDIA NSight Systems Profiler (nsys)"
+        "type": "boolean",
+        "default": true,
+        "description": "Install NVIDIA NSight Systems Profiler (nsys)"
     },
     "installCTKLibraries": {
-      "type": "boolean",
-      "default": true,
-      "description": "Shortcut to install all CUDA Toolkit Libraries"
+        "type": "boolean",
+        "default": true,
+        "description": "Shortcut to install all CUDA Toolkit Libraries"
     },
     "installDevPackages": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether to install the CUDA dev packages (static libraries + headers)"
+        "type": "boolean",
+        "default": true,
+        "description": "Whether to install the CUDA dev packages (static libraries + headers)"
     },
     "installcuDNN": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Deep Neural Network Library (cuDNN)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Deep Neural Network Library (cuDNN)"
     },
     "installcuTensor": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Tensor Linear Algebra Library (cuTensor)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Tensor Linear Algebra Library (cuTensor)"
     },
     "installNCCL": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install NVIDIA Collective Communications Library (NCCL)"
+        "type": "boolean",
+        "default": true,
+        "description": "Install NVIDIA Collective Communications Library (NCCL)"
     },
     "installCUDARuntime": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install CUDA Runtime Library (cudart)"
+        "type": "boolean",
+        "default": true,
+        "description": "Install CUDA Runtime Library (cudart)"
     },
     "installNVRTC": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install NVIDIA Runtime Compilation Library (NVRTC)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install NVIDIA Runtime Compilation Library (NVRTC)"
     },
     "installOpenCL": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install NVIDIA CUDA OpenCL Library"
+        "type": "boolean",
+        "default": false,
+        "description": "Install NVIDIA CUDA OpenCL Library"
     },
     "installcuBLAS": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Basic Linear Algebra Library (cuBLAS)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Basic Linear Algebra Library (cuBLAS)"
     },
     "installcuSPARSE": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Basic Linear Algebra for Sparse Matrices Library (cuSPARSE)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Basic Linear Algebra for Sparse Matrices Library (cuSPARSE)"
     },
     "installcuFFT": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Fast Fourier Transform Library (cuFFT)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Fast Fourier Transform Library (cuFFT)"
     },
     "installcuFile": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA GPUDirect Storage API Library (cuFile)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA GPUDirect Storage API Library (cuFile)"
     },
     "installcuRAND": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Random Number Generation Library (cuRAND)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Random Number Generation Library (cuRAND)"
     },
     "installcuSOLVER": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install CUDA Direct Linear Solvers Library (cuSOLVER)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install CUDA Direct Linear Solvers Library (cuSOLVER)"
     },
     "installNPP": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install NVIDIA Performance Primitives (NPP)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install NVIDIA Performance Primitives (NPP)"
     },
     "installnvJPEG": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install NVIDIA JPEG decoder, encoder, and transcoder library (nvJPEG)"
+        "type": "boolean",
+        "default": false,
+        "description": "Install NVIDIA JPEG decoder, encoder, and transcoder library (nvJPEG)"
     },
     "pruneStaticLibs": {
       "type": "boolean",

features/src/gcc/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "GCC",
   "id": "gcc",
-  "version": "24.4.0",
+  "version": "24.2.1",
   "description": "A feature to install gcc",
   "options": {
     "version": {

features/src/gitlab-cli/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "gitlab-cli",
-  "version": "24.4.0",
+  "version": "24.2.0",
   "name": "GitLab CLI",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/gitlab-cli",
   "description": "Installs the GitLab CLI. Auto-detects latest version and installs needed dependencies.",

features/src/llvm/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "LLVM compilers and tools",
   "id": "llvm",
-  "version": "24.4.0",
+  "version": "24.2.3",
   "description": "A feature to install LLVM compilers and tools",
   "options": {
     "version": {

features/src/mambaforge/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.4.2",
+  "version": "24.2.3",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {

features/src/ninja/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "Ninja build",
   "id": "ninja",
-  "version": "24.4.0",
+  "version": "24.2.0",
   "description": "A feature to install ninja-build",
   "options": {
     "version": {

features/src/nvhpc/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "24.4.0",
+  "version": "24.2.2",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {

features/src/oneapi/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "Intel oneapi toolchain",
   "id": "oneapi",
-  "version": "24.4.0",
+  "version": "24.2.0",
   "description": "A feature to install the Intel oneapi toolchain",
   "options": {
     "version": {

features/src/rapids-build-utils/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.4.0",
+  "version": "24.2.7",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml

@@ -1,6 +1,6 @@
 x-git-defaults: &git_defaults
     host: github
-    tag: branch-24.04
+    tag: branch-24.02
     upstream: rapidsai
 
 repos:
@@ -24,7 +24,7 @@ repos:
   git:
     repo: ucxx
     <<: *git_defaults
-    tag: branch-0.37
+    tag: branch-0.36
   cpp:
     - name: ucxx
       sub_dir: "cpp"
@@ -158,9 +158,6 @@ repos:
     - name: cugraph
       sub_dir: cpp
       depends: [rmm, raft, cugraph-ops]
-    - name: cugraph_etl
-      sub_dir: cpp/libcugraph_etl
-      depends: [cugraph, cudf]
   python:
     - name: pylibcugraph
       sub_dir: python/pylibcugraph
@@ -174,9 +171,6 @@ repos:
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       depends: [cugraph]
-    - name: cugraph-equivariant
-      sub_dir: python/cugraph-equivariant
-      depends: [cugraph]
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       depends: [cugraph]