Skip to content

Commit 24e42cd

Browse files
authored
Pin faiss to 1.14.0 (#1885)
Follow up to #1879. Resolves #1884 Authors: - Anupam (https://github.com/aamijar) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Tarang Jain (https://github.com/tarang-jain) URL: #1885
1 parent efbfc41 commit 24e42cd

5 files changed

Lines changed: 5 additions & 10 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
#include "../cuvs/cuvs_ann_bench_utils.h"
1010
#include <cuvs/neighbors/refine.hpp>
1111

12-
// FAISS classes partially override the overloaded virtual Index::train, triggering
13-
// NVCC warning 611 which -Werror=all-warnings promotes to an error.
14-
#pragma nv_diagnostic push
15-
#pragma nv_diag_suppress 611
1612
#include <faiss/IndexFlat.h>
1713
#include <faiss/IndexHNSW.h>
1814
#include <faiss/IndexIVFFlat.h>
@@ -27,7 +23,6 @@
2723
#include <faiss/gpu/StandardGpuResources.h>
2824
#include <faiss/impl/ScalarQuantizer.h>
2925
#include <faiss/index_io.h>
30-
#pragma nv_diagnostic pop
3126
#include <omp.h>
3227

3328
#include <raft/core/device_mdarray.hpp>
File renamed without changes.
File renamed without changes.
File renamed without changes.

cpp/cmake/patches/faiss_override.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"packages" : {
33
"faiss" : {
4-
"version": "1.13.x",
4+
"version": "1.14.0",
55
"git_url": "https://github.com/facebookresearch/faiss.git",
6-
"git_tag": "main",
6+
"git_tag": "v${version}",
77
"patches" : [
88
{
9-
"file" : "${current_json_dir}/faiss-1.13-cuvs-25.12.diff",
9+
"file" : "${current_json_dir}/faiss-1.14-cuvs-25.12.diff",
1010
"issue" : "Multiple fixes for cuVS and RMM compatibility",
1111
"fixed_in" : ""
1212
},
1313
{
14-
"file" : "${current_json_dir}/faiss-1.13-cuvs-26.02.diff",
14+
"file" : "${current_json_dir}/faiss-1.14-cuvs-26.02.diff",
1515
"issue" : "Multiple fixes for cuVS and RMM compatibility",
1616
"fixed_in" : ""
1717
},
1818
{
19-
"file" : "${current_json_dir}/faiss-1.13-cuvs-26.04.diff",
19+
"file" : "${current_json_dir}/faiss-1.14-cuvs-26.04.diff",
2020
"issue" : "Multiple fixes for cuVS compatibility",
2121
"fixed_in" : ""
2222
}

0 commit comments

Comments
 (0)