From d8e5f9eccc499009747e51dd2686d40d36eede90 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 18 Apr 2023 10:28:05 -0400 Subject: [PATCH 1/5] Removing faiss from libcuml conda recipe --- conda/recipes/libcuml/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 57d5984ae3..4e702db6a0 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -58,8 +58,6 @@ requirements: - libraft ={{ minor_version }} - libraft-headers ={{ minor_version }} - treelite {{ treelite_version }} - - libfaiss>=1.7.1 - - faiss-proc=*=cuda outputs: - name: libcuml @@ -86,7 +84,6 @@ outputs: - libraft ={{ minor_version }} - libraft-headers ={{ minor_version }} - treelite {{ treelite_version }} - - libfaiss>=1.7.1 - faiss-proc=*=cuda about: home: https://rapids.ai/ From d6fbde3fe8d81fa3bb8781b2a5cdafdacb0acbdf Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Tue, 18 Apr 2023 10:31:12 -0400 Subject: [PATCH 2/5] Remove faiss-proc --- conda/recipes/libcuml/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 4e702db6a0..34be56c17d 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -84,7 +84,6 @@ outputs: - libraft ={{ minor_version }} - libraft-headers ={{ minor_version }} - treelite {{ treelite_version }} - - faiss-proc=*=cuda about: home: https://rapids.ai/ license: Apache-2.0 From 59cbacfc0d3e68460026917cad9f612f9c7af525 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 18 Apr 2023 10:32:42 -0400 Subject: [PATCH 3/5] MIssed faiss cuda proc --- conda/recipes/libcuml/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 4e702db6a0..34be56c17d 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -84,7 +84,6 @@ outputs: - libraft ={{ minor_version }} - libraft-headers ={{ minor_version }} - treelite {{ treelite_version }} - - faiss-proc=*=cuda about: home: https://rapids.ai/ license: Apache-2.0 From 7fb440dc65925ddb39a28b6fd2e2b9429d5d6e9b Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 18 Apr 2023 12:47:49 -0400 Subject: [PATCH 4/5] updating dependencies.yaml to remove faiss --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 -- conda/environments/cpp_all_cuda-118_arch-x86_64.yaml | 2 -- dependencies.yaml | 8 -------- 3 files changed, 12 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 4fc8aa3b08..703817577d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -22,7 +22,6 @@ dependencies: - dask==2023.3.2 - distributed==2023.3.2.1 - doxygen=1.8.20 -- faiss-proc=*=cuda - gcc_linux-64=11.* - graphviz - hdbscan @@ -41,7 +40,6 @@ dependencies: - libcusolver=11.4.1.48 - libcusparse-dev=11.7.5.86 - libcusparse=11.7.5.86 -- libfaiss>=1.7.1 - libraft-headers==23.4.* - libraft==23.4.* - librmm==23.4.* diff --git a/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml b/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml index c59e67b611..61b2e5f1bf 100644 --- a/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml @@ -11,7 +11,6 @@ dependencies: - cmake>=3.23.1,!=3.25.0 - cudatoolkit=11.8 - cxx-compiler -- faiss-proc=*=cuda - gcc_linux-64=11.* - libcublas-dev=11.11.3.6 - libcublas=11.11.3.6 @@ -24,7 +23,6 @@ dependencies: - libcusolver=11.4.1.48 - libcusparse-dev=11.7.5.86 - libcusparse=11.7.5.86 -- libfaiss>=1.7.1 - libraft-headers==23.4.* - libraft==23.4.* - librmm==23.4.* diff --git a/dependencies.yaml b/dependencies.yaml index 3dd3e723ae..3ca4f5ceb5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -7,7 +7,6 @@ files: arch: [x86_64] includes: - common_build - - cpp_run - cudatoolkit - docs - py_build @@ -21,7 +20,6 @@ files: arch: [x86_64] includes: - common_build - - cpp_run - cudatoolkit checks: output: none @@ -164,12 +162,6 @@ dependencies: arch: aarch64 packages: - cupy-cuda11x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works. - cpp_run: - common: - - output_types: conda - packages: - - libfaiss>=1.7.1 - - faiss-proc=*=cuda cudatoolkit: specific: - output_types: conda From 339b8ac2c2910543d72ca902b6ea8cdf135e8b91 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Apr 2023 13:16:19 -0700 Subject: [PATCH 5/5] pin umaplearn and pynndescent --- conda/environments/all_cuda-118_arch-x86_64.yaml | 3 ++- dependencies.yaml | 3 ++- python/pyproject.toml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 703817577d..e17e9a3e05 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -51,6 +51,7 @@ dependencies: - pip - pydata-sphinx-theme - pylibraft==23.4.* +- pynndescent==0.5.8 - pytest - pytest-benchmark - pytest-cases @@ -70,7 +71,7 @@ dependencies: - statsmodels - sysroot_linux-64==2.17 - treelite==3.2.0 -- umap-learn +- umap-learn==0.5.3 - pip: - git+https://github.com/dask/dask-glm@main name: all_cuda-118_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 3ca4f5ceb5..489d50b568 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -276,7 +276,8 @@ dependencies: - pytest-xdist - *scikit_learn - statsmodels - - umap-learn + - umap-learn==0.5.3 + - pynndescent==0.5.8 - output_types: conda packages: - pip diff --git a/python/pyproject.toml b/python/pyproject.toml index e50c123abf..d292ef8656 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -87,6 +87,7 @@ test = [ "hypothesis>=6.0,<7", "nltk", "numpydoc", + "pynndescent==0.5.8", "pytest", "pytest-benchmark", "pytest-cases", @@ -94,7 +95,7 @@ test = [ "pytest-xdist", "scikit-learn==1.2", "statsmodels", - "umap-learn", + "umap-learn==0.5.3", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls]