Skip to content

Commit

Permalink
Merge branch 'main' into stf_access_mode_dispatch
Browse files Browse the repository at this point in the history
  • Loading branch information
caugonnet authored Jan 9, 2025
2 parents 6b7a70a + fdaaf97 commit e29c730
Show file tree
Hide file tree
Showing 241 changed files with 2,045 additions and 3,083 deletions.
54 changes: 0 additions & 54 deletions .devcontainer/cuda11.1-gcc9/devcontainer.json

This file was deleted.

54 changes: 0 additions & 54 deletions .devcontainer/cuda11.1-llvm9/devcontainer.json

This file was deleted.

54 changes: 0 additions & 54 deletions .devcontainer/cuda11.8-gcc11/devcontainer.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda11.1",
"image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda12.0",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda11.1-gcc7",
"CCCL_CUDA_VERSION": "11.1",
"DEVCONTAINER_NAME": "cuda12.0-gcc7",
"CCCL_CUDA_VERSION": "12.0",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "7",
"CCCL_BUILD_INFIX": "cuda11.1-gcc7",
"CCCL_BUILD_INFIX": "cuda12.0-gcc7",
"CCCL_CUDA_EXTENDED": "false"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
Expand Down Expand Up @@ -50,5 +50,5 @@
}
}
},
"name": "cuda11.1-gcc7"
"name": "cuda12.0-gcc7"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda11.1",
"image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda12.0",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda11.1-gcc8",
"CCCL_CUDA_VERSION": "11.1",
"DEVCONTAINER_NAME": "cuda12.0-gcc8",
"CCCL_CUDA_VERSION": "12.0",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "8",
"CCCL_BUILD_INFIX": "cuda11.1-gcc8",
"CCCL_BUILD_INFIX": "cuda12.0-gcc8",
"CCCL_CUDA_EXTENDED": "false"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
Expand Down Expand Up @@ -50,5 +50,5 @@
}
}
},
"name": "cuda11.1-gcc8"
"name": "cuda12.0-gcc8"
}
1 change: 1 addition & 0 deletions .github/actions/workflow-run-job-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ runs:
docker run \
--mount type=bind,source="${{steps.paths.outputs.HOST_REPO}}",target="${{steps.paths.outputs.MOUNT_REPO}}" \
--workdir "${{steps.paths.outputs.MOUNT_REPO}}" \
--isolation=process \
${{ inputs.image }} \
powershell -c "
[System.Environment]::SetEnvironmentVariable('AWS_ACCESS_KEY_ID','${{env.AWS_ACCESS_KEY_ID}}');
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
rev: v19.1.6
hooks:
- id: clang-format
types_or: [file]
Expand All @@ -39,7 +39,7 @@ repos:
# TODO/REMINDER: add the Ruff vscode extension to the devcontainers
# Ruff, the Python auto-correcting linter/formatter written in Rust
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.3
rev: v0.8.6
hooks:
- id: ruff # linter
- id: ruff-format # formatter
Expand All @@ -57,7 +57,7 @@ repos:
- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.13.0'
rev: 'v1.14.1'
hooks:
- id: mypy
additional_dependencies: [types-cachetools, numpy]
Expand Down
Loading

0 comments on commit e29c730

Please sign in to comment.