Skip to content

Commit

Permalink
Merge branch 'branch-24.02' into branch-24.02
Browse files Browse the repository at this point in the history
  • Loading branch information
BradReesWork authored Jan 19, 2024
2 parents 6eb6d85 + ec609ab commit 84d27c0
Show file tree
Hide file tree
Showing 14 changed files with 459 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repos:
pass_filenames: false
additional_dependencies: [gitpython]
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.5.1
rev: v1.8.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
6 changes: 5 additions & 1 deletion ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

set -euo pipefail

source rapids-env-update
rapids-configure-conda-channels

source rapids-configure-sccache

source rapids-date-string

export CMAKE_GENERATOR=Ninja

Expand Down
6 changes: 5 additions & 1 deletion ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

set -euo pipefail

source rapids-env-update
rapids-configure-conda-channels

source rapids-configure-sccache

source rapids-date-string

export CMAKE_GENERATOR=Ninja

Expand Down
13 changes: 7 additions & 6 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ channels:
dependencies:
- breathe
- c-compiler
- clang-tools=16.0.0
- clangxx=16.0.0
- clang-tools==16.0.6
- clangxx==16.0.6
- cmake>=3.26.4
- cuda-nvtx=11.8
- cudatoolkit=11.8
- cudnn=8.4
- cuda-version=11.8
- cudatoolkit
- cudnn=8.8
- cxx-compiler
- cython
- doxygen=1.8.20
- cython>=3.0.0
- doxygen==1.9.1
- gcc_linux-64=11.*
- gitpython
- graphviz
Expand Down
10 changes: 5 additions & 5 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ channels:
dependencies:
- breathe
- c-compiler
- clang-tools=16.0.0
- clangxx=16.0.0
- clang-tools==16.0.6
- clangxx==16.0.6
- cmake>=3.26.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx
- cuda-version=12.0
- cudnn=8.4
- cudnn=8.8
- cxx-compiler
- cython
- doxygen=1.8.20
- cython>=3.0.0
- doxygen==1.9.1
- gcc_linux-64=11.*
- gitpython
- graphviz
Expand Down
Loading

0 comments on commit 84d27c0

Please sign in to comment.