Adding FAISS cpu to `raft-ann-bench` #1814

cjnolet · 2023-09-11T20:57:56Z

This PR adds FAISS CPU indexes to the raft-Ann-bench benchmarks, and adjusts the build accordingly. In addition, this PR also updated the FAISS version to include the RAFT-enabled version, which required removing the FAISS conda packages and building FAISS from source.

cjnolet · 2023-09-11T21:23:38Z

The big challenge with this change is that faiss already uses the faiss::faiss target and transitively passes through the dependency on the libfaiss-gpu target. It's not clear to me the best approach to pass through the target only sometimes, such as when building raft-ann-bench package but not when building the raft-ann-bench-cpu package.

I suppose one way to accomplish this would be to accept an option in get_faiss.cmake to set FAISS_ENABLE_GPU to OFF. Tagging @robertmaynard for any thoughts.

…o enh-ann-bench-faiss-cpu

achirkin · 2023-09-13T05:54:35Z

Ha-ha, I had some drafts on this too, but you beat me to it :) I struggled with the FAISS CPU/GPU builds as well and came up with this solution #1820 . It's not perfect and needs some refinement, but it works. Any thoughts on this?

robertmaynard · 2023-10-03T17:51:07Z

cpp/cmake/thirdparty/get_faiss.cmake

+        include(cmake/modules/FindAVX.cmake)
+
+        # Link against AVX CPU lib if it exists
+        set(RAFT_FAISS_GLOBAL_TARGETS faiss::faiss)


You don't need these conditionals around GLOBAL_TARGETS just provide them all and rapids-cmake will first check that they exist before doing any operations on them

cjnolet · 2023-10-04T20:01:54Z

@robertmaynard looks like this worked! Thanks so much. Honestly, I had no clue that the FAISS side of the cmake didn't include the same search paths as the raft side of the cmake. I just assumed that part was transitively. So happy to see this building in CI finally.

divyegala

Why was it needed to get fmt and spdlog for CPU only builds? I know currently RMM brings those, but are we providing them for FAISS?

conda/recipes/raft-ann-bench-cpu/meta.yaml

conda/recipes/raft-ann-bench/meta.yaml

cpp/bench/ann/CMakeLists.txt

cpp/bench/ann/src/faiss/faiss_cpu_benchmark.cpp

conda/environments/bench_ann_cuda-118_arch-x86_64.yaml

divyegala · 2023-10-06T03:31:05Z

cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h

@@ -107,7 +107,7 @@ class FaissGpu : public ANN<T> {

  void build(const T* dataset, size_t nrow, cudaStream_t stream = 0) final;

-  void set_search_param(const AnnSearchParam& param) override;
+  virtual void set_search_param(const FaissGpu<T>::AnnSearchParam& param) {}


I'm not too sure about this, should this be?

Suggested change

virtual void set_search_param(const FaissGpu<T>::AnnSearchParam& param) {}

virtual void set_search_param(const FaissGpu<T>::AnnSearchParam& param) = 0;

divyegala · 2023-10-06T03:32:24Z

dependencies.yaml

          - benchmark>=1.8.2
-          - faiss-proc=*=cuda
+          - rmm=23.10.*


Suggested change

- rmm=23.10.*

- rmm=23.12.*

cjnolet · 2023-10-10T15:51:56Z

/merge

cjnolet · 2023-10-10T20:10:37Z

/merge

Adding FAISS cpu to raft-ann-bench

bded674

cjnolet added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Sep 11, 2023

cjnolet self-assigned this Sep 11, 2023

cjnolet requested review from a team as code owners September 11, 2023 20:57

github-actions bot added cpp CMake labels Sep 11, 2023

cjnolet marked this pull request as draft September 11, 2023 21:08

cjnolet added 8 commits September 12, 2023 16:33

Adding faiss cpu indexes and build

f0e3c8f

Docs updates

f66fd21

Merge branch 'branch-23.10' into enh-ann-bench-faiss-cpu

20b793a

Merge branch 'branch-23.10' into enh-ann-bench-faiss-cpu

ad255fd

Resetting build all gpu arch to 0

6d7f390

Merge branch 'enh-ann-bench-faiss-cpu' of github.com:cjnolet/raft int…

491d090

…o enh-ann-bench-faiss-cpu

Doc updates

c9569a5

More updates

28bee2b

github-actions bot added the python label Sep 12, 2023

Cleaning up includes

1e7ba4f

achirkin mentioned this pull request Sep 13, 2023

Building faiss static and cpu-only for the ann-benchmarks #1820

Closed

cjnolet added 4 commits September 13, 2023 15:38

Explicitly adding spdlog and fmt

563b386

Using selectors for faiss

9585f20

Adding ability to link against faiss avx lib (only if arch supports it)

87e3be0

Removing some legacy get_faiss cmake bits

74e6a5d

cjnolet marked this pull request as ready for review September 13, 2023 22:06

cjnolet requested review from a team as code owners September 13, 2023 22:06

Updating faiss cpu to override search params

fcd029f

cjnolet added 7 commits September 28, 2023 15:23

Using https for faiss github repo

375c38e

Trying again

c4fb53c

Merge branch 'branch-23.10' into enh-ann-bench-faiss-cpu

f38031a

Using corey's fork for now

8bb273c

More updates

d539316

CHecking cudatoolkit library dir

fce179b

iTerminating string

f54a757

robertmaynard reviewed Oct 3, 2023

View reviewed changes

Teach faiss about conda [hacky]

385b4f4

Adding thread pool to overlap faiss queries

95c12db

divyegala requested changes Oct 4, 2023

View reviewed changes

cjnolet changed the base branch from branch-23.10 to branch-23.12 October 5, 2023 18:44

cjnolet added 4 commits October 5, 2023 14:53

Merge branch 'branch-23.12' into enh-ann-bench-faiss-cpu

7b67e89

Merge branch 'branch-23.12' into enh-ann-bench-faiss-cpu

419d994

Seeing if this fixes the devcontainers

1e7b5c8

Merge branch 'branch-23.12' into enh-ann-bench-faiss-cpu

36d4dd3

divyegala reviewed Oct 6, 2023

View reviewed changes

Fixing dependencies.yml

667b95c

divyegala approved these changes Oct 6, 2023

View reviewed changes

cjnolet and others added 2 commits October 6, 2023 22:04

Adding openblas to nn_bench deps

daffaf4

FIX add cpu targets to CUDA 12 faiss exception

8638410

dantegd mentioned this pull request Oct 10, 2023

Fix ann-bench conda recipe to use faiss only in x86 for 11.8 in recipe #1882

Closed

dantegd added 2 commits October 10, 2023 10:00

FIX ivf_flat and pq cmake variable underscores

bdc8d9a

Fix conflicts with branch-23.12

9d56f32

dantegd mentioned this pull request Oct 10, 2023

Enable FAISS targets in CUDA 12 ANN benchmarks #1883

Closed

raydouglass approved these changes Oct 10, 2023

View reviewed changes

rapids-bot bot merged commit 99ed345 into rapidsai:branch-23.12 Oct 10, 2023
59 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding FAISS cpu to `raft-ann-bench` #1814

Adding FAISS cpu to `raft-ann-bench` #1814

cjnolet commented Sep 11, 2023 •

edited

Loading

cjnolet commented Sep 11, 2023 •

edited

Loading

achirkin commented Sep 13, 2023

robertmaynard Oct 3, 2023

cjnolet commented Oct 4, 2023

divyegala left a comment

divyegala Oct 6, 2023

divyegala Oct 6, 2023

cjnolet commented Oct 10, 2023

cjnolet commented Oct 10, 2023

	virtual void set_search_param(const FaissGpu<T>::AnnSearchParam& param) {}
	virtual void set_search_param(const FaissGpu<T>::AnnSearchParam& param) = 0;

Adding FAISS cpu to raft-ann-bench #1814

Adding FAISS cpu to raft-ann-bench #1814

Conversation

cjnolet commented Sep 11, 2023 • edited Loading

cjnolet commented Sep 11, 2023 • edited Loading

achirkin commented Sep 13, 2023

robertmaynard Oct 3, 2023

Choose a reason for hiding this comment

cjnolet commented Oct 4, 2023

divyegala left a comment

Choose a reason for hiding this comment

divyegala Oct 6, 2023

Choose a reason for hiding this comment

divyegala Oct 6, 2023

Choose a reason for hiding this comment

cjnolet commented Oct 10, 2023

cjnolet commented Oct 10, 2023

Adding FAISS cpu to `raft-ann-bench` #1814

Adding FAISS cpu to `raft-ann-bench` #1814

cjnolet commented Sep 11, 2023 •

edited

Loading

cjnolet commented Sep 11, 2023 •

edited

Loading