From 7cbb3adc35623905a4ead0e68312a303bac42686 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Fri, 11 Feb 2022 11:00:03 -0500 Subject: [PATCH 1/5] Push --- conda/recipes/libraft_distance/meta.yaml | 3 +++ conda/recipes/libraft_headers/meta.yaml | 12 ++++++------ conda/recipes/libraft_nn/meta.yaml | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/conda/recipes/libraft_distance/meta.yaml b/conda/recipes/libraft_distance/meta.yaml index a4f2dbac94..1423f0909a 100644 --- a/conda/recipes/libraft_distance/meta.yaml +++ b/conda/recipes/libraft_distance/meta.yaml @@ -45,12 +45,15 @@ requirements: - ucx-proc=*=gpu - gtest=1.10.0 - gmock + - rmm {{ minor_version }} run: + - libraft-headers {{ version }} - nccl>=2.9.9 - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - libcusolver>=11.2.1 + - rmm {{ minor_version }} about: home: http://rapids.ai/ diff --git a/conda/recipes/libraft_headers/meta.yaml b/conda/recipes/libraft_headers/meta.yaml index a03146a7d5..9654e4e082 100644 --- a/conda/recipes/libraft_headers/meta.yaml +++ b/conda/recipes/libraft_headers/meta.yaml @@ -37,19 +37,19 @@ build: requirements: build: - cmake>=3.20.1 - host: - nccl>=2.9.9 - cudatoolkit {{ cuda_version }}.* - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - gtest=1.10.0 - gmock - run: - - nccl>=2.9.9 - - ucx-py {{ ucx_py_version }} - - ucx-proc=*=gpu - - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + - rmm {{ minor_version}} - libcusolver>=11.2.1 +# run: +# - nccl>=2.9.9 +# - ucx-py {{ ucx_py_version }} +# - ucx-proc=*=gpu +# - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} about: home: http://rapids.ai/ diff --git a/conda/recipes/libraft_nn/meta.yaml b/conda/recipes/libraft_nn/meta.yaml index 53f44f2e97..45eb2b9c7e 100644 --- a/conda/recipes/libraft_nn/meta.yaml +++ b/conda/recipes/libraft_nn/meta.yaml @@ -45,11 +45,14 @@ requirements: - libfaiss 1.7.0 *_cuda - gtest=1.10.0 - gmock + - rmm {{ minor_version }} run: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + - libraft-headers {{ version }} - faiss-proc=*=cuda - libfaiss 1.7.0 *_cuda - libcusolver>=11.2.1 + - rmm {{ minor_version }} about: home: http://rapids.ai/ From 614e0b9e81ebdf51f6e72d0c5d51ec2cc2997f5f Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Fri, 11 Feb 2022 12:33:42 -0500 Subject: [PATCH 2/5] Adding nccl as build-time dependency for pyraft --- conda/recipes/pyraft/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/pyraft/meta.yaml b/conda/recipes/pyraft/meta.yaml index 4182137f85..57137da947 100644 --- a/conda/recipes/pyraft/meta.yaml +++ b/conda/recipes/pyraft/meta.yaml @@ -33,6 +33,7 @@ requirements: - libraft-headers {{ version }} - cudatoolkit {{ cuda_version }}.* - cuda-python >=11.5,<12.0 + - nccl>=2.9.9 - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu run: From 6273b1df68da66418485e786de9cabd43b73fa23 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 21 Feb 2022 18:27:58 -0500 Subject: [PATCH 3/5] Making sure librmm is a runtime dependency to remove headers from conda packaging --- conda/recipes/libraft_distance/meta.yaml | 4 ++-- conda/recipes/libraft_headers/meta.yaml | 14 ++++++++------ conda/recipes/libraft_nn/meta.yaml | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/conda/recipes/libraft_distance/meta.yaml b/conda/recipes/libraft_distance/meta.yaml index 1423f0909a..4474629df4 100644 --- a/conda/recipes/libraft_distance/meta.yaml +++ b/conda/recipes/libraft_distance/meta.yaml @@ -45,7 +45,7 @@ requirements: - ucx-proc=*=gpu - gtest=1.10.0 - gmock - - rmm {{ minor_version }} + - librmm {{ minor_version }} run: - libraft-headers {{ version }} - nccl>=2.9.9 @@ -53,7 +53,7 @@ requirements: - ucx-proc=*=gpu - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - libcusolver>=11.2.1 - - rmm {{ minor_version }} + - librmm {{ minor_version }} about: home: http://rapids.ai/ diff --git a/conda/recipes/libraft_headers/meta.yaml b/conda/recipes/libraft_headers/meta.yaml index 9654e4e082..4f9b08cbfd 100644 --- a/conda/recipes/libraft_headers/meta.yaml +++ b/conda/recipes/libraft_headers/meta.yaml @@ -37,19 +37,21 @@ build: requirements: build: - cmake>=3.20.1 + host: - nccl>=2.9.9 - cudatoolkit {{ cuda_version }}.* - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - gtest=1.10.0 - gmock - - rmm {{ minor_version}} + - librmm {{ minor_version}} - libcusolver>=11.2.1 -# run: -# - nccl>=2.9.9 -# - ucx-py {{ ucx_py_version }} -# - ucx-proc=*=gpu -# - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + run: + - nccl>=2.9.9 + - librmm {{ minor_version}} + - ucx-py {{ ucx_py_version }} + - ucx-proc=*=gpu + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} about: home: http://rapids.ai/ diff --git a/conda/recipes/libraft_nn/meta.yaml b/conda/recipes/libraft_nn/meta.yaml index 45eb2b9c7e..9d6732d56b 100644 --- a/conda/recipes/libraft_nn/meta.yaml +++ b/conda/recipes/libraft_nn/meta.yaml @@ -45,14 +45,14 @@ requirements: - libfaiss 1.7.0 *_cuda - gtest=1.10.0 - gmock - - rmm {{ minor_version }} + - librmm {{ minor_version }} run: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - libraft-headers {{ version }} - faiss-proc=*=cuda - libfaiss 1.7.0 *_cuda - libcusolver>=11.2.1 - - rmm {{ minor_version }} + - librmm {{ minor_version }} about: home: http://rapids.ai/ From abb7976d6085ac7a69ee6b5f0e8acce8b2ee4d9b Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 21 Feb 2022 18:50:39 -0500 Subject: [PATCH 4/5] Adding cusolver back into runtime for libraft-headers --- conda/recipes/libraft_headers/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/libraft_headers/meta.yaml b/conda/recipes/libraft_headers/meta.yaml index 4f9b08cbfd..aec6fa4351 100644 --- a/conda/recipes/libraft_headers/meta.yaml +++ b/conda/recipes/libraft_headers/meta.yaml @@ -52,6 +52,7 @@ requirements: - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + - libcusolver>=11.2.1 about: home: http://rapids.ai/ From 9d8733f6cec6c73caeb034df96f28943ad4a71d5 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Mon, 21 Feb 2022 22:24:16 -0500 Subject: [PATCH 5/5] Update meta.yaml --- conda/recipes/pyraft/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conda/recipes/pyraft/meta.yaml b/conda/recipes/pyraft/meta.yaml index 57137da947..eae9963204 100644 --- a/conda/recipes/pyraft/meta.yaml +++ b/conda/recipes/pyraft/meta.yaml @@ -40,7 +40,6 @@ requirements: - python x.x - dask-cuda {{ minor_version }} - libraft-headers {{ version }} - - cupy>=7.8.0,<10.0.0a0 - nccl>=2.9.9 - rmm {{ minor_version }} - ucx-py {{ ucx_py_version }} @@ -61,4 +60,4 @@ about: home: http://rapids.ai/ license: Apache-2.0 # license_file: LICENSE - summary: pyraft library \ No newline at end of file + summary: pyraft library