From 48c1bb029ff6c2e7f120bfd63c73834c7a73c4eb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 5 Sep 2024 11:35:18 -0700 Subject: [PATCH 1/2] use libkvikio in wheel builds --- dependencies.yaml | 28 +++++++++++++++++++++++++++- python/libcudf/pyproject.toml | 1 + 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 32c1d7a0845..3050fbdebbd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -13,6 +13,7 @@ files: - cuda - cuda_version - depends_on_cupy + - depends_on_libkvikio - depends_on_librmm - depends_on_rmm - develop @@ -135,6 +136,7 @@ files: includes: - build_base - build_cpp + - depends_on_libkvikio - depends_on_librmm py_build_pylibcudf: output: pyproject @@ -350,7 +352,6 @@ dependencies: 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 @@ -889,6 +890,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 diff --git a/python/libcudf/pyproject.toml b/python/libcudf/pyproject.toml index 5f4b9957fd0..2c98b97eddf 100644 --- a/python/libcudf/pyproject.toml +++ b/python/libcudf/pyproject.toml @@ -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`. From b46bd0bdce0ad0f6565f69d22841a0a44a7acd16 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 10 Sep 2024 09:31:19 -0500 Subject: [PATCH 2/2] Remove extraneous librmm (covered in depends_on_librmm). --- dependencies.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3050fbdebbd..483335c02ff 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -351,7 +351,6 @@ dependencies: - output_types: conda packages: - fmt>=10.1.1,<11 - - librmm==24.10.*,>=0.0.0a0 - flatbuffers==24.3.25 - librdkafka>=2.5.0,<2.6.0a0 # Align nvcomp version with rapids-cmake