merge 24.10

rapidsai · Aug 7, 2024 · fa3591b · fa3591b
2 parents 2628199 + c97bb48
commit fa3591b
Show file tree

Hide file tree

Showing 27 changed files with 38 additions and 38 deletions.
diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "11.8",
  "PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:24.08-cpp-cuda11.8-mambaforge-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-cuda11.8-mambaforge-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-conda"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda11.8-conda"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "11.8",
  "PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:24.08-cpp-cuda11.8-ucx1.15.0-openmpi-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-pip"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda11.8-pip"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.0",
  "PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:24.08-cpp-mambaforge-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.0-conda"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.0-conda"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.0",
  "PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:24.08-cpp-cuda12.0-ucx1.15.0-openmpi-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-cuda12.0-ucx1.17.0-openmpi-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.0-pip"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.0-pip"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.2",
  "PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:24.08-cpp-mambaforge-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-conda"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.2-conda"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.2",
  "PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:24.08-cpp-cuda12.2-ucx1.15.0-openmpi-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-cuda12.2-ucx1.17.0-openmpi-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-pip"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.2-pip"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.5-conda/devcontainer.json b/.devcontainer/cuda12.5-conda/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.5",
  "PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:24.08-cpp-mambaforge-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.5-conda"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.5-conda"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.devcontainer/cuda12.5-pip/devcontainer.json b/.devcontainer/cuda12.5-pip/devcontainer.json
@@ -5,13 +5,13 @@
  "args": {
  "CUDA": "12.5",
  "PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:24.08-cpp-cuda12.5-ucx1.15.0-openmpi-ubuntu22.04"
+ "BASE": "rapidsai/devcontainers:24.10-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04"
  }
  },
  "runArgs": [
  "--rm",
  "--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.5-pip"
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.10-cuda12.5-pip"
  ],
  "hostRequirements": {"gpu": "optional"},
  "features": {

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
@@ -27,7 +27,7 @@ jobs:
  if: needs.check-event.outputs.ok == 'true'
  needs: check-event
  secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.08
+ uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10
  permissions:
  actions: read
  packages: read

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.08-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.10-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.8": {},<br/> "ghcr.io/rapidsai/devcontainers/features/ninja:24.8": {},<br/> "ghcr.io/rapidsai/devcontainers/features/sccache:24.8": {<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.10": {},<br/> "ghcr.io/rapidsai/devcontainers/features/ninja:24.10": {},<br/> "ghcr.io/rapidsai/devcontainers/features/sccache:24.10": {<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/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "NVIDIA CCCL development utilities",
  "id": "cccl-dev",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install NVIDIA CCCL development utilities",
  "options": {
  "litVersion": {

diff --git a/features/src/cmake/devcontainer-feature.json b/features/src/cmake/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "CMake",
  "id": "cmake",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install CMake",
  "options": {
  "version": {

diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "CUDA Toolkit",
  "id": "cuda",
- "version": "24.8.2",
+ "version": "24.10.0",
  "description": "A feature to install the NVIDIA CUDA Toolkit",
  "options": {
  "version": {

diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "GCC",
  "id": "gcc",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install gcc",
  "options": {
  "version": {

diff --git a/features/src/gitlab-cli/devcontainer-feature.json b/features/src/gitlab-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
  "id": "gitlab-cli",
- "version": "24.8.1",
+ "version": "24.10.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.",

diff --git a/features/src/llvm/devcontainer-feature.json b/features/src/llvm/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "LLVM compilers and tools",
  "id": "llvm",
- "version": "24.8.2",
+ "version": "24.10.1",
  "description": "A feature to install LLVM compilers and tools",
  "options": {
  "version": {

diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "Mambaforge",
  "id": "mambaforge",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install mambaforge",
  "options": {
  "version": {

diff --git a/features/src/ninja/devcontainer-feature.json b/features/src/ninja/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "Ninja build",
  "id": "ninja",
- "version": "24.8.2",
+ "version": "24.10.0",
  "description": "A feature to install ninja-build",
  "options": {
  "version": {

diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "NVHPC SDK",
  "id": "nvhpc",
- "version": "24.8.2",
+ "version": "24.10.0",
  "description": "A feature to install the NVHPC SDK",
  "options": {
  "version": {

diff --git a/features/src/oneapi/devcontainer-feature.json b/features/src/oneapi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "Intel oneapi toolchain",
  "id": "oneapi",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install the Intel oneapi toolchain",
  "options": {
  "version": {

diff --git a/features/src/openmpi/devcontainer-feature.json b/features/src/openmpi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "OpenMPI",
  "id": "openmpi",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install OpenMPI with optional CUDA and UCX support",
  "options": {
  "version": {

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "NVIDIA RAPIDS devcontainer build utilities",
  "id": "rapids-build-utils",
- "version": "24.8.16",
+ "version": "24.10.3",
  "description": "A feature to install the RAPIDS devcontainer build utilities",
  "containerEnv": {
  "BASH_ENV": "/etc/bash.bash_env"

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.08
+ tag: branch-24.10
  upstream: rapidsai
 
 x-rapids-build-backend-args: &rapids_build_backend_args |
@@ -28,7 +28,7 @@ repos:
 
 - name: ucxx
  path: ucxx
- git: {<<: *git_defaults, repo: ucxx, tag: branch-0.39}
+ git: {<<: *git_defaults, repo: ucxx, tag: branch-0.40}
  cpp:
  - name: ucxx
  sub_dir: cpp
@@ -39,7 +39,7 @@ repos:
  -DUCXX_ENABLE_RMM=ON
  python:
  - name: ucxx
- sub_dir: python
+ sub_dir: python/ucxx
  depends: [ucxx]
  args: {cmake: -DFIND_UCXX_CPP=ON, install: *rapids_build_backend_args}
  - name: distributed-ucxx

diff --git a/features/src/rust/devcontainer-feature.json b/features/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
  "id": "rust",
- "version": "24.8.1",
+ "version": "24.10.0",
  "name": "Rust",
  "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/rust",
  "description": "Installs Rust, common Rust utilities, and their required dependencies",

diff --git a/features/src/sccache/devcontainer-feature.json b/features/src/sccache/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "sccache",
  "id": "sccache",
- "version": "24.8.1",
+ "version": "24.10.0",
  "description": "A feature to install sccache",
  "options": {
  "version": {

diff --git a/features/src/ucx/devcontainer-feature.json b/features/src/ucx/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "UCX",
  "id": "ucx",
- "version": "24.8.3",
+ "version": "24.10.0",
  "description": "A feature to install UCX",
  "options": {
  "version": {

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
  "name": "devcontainer-utils",
  "id": "utils",
- "version": "24.8.6",
+ "version": "24.10.0",
  "description": "A feature to install RAPIDS devcontainer utility scripts",
  "containerEnv": {
  "BASH_ENV": "/etc/bash.bash_env"