From aa9df3d6521d0667c1d0efc02b87b9401ccf448d Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 27 Jan 2023 17:01:59 -0500 Subject: [PATCH] Remove `faiss` from `libcuml` 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`. --- conda/recipes/libcuml/conda_build_config.yaml | 3 --- conda/recipes/libcuml/meta.yaml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml index 5a82f386d4..d83debe490 100644 --- a/conda/recipes/libcuml/conda_build_config.yaml +++ b/conda/recipes/libcuml/conda_build_config.yaml @@ -19,9 +19,6 @@ treelite_version: gtest_version: - "=1.10.0" -libfaiss_version: - - "=1.7.0" - # The CTK libraries below are missing from the conda-forge::cudatoolkit # package. The "*_host_*" version specifiers correspond to `11.5` packages and the # "*_run_*" version specifiers correspond to `11.x` packages. diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 703512aa63..5bca6b91e5 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -40,7 +40,6 @@ requirements: host: - cudatoolkit ={{ cuda_version }} - cudf ={{ minor_version }} - - faiss-proc=*=cuda - gmock - gtest {{ gtest_version }} - lapack @@ -55,7 +54,6 @@ requirements: - libcusolver-dev {{ libcusolver_host_version }} - libcusparse {{ libcusparse_host_version }} - libcusparse-dev {{ libcusparse_host_version }} - - libfaiss {{ libfaiss_version }} *_cuda - libraft-distance ={{ minor_version }} - libraft-headers ={{ minor_version }} - libraft-nn ={{ minor_version }} @@ -76,7 +74,6 @@ outputs: run: - cudatoolkit {{ cuda_spec }} - cudf ={{ minor_version }} - - faiss-proc=*=cuda - libcublas {{ libcublas_run_version }} - libcublas-dev {{ libcublas_run_version }} - libcufft {{ libcufft_run_version }} @@ -84,7 +81,6 @@ outputs: - libcurand {{ libcurand_run_version }} - libcusparse {{ libcusparse_run_version }} - libcusparse-dev {{ libcusparse_run_version }} - - libfaiss {{ libfaiss_version }} *_cuda - libraft-distance ={{ minor_version }} - libraft-headers ={{ minor_version }} - libraft-nn ={{ minor_version }}