Skip to content

Commit 8d268ee

Browse files
committed
Upgrade to folly/2026.04.20.00@milvus/dev
Signed-off-by: yhmo <yihua.mo@zilliz.com>
1 parent 4489f68 commit 8d268ee

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

cmake/libs/libdiskann.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ if (WITH_CUVS)
3636
endif()
3737

3838
add_library(diskann STATIC ${DISKANN_SOURCES})
39-
set_target_properties(diskann PROPERTIES CXX_STANDARD 17)
39+
# folly v2026 headers require C++20 (consteval/constinit); DiskANN includes
40+
# milvus-common's thread_pool.h which pulls in folly/executors.
41+
set_target_properties(diskann PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON)
4042
target_link_libraries(
4143
diskann
4244
PUBLIC ${AIO_LIBRARIES}

cmake/libs/libmilvus-common.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ if ( NOT milvus-common_POPULATED )
3232
add_subdirectory( ${milvus-common_SOURCE_DIR}
3333
${milvus-common_BINARY_DIR} )
3434

35+
# milvus-common's CMakeLists hardcodes CMAKE_CXX_STANDARD=17, but folly v2026
36+
# headers require C++20 (consteval/constinit). Override on the target.
37+
set_target_properties(milvus-common PROPERTIES
38+
CXX_STANDARD 20
39+
CXX_STANDARD_REQUIRED ON)
40+
3541
if(NOT APPLE)
3642
target_link_libraries(milvus-common PUBLIC atomic)
3743
endif()

conanfile.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@ def requirements(self):
114114
self.requires("double-conversion/3.3.0#640e35791a4bac95b0545e2f54b7aceb")
115115
self.requires("xz_utils/5.4.5#fc4e36861e0a47ecd4a40a00e6d29ac8")
116116
self.requires("protobuf/5.27.0@milvus/dev#42f031a96d21c230a6e05bcac4bdd633", force=True, override=True)
117-
self.requires("lz4/1.9.4#7f0b5851453198536c14354ee30ca9ae", force=True, override=True)
117+
self.requires("lz4/1.10.0#982d9b673900f665a1da109e09c17cab", force=True, override=True)
118118
if self.settings.os == "Linux":
119119
self.requires("liburing/2.8", force=True, override=True)
120120
self.requires("fmt/11.2.0#eb98daa559c7c59d591f4720dde4cd5c", force=True, override=True)
121121
self.requires("libevent/2.1.12#95065aaefcd58d3956d6dfbfc5631d97")
122122
self.requires("grpc/1.67.1@milvus/dev#efeaa484b59bffaa579004d5e82ec4fd")
123-
self.requires("folly/2024.08.12.00@milvus/dev#f9b2bdf162c0ec47cb4e5404097b340d")
123+
self.requires("folly/2026.04.20.00@milvus/dev#f72c1b4271ff64215e9b1797a32bf8ad")
124+
self.requires("fast_float/8.0.0@milvus/dev#c7802833c74c5a86ffed70e4af1a795e")
124125
self.requires("libcurl/8.10.1#a3113369c86086b0e84231844e7ed0a9", force=True, override=True)
125126
self.requires("simde/0.8.2#5e1edfd5cba92f25d79bf6ef4616b972")
126127
self.requires("xxhash/0.8.3#caa6d0af1b951c247922e38fbcebdbe6")

0 commit comments

Comments
 (0)