Skip to content

Commit

Permalink
Remove faiss from libcuml (rapidsai#5175)
Browse files Browse the repository at this point in the history
The version of `faiss` that's currently used by `libcuml` conflicts with the version used by `raft`.

After discussions with @dantegd and @cjnolet, it was determined that `cuml` should really just depend on `raft`'s version of `faiss` anyway.

Therefore, this PR removes `faiss` from `libcuml`.

Authors:
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#5175
  • Loading branch information
ajschmidt8 authored Jan 31, 2023
1 parent 7872963 commit f55f3ea
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions conda/recipes/libcuml/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ treelite_version:
gtest_version:
- "=1.10.0"

libfaiss_version:
- "=1.7.2 *_cuda"

# 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.
Expand Down
4 changes: 0 additions & 4 deletions conda/recipes/libcuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ requirements:
host:
- cudatoolkit ={{ cuda_version }}
- cudf ={{ minor_version }}
- faiss-proc=*=cuda
- gmock
- gtest {{ gtest_version }}
- lapack
Expand All @@ -55,7 +54,6 @@ requirements:
- libcusolver-dev {{ libcusolver_host_version }}
- libcusparse {{ libcusparse_host_version }}
- libcusparse-dev {{ libcusparse_host_version }}
- libfaiss {{ libfaiss_version }}
- libraft-distance ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- libraft-nn ={{ minor_version }}
Expand All @@ -76,15 +74,13 @@ outputs:
run:
- cudatoolkit {{ cuda_spec }}
- cudf ={{ minor_version }}
- faiss-proc=*=cuda
- libcublas {{ libcublas_run_version }}
- libcublas-dev {{ libcublas_run_version }}
- libcufft {{ libcufft_run_version }}
- libcumlprims ={{ minor_version }}
- libcurand {{ libcurand_run_version }}
- libcusparse {{ libcusparse_run_version }}
- libcusparse-dev {{ libcusparse_run_version }}
- libfaiss {{ libfaiss_version }}
- libraft-distance ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- libraft-nn ={{ minor_version }}
Expand Down

0 comments on commit f55f3ea

Please sign in to comment.