Skip to content

Commit 8fd79f1

Browse files
committed
update raft from 23.12 to 24.04
Signed-off-by: yusheng.ma <yusheng.ma@zilliz.com>
1 parent 89657b0 commit 8fd79f1

File tree

5 files changed

+9
-114
lines changed

5 files changed

+9
-114
lines changed

CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ include_directories(${folly_INCLUDE_DIRS})
9696
find_package(nlohmann_json REQUIRED)
9797
find_package(glog REQUIRED)
9898
find_package(prometheus-cpp REQUIRED)
99-
find_package(fmt REQUIRED)
99+
if(NOT WITH_RAFT)
100+
find_package(fmt REQUIRED)
101+
endif()
100102
find_package(opentelemetry-cpp REQUIRED)
101103

102104
set(CMAKE_CXX_STANDARD 17)
@@ -129,7 +131,7 @@ endif()
129131

130132
if(WITH_LIGHT)
131133
knowhere_file_glob(GLOB_RECURSE KNOWHERE_SRCS src/common/*.cc
132-
src/index/hnsw/hnsw.cc src/io/*.cc)
134+
src/index/hnsw/hnsw.cc src/io/*.cc src/index/index_factory.cc)
133135
knowhere_file_glob(GLOB_RECURSE KNOWHERE_TRACER_SRCS src/common/tracer.cc
134136
src/common/prometheus_client.cc)
135137
list(REMOVE_ITEM KNOWHERE_SRCS ${KNOWHERE_TRACER_SRCS})

cmake/libs/libcutlass.cmake

-107
This file was deleted.

cmake/libs/libraft.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
add_definitions(-DKNOWHERE_WITH_RAFT)
1717
add_definitions(-DRAFT_EXPLICIT_INSTANTIATE_ONLY)
1818
set(RAFT_VERSION "${RAPIDS_VERSION}")
19-
set(RAFT_FORK "wphicks")
20-
set(RAFT_PINNED_TAG "knowhere-2.4")
19+
set(RAFT_FORK "milvus-io")
20+
set(RAFT_PINNED_TAG "branch-24.04")
2121

2222
rapids_find_package(CUDAToolkit REQUIRED BUILD_EXPORT_SET knowhere-exports
2323
INSTALL_EXPORT_SET knowhere-exports)

cmake/libs/librapids.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# License for the specific language governing permissions and limitations under
1414
# the License.
1515

16-
set(RAPIDS_VERSION 23.12)
16+
set(RAPIDS_VERSION 24.04)
1717

1818
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAPIDS.cmake)
1919
file(

src/common/raft/proto/raft_index.cuh

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ struct raft_index {
190190

191191
template <typename T, typename IdxT, typename InputIdxT, typename DataMdspanT>
192192
auto static build(raft::resources const& res, index_params_type const& index_params, DataMdspanT data) {
193-
if constexpr (std::is_same_v<DataMdspanT, raft::host_matrix_view<T const, InputIdxT>>) {
193+
if constexpr (std::is_same_v<DataMdspanT, raft::host_matrix_view<T const, IdxT>>) {
194194
if constexpr (vector_index_kind == raft_index_kind::brute_force) {
195195
return raft_index<underlying_index_type, raft_index_args...>{
196196
raft::neighbors::brute_force::build<T>(res, index_params, data)};
@@ -199,7 +199,7 @@ struct raft_index {
199199
raft::neighbors::cagra::build<T>(res, index_params, data)};
200200
} else if constexpr (vector_index_kind == raft_index_kind::ivf_pq) {
201201
return raft_index<underlying_index_type, raft_index_args...>{raft::neighbors::ivf_pq::build<T, IdxT>(
202-
res, index_params, data.handle(), data.extent(0), data.extent(1))};
202+
res, index_params, data.data_handle(), data.extent(0), data.extent(1))};
203203
} else {
204204
RAFT_FAIL("IVF flat does not support construction from host data");
205205
}

0 commit comments

Comments
 (0)