Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-25.02 into branch-25.04 #454

Merged
merged 5 commits into from
Jan 29, 2025
Merged

Forward-merge branch-25.02 into branch-25.04 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
febd04e
Remove CUDA 12.0 and 12.2 unified RAPIDS devcontainers. (#452)
bdice Jan 27, 2025
c3bf959
Backport Miniforge PRs (#457)
bdice Jan 28, 2025
02184c5
Add CUDA 12.8 to CUDA feature (#453)
bdice Jan 28, 2025
492b22e
Bump CUDA 12.0 MSVC version (#460)
trxcllnt Jan 28, 2025
3cb540c
Add CUDA 12.8 RAPIDS devcontainers. (#459)
bdice Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions .devcontainer/cuda12.2-conda/devcontainer.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .devcontainer/cuda12.2-conda/features
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions .devcontainer/cuda12.2-pip/devcontainer.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .devcontainer/cuda12.2-pip/features
View file
Open in desktop

This file was deleted.

15 changes: 7 additions & 8 deletions ...ontainer/cuda12.0-conda/devcontainer.json → ...ontainer/cuda12.8-conda/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"context": "${localWorkspaceFolder}/.devcontainer",
"dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
"args": {
"CUDA": "12.0",
"CUDA": "12.8",
"PYTHON_PACKAGE_MANAGER": "conda",
"BASE": "rapidsai/devcontainers:25.02-cpp-mambaforge-ubuntu22.04"
}
},
"runArgs": [
"--rm",
"--name",
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.0-conda"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-conda"
],
"hostRequirements": {"gpu": "optional"},
"features": {
"./features/src/cuda": {
"version": "12.0",
"version": "12.8",
"installCompilers": false,
"installProfilers": true,
"installCTKLibraries": false,
Expand Down Expand Up @@ -45,12 +45,11 @@
"./features/src/utils",
"./features/src/rapids-build-utils"
],
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/.vscode/server ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.0-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph,cuspatial}"],
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph,cuspatial}"],
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
"workspaceFolder": "/home/coder",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
"mounts": [
"source=${localWorkspaceFolder}/.vscode/server,target=/home/coder/.vscode-server,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../rmm,target=/home/coder/rmm,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../kvikio,target=/home/coder/kvikio,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../ucxx,target=/home/coder/ucxx,type=bind,consistency=consistent",
Expand All @@ -67,10 +66,10 @@
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.0-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.0-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.0-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
"source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
],
"customizations": {
"vscode": {
Expand Down
0 .devcontainer/cuda12.0-conda/features → .devcontainer/cuda12.8-conda/features
View file
Open in desktop
File renamed without changes.
19 changes: 9 additions & 10 deletions .devcontainer/cuda12.0-pip/devcontainer.json → .devcontainer/cuda12.8-pip/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"context": "${localWorkspaceFolder}/.devcontainer",
"dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
"args": {
"CUDA": "12.0",
"CUDA": "12.8",
"PYTHON_PACKAGE_MANAGER": "pip",
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.0-ucx1.18.0-openmpi-ubuntu22.04"
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
}
},
"runArgs": [
"--rm",
"--name",
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.0-pip"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-pip"
],
"hostRequirements": {"gpu": "optional"},
"features": {
"./features/src/cuda": {
"version": "12.0",
"cuDNNVersion": "8",
"version": "12.8",
"cuDNNVersion": "9",
"installcuBLAS": true,
"installcuDNN": true,
"installcuSOLVER": true,
Expand All @@ -33,12 +33,11 @@
"./features/src/utils",
"./features/src/rapids-build-utils"
],
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/.vscode/server ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph,cuspatial}"],
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph,cuspatial}"],
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
"workspaceFolder": "/home/coder",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
"mounts": [
"source=${localWorkspaceFolder}/.vscode/server,target=/home/coder/.vscode-server,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../rmm,target=/home/coder/rmm,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../kvikio,target=/home/coder/kvikio,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../ucxx,target=/home/coder/ucxx,type=bind,consistency=consistent",
Expand All @@ -54,10 +53,10 @@
"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",
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.0-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.0-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
"source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
],
"customizations": {
"vscode": {
Expand Down
0 .devcontainer/cuda12.0-pip/features → .devcontainer/cuda12.8-pip/features
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions .github/workflows/build-all-rapids-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ jobs:
pull-requests: read
with:
arch: '["amd64"]'
# Disabling CUDA 12.0 due to failures in cudf builds. See:
# https://github.com/rapidsai/devcontainers/pull/438#issuecomment-2596318879
#cuda: '["12.0", "12.5"]'
cuda: '["12.5"]'
node_type: cpu32
extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY
Expand Down
4 changes: 3 additions & 1 deletion features/src/cuda/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"name": "CUDA Toolkit",
"id": "cuda",
"version": "25.2.0",
"version": "25.2.1",
"description": "A feature to install the NVIDIA CUDA Toolkit",
"options": {
"version": {
"type": "string",
"proposals": [
"12.8",
"12.6",
"12.5",
"12.4",
"12.3",
Expand Down
2 changes: 1 addition & 1 deletion features/src/mambaforge/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Mambaforge",
"id": "mambaforge",
"version": "25.2.0",
"version": "25.2.1",
"description": "A feature to install mambaforge",
"options": {
"version": {
Expand Down
Loading