Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/branch-24.10' into pylibcudf/t…
Browse files Browse the repository at this point in the history
…ransform
  • Loading branch information
mroeschke committed Sep 10, 2024
2 parents cd8f5ce + 6dd5689 commit a124f4a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
29 changes: 27 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ files:
- cuda
- cuda_version
- depends_on_cupy
- depends_on_libkvikio
- depends_on_librmm
- depends_on_rmm
- develop
Expand Down Expand Up @@ -135,6 +136,7 @@ files:
includes:
- build_base
- build_cpp
- depends_on_libkvikio
- depends_on_librmm
py_build_pylibcudf:
output: pyproject
Expand Down Expand Up @@ -349,8 +351,6 @@ dependencies:
- output_types: conda
packages:
- fmt>=10.1.1,<11
- librmm==24.10.*,>=0.0.0a0
- libkvikio==24.10.*,>=0.0.0a0
- flatbuffers==24.3.25
- librdkafka>=2.5.0,<2.6.0a0
# Align nvcomp version with rapids-cmake
Expand Down Expand Up @@ -889,6 +889,31 @@ dependencies:
packages: &cupy_packages_cu11
- cupy-cuda11x>=12.0.0
- {matrix: null, packages: *cupy_packages_cu11}
depends_on_libkvikio:
common:
- output_types: conda
packages:
- &libkvikio_unsuffixed libkvikio==24.10.*,>=0.0.0a0
- output_types: requirements
packages:
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- libkvikio-cu12==24.10.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- libkvikio-cu11==24.10.*,>=0.0.0a0
- matrix:
packages:
- *libkvikio_unsuffixed
depends_on_librmm:
common:
- output_types: conda
Expand Down
1 change: 1 addition & 0 deletions python/libcudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"libkvikio==24.10.*,>=0.0.0a0",
"librmm==24.10.*,>=0.0.0a0",
"ninja",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

0 comments on commit a124f4a

Please sign in to comment.