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

Jump to bottom

Forward-merge branch-23.10 into branch-23.12 #356

Closed
wants to merge 2 commits into from
Closed

Forward-merge branch-23.10 into branch-23.12 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab0a0c
Add gcc-13 devcontainer to cccl
miscco Oct 9, 2023
6c78cc0
Pin to rapids-dependency-file-generator<1.14 (23.10) (#348)
trxcllnt Jul 9, 2024
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
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA RAPIDS devcontainer build utilities",
"id": "rapids-build-utils",
"version": "23.10.15",
"version": "23.10.16",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi

# Install the rapids dependency file generator and conda-merge
if type python >/dev/null 2>&1; then
python -m pip install rapids-dependency-file-generator conda-merge toml;
python -m pip install 'rapids-dependency-file-generator<1.14' conda-merge toml;
fi

# Install RAPIDS build utility scripts to /opt/
Expand Down
2 changes: 2 additions & 0 deletions matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ x-gcc-9: &gcc_9 { name: "gcc", version: "9" }
x-gcc-10: &gcc_10 { name: "gcc", version: "10" }
x-gcc-11: &gcc_11 { name: "gcc", version: "11" }
x-gcc-12: &gcc_12 { name: "gcc", version: "12" }
x-gcc-13: &gcc_13 { name: "gcc", version: "13" }
x-gcc-env: &gcc_env {CC: "gcc", CXX: "g++"}

x-oneapi: &oneapi_2022 { name: "oneapi", version: "2023.2.0" }
Expand Down Expand Up @@ -78,6 +79,7 @@ include:
- {features: [*nvhpc_curr, *python, *cccl_dev], env: *nvhpc_env}
- {features: [*gcc_11, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *gcc_env}
- {features: [*gcc_12, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *gcc_env}
- {features: [*gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *gcc_env}
- {features: [*llvm_15, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *llvm_env}
- {features: [*llvm_prev, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *llvm_env}
- {features: [*llvm_curr, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *llvm_env}
Expand Down
Loading