From 5205308129446734a27f877d77a464e8e8dc5d05 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Apr 2023 15:44:52 -0500 Subject: [PATCH 1/4] Use libkvikio conda packages in libcudf. --- conda/recipes/libcudf/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index c796bbf6240..f623a98fa1a 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -41,6 +41,7 @@ requirements: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - librmm ={{ minor_version }} + - libkvikio ={{ minor_version }} - cudatoolkit ={{ cuda_version }} - cuda-nvrtc ={{ cuda_version }} - cuda-nvrtc-dev ={{ cuda_version }} @@ -72,6 +73,7 @@ outputs: run: - cudatoolkit {{ cuda_spec }} - librmm ={{ minor_version }} + - libkvikio ={{ minor_version }} - libarrow {{ libarrow_version }} - dlpack {{ dlpack_version }} - gtest {{ gtest_version }} From e61f08218316281d8088d4285738aaed0df8e118 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Apr 2023 15:51:00 -0500 Subject: [PATCH 2/4] Add libkvikio in dependencies.yaml. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + dependencies.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a67b9fbce4e..feb71fd0cf6 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -38,6 +38,7 @@ dependencies: - libarrow==11.0.0.* - libcurand-dev=10.3.0.86 - libcurand=10.3.0.86 +- libkvikio==23.6.* - librdkafka>=1.9.0,<1.10.0a0 - librmm==23.6.* - mimesis>=4.1.0 diff --git a/dependencies.yaml b/dependencies.yaml index cf23bf93904..b2332d052f5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -209,6 +209,7 @@ dependencies: - output_types: [conda, requirements] packages: - librmm==23.6.* + - libkvikio==23.6.* - output_types: conda packages: - fmt>=9.1.0,<10 From e71b48ab5e8cd8ba0b1f458cb99e4c1c5de9d797 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Apr 2023 16:01:30 -0500 Subject: [PATCH 3/4] Add explicit libcufile dependency. --- conda/recipes/libcudf/conda_build_config.yaml | 10 ++++++++++ conda/recipes/libcudf/meta.yaml | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index d592635b52a..d89cbee67d0 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -25,6 +25,16 @@ dlpack_version: librdkafka_version: - ">=1.9.0,<1.10.0a0" +# The CTK libraries below are missing from the conda-forge::cudatoolkit +# package. The "*_host_*" version specifiers correspond to `11.8` packages and the +# "*_run_*" version specifiers correspond to `11.x` packages. + +libcufile_host_version: + - "1.4.0.31" + +libcufile_run_version: + - ">=1.0.0.82,<=1.4.0.31" + libcurand_host_version: - "=10.3.0.86" diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index f623a98fa1a..2581377e327 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -46,6 +46,8 @@ requirements: - cuda-nvrtc ={{ cuda_version }} - cuda-nvrtc-dev ={{ cuda_version }} - cuda-nvtx ={{ cuda_version }} + - libcufile {{ libcufile_host_version }} # [linux64] + - libcufile-dev {{ libcufile_host_version }} # [linux64] - libcurand {{ libcurand_host_version }} - libcurand-dev {{ libcurand_host_version }} - libarrow {{ libarrow_version }} @@ -75,6 +77,8 @@ outputs: - librmm ={{ minor_version }} - libkvikio ={{ minor_version }} - libarrow {{ libarrow_version }} + - libcufile {{ libcufile_run_version }} # [linux64] + - libcufile-dev {{ libcufile_run_version }} # [linux64] - dlpack {{ dlpack_version }} - gtest {{ gtest_version }} - gmock {{ gtest_version }} From 254b0ba6482257cde2bf8a23b355b47d059a2824 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 1 May 2023 12:10:32 -0500 Subject: [PATCH 4/4] Add kvikio to update-version.sh. --- ci/release/update-version.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index e2d895388db..2ee901d178e 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -78,10 +78,11 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/dask_cudf/so # bump rmm & dask-cuda for FILE in conda/environments/*.yaml dependencies.yaml; do - sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; - sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; sed_runner "s/cudf==${CURRENT_SHORT_TAG_PEP440}/cudf==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; sed_runner "s/cudf_kafka==${CURRENT_SHORT_TAG_PEP440}/cudf_kafka==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/kvikio==${CURRENT_SHORT_TAG_PEP440}/kvikio==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; done # Doxyfile update