diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 5894128e..2dcdddcf 100644 --- 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": "23.10.15", + "version": "23.10.16", "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/install.sh b/features/src/rapids-build-utils/install.sh index 49b9fc0d..2eba3588 100644 --- a/features/src/rapids-build-utils/install.sh +++ b/features/src/rapids-build-utils/install.sh @@ -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/ diff --git a/matrix.yml b/matrix.yml index 996c0de2..bdbc0485 100644 --- a/matrix.yml +++ b/matrix.yml @@ -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" } @@ -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}