Skip to content

Commit 00c4ca9

Browse files
lowenerlowener
authored
Migration from RAFT to cuVS (#1048)
* Initial migration to cuvs Signed-off-by: Mickael Ide <[email protected]> * Add fixes for BF, refine and bitset Signed-off-by: Mickael Ide <[email protected]> * Fix compilation after rebase Signed-off-by: Mickael Ide <[email protected]> * Fix compilation Signed-off-by: Mickael Ide <[email protected]> * Fix test bitset Signed-off-by: Mickael Ide <[email protected]> * Fix style Signed-off-by: Mickael Ide <[email protected]> * Fix style clang format Signed-off-by: Mickael Ide <[email protected]> * Add iterative build algo + style Signed-off-by: Mickael Ide <[email protected]> * Change mention of raft index to cuvs Signed-off-by: Mickael Ide <[email protected]> * Fix compilation + add persistent kernel Signed-off-by: Mickael Ide <[email protected]> --------- Signed-off-by: Mickael Ide <[email protected]>
1 parent e7b47f5 commit 00c4ca9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1015
-1283
lines changed

‎CMakeLists.txt

+14-10
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ include(cmake/utils/utils.cmake)
2222
include(cmake/utils/compile_flags.cmake)
2323
include(cmake/utils/platform_check.cmake)
2424

25-
knowhere_option(WITH_RAFT "Build with RAFT indexes" OFF)
26-
if(WITH_RAFT)
25+
knowhere_option(WITH_CUVS "Build with CUVS indexes" OFF)
26+
if(WITH_CUVS)
2727
set(CMAKE_CUDA_ARCHITECTURES RAPIDS)
2828
include(cmake/libs/librapids.cmake)
2929
project(knowhere CXX C CUDA)
30-
include(cmake/libs/libraft.cmake)
30+
include(cmake/libs/libcuvs.cmake)
3131
endif()
3232

3333
knowhere_option(WITH_UT "Build with UT test" OFF)
@@ -100,7 +100,7 @@ include_directories(${folly_INCLUDE_DIRS})
100100
find_package(nlohmann_json REQUIRED)
101101
find_package(glog REQUIRED)
102102
find_package(prometheus-cpp REQUIRED)
103-
if(NOT WITH_RAFT)
103+
if(NOT WITH_CUVS)
104104
find_package(fmt REQUIRED)
105105
endif()
106106
if(NOT WITH_LIGHT)
@@ -171,10 +171,10 @@ knowhere_file_glob(GLOB_RECURSE KNOWHERE_GPU_SRCS src/index/gpu/flat_gpu/*.cc
171171
src/index/gpu/ivf_gpu/*.cc)
172172
list(REMOVE_ITEM KNOWHERE_SRCS ${KNOWHERE_GPU_SRCS})
173173

174-
if(NOT WITH_RAFT)
175-
knowhere_file_glob(GLOB_RECURSE KNOWHERE_RAFT_SRCS src/common/raft/*.cu
176-
src/common/raft/*.cc src/index/gpu_raft/*.cc)
177-
list(REMOVE_ITEM KNOWHERE_SRCS ${KNOWHERE_RAFT_SRCS})
174+
if(NOT WITH_CUVS)
175+
knowhere_file_glob(GLOB_RECURSE KNOWHERE_CUVS_SRCS src/common/cuvs/*.cu
176+
src/common/cuvs/*.cc src/index/gpu_cuvs/*.cc)
177+
list(REMOVE_ITEM KNOWHERE_SRCS ${KNOWHERE_CUVS_SRCS})
178178
endif()
179179

180180
include_directories(src)
@@ -203,12 +203,16 @@ endif()
203203

204204
add_library(knowhere SHARED ${KNOWHERE_SRCS})
205205
add_dependencies(knowhere ${KNOWHERE_LINKER_LIBS})
206-
if(WITH_RAFT)
206+
if(WITH_CUVS)
207207
list(
208208
APPEND
209209
KNOWHERE_LINKER_LIBS
210210
raft::raft
211-
raft::compiled_static
211+
raft::raft_logger
212+
raft::raft_logger_impl
213+
rmm::rmm_logger
214+
rmm::rmm_logger_impl
215+
cuvs::cuvs
212216
CUDA::cublas
213217
CUDA::cusparse
214218
CUDA::cusolver)

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ $ conan install .. --build=missing -o with_ut=True -s compiler.libcxx=libstdc++1
4646
#RELEASE CPU
4747
$ conan install .. --build=missing -o with_ut=True -s compiler.libcxx=libstdc++11 -s build_type=Release
4848
#DEBUG GPU
49-
$ conan install .. --build=missing -o with_ut=True -o with_raft=True -s compiler.libcxx=libstdc++11 -s build_type=Debug
49+
$ conan install .. --build=missing -o with_ut=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 -s build_type=Debug
5050
#RELEASE GPU
51-
$ conan install .. --build=missing -o with_ut=True -o with_raft=True -s compiler.libcxx=libstdc++11 -s build_type=Release
51+
$ conan install .. --build=missing -o with_ut=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 -s build_type=Release
5252
#DISKANN SUPPORT
5353
$ conan install .. --build=missing -o with_ut=True -o with_diskann=True -s compiler.libcxx=libstdc++11 -s build_type=Debug/Release
5454
#build with conan

‎benchmark/hdf5/benchmark_float.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ class Benchmark_float : public Benchmark_knowhere, public ::testing::Test {
234234
}
235235
#endif
236236

237-
#ifdef KNOWHERE_WITH_RAFT
237+
#ifdef KNOWHERE_WITH_CUVS
238238
template <typename T>
239239
void
240-
test_raft_cagra(const knowhere::Json& cfg) {
240+
test_cuvs_cagra(const knowhere::Json& cfg) {
241241
auto conf = cfg;
242242

243243
std::string data_type_str = get_data_type_name<T>();
@@ -279,7 +279,7 @@ class Benchmark_float : public Benchmark_knowhere, public ::testing::Test {
279279
knowhere::KnowhereConfig::SetSearchThreadPoolSize(default_search_thread_num);
280280
printf("faiss::distance_compute_blas_threshold: %ld\n", knowhere::KnowhereConfig::GetBlasThreshold());
281281

282-
#ifdef KNOWHERE_WITH_RAFT
282+
#ifdef KNOWHERE_WITH_CUVS
283283
knowhere::KnowhereConfig::SetRaftMemPool();
284284
#endif
285285
}
@@ -314,7 +314,7 @@ class Benchmark_float : public Benchmark_knowhere, public ::testing::Test {
314314
// DISKANN index params
315315
const std::vector<int32_t> SEARCH_LISTs_ = {100, 200, 400};
316316

317-
// RAFT cagra index params
317+
// cuVS cagra index params
318318
const std::vector<int32_t> GRAPH_DEGREEs_ = {8, 16, 32};
319319
const std::vector<int32_t> ITOPK_SIZEs_ = {128, 192, 256};
320320
};
@@ -540,9 +540,9 @@ TEST_F(Benchmark_float, TEST_DISKANN) {
540540
}
541541
#endif
542542

543-
#ifdef KNOWHERE_WITH_RAFT
544-
TEST_F(Benchmark_float, TEST_RAFT_BRUTE_FORCE) {
545-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_BRUTEFORCE;
543+
#ifdef KNOWHERE_WITH_CUVS
544+
TEST_F(Benchmark_float, TEST_CUVS_BRUTE_FORCE) {
545+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_BRUTEFORCE;
546546

547547
std::string index_file_name;
548548
knowhere::Json conf = cfg_;
@@ -551,8 +551,8 @@ TEST_F(Benchmark_float, TEST_RAFT_BRUTE_FORCE) {
551551
TEST_INDEX(idmap, knowhere::fp32, params);
552552
}
553553

554-
TEST_F(Benchmark_float, TEST_RAFT_IVF_FLAT) {
555-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFFLAT;
554+
TEST_F(Benchmark_float, TEST_CUVS_IVF_FLAT) {
555+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFFLAT;
556556

557557
std::string index_file_name;
558558
knowhere::Json conf = cfg_;
@@ -564,8 +564,8 @@ TEST_F(Benchmark_float, TEST_RAFT_IVF_FLAT) {
564564
}
565565
}
566566

567-
TEST_F(Benchmark_float, TEST_RAFT_IVF_PQ) {
568-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFPQ;
567+
TEST_F(Benchmark_float, TEST_CUVS_IVF_PQ) {
568+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFPQ;
569569

570570
std::string index_file_name;
571571
knowhere::Json conf = cfg_;
@@ -581,8 +581,8 @@ TEST_F(Benchmark_float, TEST_RAFT_IVF_PQ) {
581581
}
582582
}
583583

584-
TEST_F(Benchmark_float, TEST_RAFT_CAGRA) {
585-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_CAGRA;
584+
TEST_F(Benchmark_float, TEST_CUVS_CAGRA) {
585+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_CAGRA;
586586

587587
std::string index_file_name;
588588
knowhere::Json conf = cfg_;
@@ -591,7 +591,7 @@ TEST_F(Benchmark_float, TEST_RAFT_CAGRA) {
591591
conf[knowhere::indexparam::GRAPH_DEGREE] = graph_degree;
592592
conf[knowhere::indexparam::INTERMEDIATE_GRAPH_DEGREE] = graph_degree;
593593
std::vector<int32_t> params = {graph_degree};
594-
TEST_INDEX(raft_cagra, knowhere::fp32, params);
594+
TEST_INDEX(cuvs_cagra, knowhere::fp32, params);
595595
}
596596
}
597597
#endif

‎benchmark/hdf5/benchmark_float_bitset.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ class Benchmark_float_bitset : public Benchmark_knowhere, public ::testing::Test
176176
test_##NAME<T>(conf)
177177

178178
TEST_F(Benchmark_float_bitset, TEST_IVF_FLAT) {
179-
#ifdef KNOWHERE_WITH_RAFT
180-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFFLAT;
179+
#ifdef KNOWHERE_WITH_CUVS
180+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFFLAT;
181181
#else
182182
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IVFFLAT;
183183
#endif
@@ -204,8 +204,8 @@ TEST_F(Benchmark_float_bitset, TEST_IVF_SQ8) {
204204
}
205205

206206
TEST_F(Benchmark_float_bitset, TEST_IVF_PQ) {
207-
#ifdef KNOWHERE_WITH_RAFT
208-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFPQ;
207+
#ifdef KNOWHERE_WITH_CUVS
208+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFPQ;
209209
#else
210210
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IVFPQ;
211211
#endif

‎benchmark/hdf5/benchmark_float_qps.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ class Benchmark_float_qps : public Benchmark_knowhere, public ::testing::Test {
102102

103103
template <typename T>
104104
void
105-
test_raft_cagra(const knowhere::Json& cfg) {
105+
test_cuvs_cagra(const knowhere::Json& cfg) {
106106
auto conf = cfg;
107107
std::string data_type_str = get_data_type_name<T>();
108108

109-
auto find_smallest_itopk_size = [&](float expected_recall) -> std::tuple<int32_t, float> {
109+
auto find_smallest_itopk_size = [&](float expected_recall, int topk) -> std::tuple<int32_t, float> {
110110
std::unordered_map<int32_t, float> recall_map;
111111
auto ds_ptr = knowhere::GenDataSet(nq_, dim_, xq_);
112-
auto left = 32;
112+
auto left = topk;
113113
auto right = 256;
114114
auto itopk_size = left;
115115

@@ -137,7 +137,7 @@ class Benchmark_float_qps : public Benchmark_knowhere, public ::testing::Test {
137137
};
138138

139139
for (auto expected_recall : EXPECTED_RECALLs_) {
140-
auto [itopk_size, recall] = find_smallest_itopk_size(expected_recall);
140+
auto [itopk_size, recall] = find_smallest_itopk_size(expected_recall, topk_);
141141
conf[knowhere::indexparam::ITOPK_SIZE] = ((int{topk_} + 32 - 1) / 32) * 32;
142142
conf[knowhere::meta::TOPK] = topk_;
143143
conf[knowhere::indexparam::ITOPK_SIZE] = itopk_size;
@@ -375,7 +375,7 @@ class Benchmark_float_qps : public Benchmark_knowhere, public ::testing::Test {
375375
knowhere::KnowhereConfig::InitGPUResource(GPU_DEVICE_ID, 2);
376376
cfg_[knowhere::meta::DEVICE_ID] = GPU_DEVICE_ID;
377377
#endif
378-
#ifdef KNOWHERE_WITH_RAFT
378+
#ifdef KNOWHERE_WITH_CUVS
379379
knowhere::KnowhereConfig::SetRaftMemPool();
380380
#endif
381381
}
@@ -558,9 +558,9 @@ TEST_F(Benchmark_float_qps, TEST_DISKANN) {
558558
}
559559
#endif
560560

561-
#ifdef KNOWHERE_WITH_RAFT
562-
TEST_F(Benchmark_float_qps, TEST_RAFT_BRUTE_FORCE) {
563-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_BRUTEFORCE;
561+
#ifdef KNOWHERE_WITH_CUVS
562+
TEST_F(Benchmark_float_qps, TEST_CUVS_BRUTE_FORCE) {
563+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_BRUTEFORCE;
564564

565565
std::string index_file_name;
566566
knowhere::Json conf = cfg_;
@@ -569,8 +569,8 @@ TEST_F(Benchmark_float_qps, TEST_RAFT_BRUTE_FORCE) {
569569
TEST_INDEX(idmap, knowhere::fp32, params);
570570
}
571571

572-
TEST_F(Benchmark_float_qps, TEST_RAFT_IVF_FLAT) {
573-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFFLAT;
572+
TEST_F(Benchmark_float_qps, TEST_CUVS_IVF_FLAT) {
573+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFFLAT;
574574

575575
std::string index_file_name;
576576
knowhere::Json conf = cfg_;
@@ -582,8 +582,8 @@ TEST_F(Benchmark_float_qps, TEST_RAFT_IVF_FLAT) {
582582
}
583583
}
584584

585-
TEST_F(Benchmark_float_qps, TEST_RAFT_IVF_PQ) {
586-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFPQ;
585+
TEST_F(Benchmark_float_qps, TEST_CUVS_IVF_PQ) {
586+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_IVFPQ;
587587

588588
std::string index_file_name;
589589
knowhere::Json conf = cfg_;
@@ -599,8 +599,8 @@ TEST_F(Benchmark_float_qps, TEST_RAFT_IVF_PQ) {
599599
}
600600
}
601601

602-
TEST_F(Benchmark_float_qps, TEST_RAFT_CAGRA) {
603-
index_type_ = knowhere::IndexEnum::INDEX_RAFT_CAGRA;
602+
TEST_F(Benchmark_float_qps, TEST_CUVS_CAGRA) {
603+
index_type_ = knowhere::IndexEnum::INDEX_CUVS_CAGRA;
604604

605605
std::string index_file_name;
606606
knowhere::Json conf = cfg_;
@@ -609,7 +609,7 @@ TEST_F(Benchmark_float_qps, TEST_RAFT_CAGRA) {
609609
conf[knowhere::indexparam::GRAPH_DEGREE] = graph_degree;
610610
conf[knowhere::indexparam::INTERMEDIATE_GRAPH_DEGREE] = graph_degree;
611611
std::vector<int32_t> params = {graph_degree};
612-
TEST_INDEX(raft_cagra, knowhere::fp32, params);
612+
TEST_INDEX(cuvs_cagra, knowhere::fp32, params);
613613
}
614614
}
615615
#endif

‎benchmark/hdf5/ref_logs/Makefile

+18-18
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test_binary_range_hnsw:
2424
# Test Knowhere float index
2525
test_float: test_float_brute_force test_float_idmap test_float_ivf_flat test_float_ivf_sq8 test_float_ivf_pq test_float_scann \
2626
test_float_hnsw_flat test_float_hnsw_sq test_float_hnsw_pq test_float_diskann
27-
test_float_raft: test_float_raft_brute_force test_float_raft_ivf_flat test_float_raft_ivf_pq test_float_raft_cagra
27+
test_float_cuvs: test_float_cuvs_brute_force test_float_cuvs_ivf_flat test_float_cuvs_ivf_pq test_float_cuvs_cagra
2828
test_float_ivf: test_float_ivf_flat test_float_ivf_sq8 test_float_ivf_pq
2929
test_float_hnsw: test_float_hnsw_flat test_float_hnsw_sq test_float_hnsw_pq test_float_hnsw_prq
3030

@@ -51,14 +51,14 @@ test_float_hnsw_prq:
5151
test_float_diskann:
5252
./benchmark_float --gtest_filter="Benchmark_float.TEST_DISKANN" | tee test_float_diskann.log
5353

54-
test_float_raft_brute_force:
55-
./benchmark_float --gtest_filter="Benchmark_float.TEST_RAFT_BRUTE_FORCE" | tee test_float_raft_brute_force.log
56-
test_float_raft_ivf_flat:
57-
./benchmark_float --gtest_filter="Benchmark_float.TEST_RAFT_IVF_FLAT" | tee test_float_raft_ivf_flat.log
58-
test_float_raft_ivf_pq:
59-
./benchmark_float --gtest_filter="Benchmark_float.TEST_RAFT_IVF_PQ" | tee test_float_raft_ivf_pq.log
60-
test_float_raft_cagra:
61-
./benchmark_float --gtest_filter="Benchmark_float.TEST_RAFT_CAGRA" | tee test_float_raft_cagra.log
54+
test_float_cuvs_brute_force:
55+
./benchmark_float --gtest_filter="Benchmark_float.TEST_CUVS_BRUTE_FORCE" | tee test_float_cuvs_brute_force.log
56+
test_float_cuvs_ivf_flat:
57+
./benchmark_float --gtest_filter="Benchmark_float.TEST_CUVS_IVF_FLAT" | tee test_float_cuvs_ivf_flat.log
58+
test_float_cuvs_ivf_pq:
59+
./benchmark_float --gtest_filter="Benchmark_float.TEST_CUVS_IVF_PQ" | tee test_float_cuvs_ivf_pq.log
60+
test_float_cuvs_cagra:
61+
./benchmark_float --gtest_filter="Benchmark_float.TEST_CUVS_CAGRA" | tee test_float_cuvs_cagra.log
6262

6363
###################################################################################################
6464
# Test Knowhere float index bitset
@@ -126,7 +126,7 @@ test_float_range_multi_hnsw:
126126
###################################################################################################
127127
# Test Knowhere float index qps
128128
test_float_qps: test_float_qps_idmap test_float_qps_ivf_flat test_float_qps_ivf_sq8 test_float_qps_ivf_pq test_float_qps_hnsw test_float_qps_scann test_float_qps_diskann
129-
test_float_qps_raft: test_float_qps_raft_brute_force test_float_qps_raft_ivf_flat test_float_qps_raft_ivf_pq test_float_qps_raft_cagra
129+
test_float_qps_cuvs: test_float_qps_cuvs_brute_force test_float_qps_cuvs_ivf_flat test_float_qps_cuvs_ivf_pq test_float_qps_cuvs_cagra
130130

131131
test_float_qps_idmap:
132132
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_IDMAP" | tee test_float_qps_idmap.log
@@ -143,14 +143,14 @@ test_float_qps_scann:
143143
test_float_qps_diskann:
144144
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_DISKANN" | tee test_float_qps_diskann.log
145145

146-
test_float_qps_raft_brute_force:
147-
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_RAFT_BRUTE_FORCE" | tee test_float_qps_raft_brute_force.log
148-
test_float_qps_raft_ivf_flat:
149-
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_RAFT_IVF_FLAT" | tee test_float_qps_raft_ivf_flat.log
150-
test_float_qps_raft_ivf_pq:
151-
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_RAFT_IVF_PQ" | tee test_float_qps_raft_ivf_pq.log
152-
test_float_qps_raft_cagra:
153-
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_RAFT_CAGRA" | tee test_float_qps_raft_cagra.log
146+
test_float_qps_cuvs_brute_force:
147+
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_CUVS_BRUTE_FORCE" | tee test_float_qps_cuvs_brute_force.log
148+
test_float_qps_cuvs_ivf_flat:
149+
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_CUVS_IVF_FLAT" | tee test_float_qps_cuvs_ivf_flat.log
150+
test_float_qps_cuvs_ivf_pq:
151+
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_CUVS_IVF_PQ" | tee test_float_qps_cuvs_ivf_pq.log
152+
test_float_qps_cuvs_cagra:
153+
./benchmark_float_qps --gtest_filter="Benchmark_float_qps.TEST_CUVS_CAGRA" | tee test_float_qps_cuvs_cagra.log
154154

155155
###################################################################################################
156156
# Test Knowhere float index range qps

‎ci/E2E_GPU.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pipeline {
3636
sh "nvidia-smi --query-gpu=name --format=csv,noheader"
3737
sh "./scripts/prepare_gpu_build.sh"
3838
sh "mkdir build"
39-
sh "cd build/ && conan install .. --build=missing -o with_diskann=True -o with_raft=True -s compiler.libcxx=libstdc++11 && conan build .."
39+
sh "cd build/ && conan install .. --build=missing -o with_diskann=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 && conan build .."
4040
sh "cd python && VERSION=${version} python3 setup.py bdist_wheel"
4141
dir('python/dist'){
4242
knowhere_wheel=sh(returnStdout: true, script: 'ls | grep .whl').trim()

‎ci/UT_GPU.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline {
3333
sh "nvidia-smi --query-gpu=name --format=csv,noheader"
3434
sh "./scripts/prepare_gpu_build.sh"
3535
sh "mkdir build"
36-
sh "cd build/ && conan install .. --build=missing -s build_type=Release -o with_diskann=True -o with_ut=True -o with_raft=True -s compiler.libcxx=libstdc++11 \
36+
sh "cd build/ && conan install .. --build=missing -s build_type=Release -o with_diskann=True -o with_ut=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 \
3737
&& conan build .. \
3838
&& ./Release/tests/ut/knowhere_tests"
3939
}

‎ci/docker/builder/gpu/ubuntu20.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN apt update \
4141
RUN git clone https://github.com/zilliztech/knowhere.git \
4242
&& cd knowhere \
4343
&& mkdir build && cd build \
44-
&& conan install .. --build=missing -o with_ut=True -o with_diskann=True -o with_raft=True -s compiler.libcxx=libstdc++11 -s build_type=Release \
44+
&& conan install .. --build=missing -o with_ut=True -o with_diskann=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 -s build_type=Release \
4545
&& conan build .. \
4646
&& cd ../.. \
4747
&& rm -rf knowhere

‎ci/docker/builder/gpu/ubuntu22.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ RUN apt update \
4949
RUN git clone https://github.com/zilliztech/knowhere.git \
5050
&& cd knowhere \
5151
&& mkdir build && cd build \
52-
&& conan install .. --build=missing -o with_ut=True -o with_diskann=True -o with_raft=True -s compiler.libcxx=libstdc++11 -s build_type=Release \
52+
&& conan install .. --build=missing -o with_ut=True -o with_diskann=True -o with_cuvs=True -s compiler.libcxx=libstdc++11 -s build_type=Release \
5353
&& conan build .. \
5454
&& cd ../.. && rm -rf knowhere

0 commit comments

Comments
 (0)