Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix forward merge #5383 #5384

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Fix forward merge #5383 #5384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190b504
[HOTFIX] Removing faiss from libcuml conda recipe (#5371)
cjnolet Apr 21, 2023
dae6f2e
Merge branch-23.04 into 23.06
dantegd Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.6.*
- libraft==23.6.*
- librmm==23.6.*
Expand All @@ -53,6 +51,7 @@ dependencies:
- pip
- pydata-sphinx-theme
- pylibraft==23.6.*
- pynndescent==0.5.8
- pytest
- pytest-benchmark
- pytest-cases
Expand All @@ -72,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
2 changes: 0 additions & 2 deletions conda/environments/cpp_all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.6.*
- libraft==23.6.*
- librmm==23.6.*
Expand Down
4 changes: 0 additions & 4 deletions conda/recipes/libcuml/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -86,8 +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/
license: Apache-2.0
Expand Down
11 changes: 2 additions & 9 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ files:
arch: [x86_64]
includes:
- common_build
- cpp_run
- cudatoolkit
- docs
- py_build
Expand All @@ -21,7 +20,6 @@ files:
arch: [x86_64]
includes:
- common_build
- cpp_run
- cudatoolkit
checks:
output: none
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -284,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
Expand Down
3 changes: 2 additions & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,15 @@ test = [
"hypothesis>=6.0,<7",
"nltk",
"numpydoc",
"pynndescent==0.5.8",
"pytest",
"pytest-benchmark",
"pytest-cases",
"pytest-cov",
"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]
Expand Down