Merge branch 'branch-24.02' of github.com:rapidsai/devcontainers into…

… fix/dfg-version-24.04
rapidsai · Jul 9, 2024 · 23d2e22 · 23d2e22
2 parents d1ae395 + 4a5ee21
commit 23d2e22
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 60 deletions.
diff --git a/.devcontainer/build-rapids.sh b/.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;
 

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.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"},

diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.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"},

diff --git a/USAGE.md b/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.
 

diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
@@ -25,94 +25,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",

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/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: