From 05eb5a10444f83586c32c26075a340e692c2ce3d Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 10:17:07 -0700 Subject: [PATCH 1/6] Pin curand version --- conda/recipes/libcudf/conda_build_config.yaml | 3 +++ conda/recipes/libcudf/meta.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index 3cd88de8e64..47acaaec972 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -25,6 +25,9 @@ dlpack_version: librdkafka_version: - ">=1.7.0,<1.8.0a0" +libcurand_version: + - "=10.3.0.86" + fmt_version: - ">=9.1.0,<10" diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 469c25fb673..d21b3fd6235 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -45,7 +45,7 @@ requirements: - cuda-nvrtc ={{ cuda_version }} - cuda-nvrtc-dev ={{ cuda_version }} - cuda-nvtx ={{ cuda_version }} - - libcurand-dev + - libcurand-dev ={{libcurand_version}} - libarrow {{ libarrow_version }} - dlpack {{ dlpack_version }} - librdkafka {{ librdkafka_version }} From 5815cf7611b5c821ec740831c066bf5941c7d4c7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 10:18:57 -0700 Subject: [PATCH 2/6] Remove extra equals --- conda/recipes/libcudf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index d21b3fd6235..6480d79ff62 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -45,7 +45,7 @@ requirements: - cuda-nvrtc ={{ cuda_version }} - cuda-nvrtc-dev ={{ cuda_version }} - cuda-nvtx ={{ cuda_version }} - - libcurand-dev ={{libcurand_version}} + - libcurand-dev {{libcurand_version}} - libarrow {{ libarrow_version }} - dlpack {{ dlpack_version }} - librdkafka {{ librdkafka_version }} From d25e75d054d0db9ac352e8968053af7c1e4764ea Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 10:32:30 -0700 Subject: [PATCH 3/6] Add both libcurand and libcurand-dev, and allow version to float in run requirements of libcudf-tests --- conda/recipes/libcudf/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 6480d79ff62..54de58da8cb 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -45,7 +45,8 @@ requirements: - cuda-nvrtc ={{ cuda_version }} - cuda-nvrtc-dev ={{ cuda_version }} - cuda-nvtx ={{ cuda_version }} - - libcurand-dev {{libcurand_version}} + - libcurand {{ libcurand_host_version }} + - libcurand-dev {{ libcurand_host_version }} - libarrow {{ libarrow_version }} - dlpack {{ dlpack_version }} - librdkafka {{ librdkafka_version }} @@ -386,6 +387,8 @@ outputs: - {{ pin_subpackage('libcudf', exact=True) }} - {{ pin_subpackage('libcudf_kafka', exact=True) }} - cudatoolkit {{ cuda_spec }} + - libcurand {{ libcurand_run_version }} + - libcurand-dev {{ libcurand_run_version }} about: home: https://rapids.ai/ license: Apache-2.0 From 62a5562d4a8ea718e826b33d92c747819cf1829d Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 10:33:43 -0700 Subject: [PATCH 4/6] Save missed changes --- conda/recipes/libcudf/conda_build_config.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index 47acaaec972..9847b0972f8 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -25,9 +25,12 @@ dlpack_version: librdkafka_version: - ">=1.7.0,<1.8.0a0" -libcurand_version: +libcurand_host_version: - "=10.3.0.86" +libcurand_run_version: + - ">=10.2.5.43,<10.3.1" + fmt_version: - ">=9.1.0,<10" From febcd30de51c077097ab411133abea3720489b6d Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 11:54:35 -0700 Subject: [PATCH 5/6] Remove unnecessary dev pinning --- conda/recipes/libcudf/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 54de58da8cb..bdf6e76688c 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -388,7 +388,6 @@ outputs: - {{ pin_subpackage('libcudf_kafka', exact=True) }} - cudatoolkit {{ cuda_spec }} - libcurand {{ libcurand_run_version }} - - libcurand-dev {{ libcurand_run_version }} about: home: https://rapids.ai/ license: Apache-2.0 From 77741d105b544eb30e65d9b50093dc0e9cc25457 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 12 Apr 2023 11:55:25 -0700 Subject: [PATCH 6/6] Update dependencies.yaml --- .../all_cuda-118_arch-x86_64.yaml | 2 ++ dependencies.yaml | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e7fa1fcc530..911f0472432 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -36,6 +36,8 @@ dependencies: - hypothesis - ipython - libarrow==10.0.1.* +- libcurand-dev=10.3.0.86 +- libcurand=10.3.0.86 - librdkafka=1.7.0 - librmm==23.4.* - mimesis>=4.1.0 diff --git a/dependencies.yaml b/dependencies.yaml index d24cc927611..3e8a6b88ca1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -263,21 +263,34 @@ dependencies: - output_types: conda matrices: - matrix: - cuda: "11.2" - packages: - - cudatoolkit=11.2 - - matrix: - cuda: "11.4" + cuda: "11.8" packages: - - cudatoolkit=11.4 + - cudatoolkit=11.8 + - libcurand-dev=10.3.0.86 + - libcurand=10.3.0.86 - matrix: cuda: "11.5" packages: - cudatoolkit=11.5 + # Can't hard pin the version since 11.x is missing many + # packages for specific versions + - libcurand-dev>=10.2.6.48,<=10.2.7.107 + - libcurand>=10.2.6.48,<=10.2.7.107 - matrix: - cuda: "11.8" + cuda: "11.4" packages: - - cudatoolkit=11.8 + - cudatoolkit=11.4 + - &libcurand_dev114 libcurand-dev>=10.2.5.43,<=10.2.5.120 + - &libcurand114 libcurand>=10.2.5.43,<=10.2.5.120 + - matrix: + cuda: "11.2" + packages: + - cudatoolkit=11.2 + # The NVIDIA channel doesn't publish pkgs older than 11.4 for + # these libs, so 11.2 uses 11.4 packages (the oldest + # available). + - *libcurand_dev114 + - *libcurand114 develop: common: - output_types: [conda, requirements]