Skip to content

Commit

Permalink
Merge branch 'branch-24.04' into fea/mark_kernels_as_internal
Browse files Browse the repository at this point in the history
  • Loading branch information
naimnv authored Feb 12, 2024
2 parents 6e6073d + f63310c commit 09e9295
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- breathe
- c-compiler
- cmake>=3.26.4
- cuda-nvtx
- cuda-version=11.8
- cudatoolkit
- cudf==24.4.*
Expand Down
7 changes: 7 additions & 0 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ dependencies:
- breathe
- c-compiler
- cmake>=3.26.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-version=12.0
- cudf==24.4.*
- cupy>=12.0.0
Expand All @@ -29,8 +32,12 @@ dependencies:
- graphviz
- gtest>=1.13.0
- ipython
- libcublas-dev
- libcudf==24.4.*
- libcugraphops==24.4.*
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- libraft-headers==24.4.*
- libraft==24.4.*
- librmm==24.4.*
Expand Down
10 changes: 9 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,18 @@ dependencies:
- matrix:
cuda: "12.*"
packages:
- cuda-cudart-dev
- cuda-nvtx-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- matrix:
cuda: "11.*"
packages:
- cudatoolkit
- cuda-nvtx
common_build:
common:
- output_types: [conda, pyproject]
Expand All @@ -345,6 +353,7 @@ dependencies:
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- libcudf==24.4.*
- libcugraphops==24.4.*
- libraft-headers==24.4.*
- libraft==24.4.*
Expand Down Expand Up @@ -438,7 +447,6 @@ dependencies:
packages:
- aiohttp
- fsspec>=0.6.0
- libcudf==24.4.*
- requests
- nccl>=2.9.9
- ucx-proc=*=gpu
Expand Down

0 comments on commit 09e9295

Please sign in to comment.