diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index 474515264656384f2acda9a79aac5ea76707aa39..3c9176c15b753f0a304d20b19f958c89aedaa6f2 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -5,7 +5,7 @@ class MilvusConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = ( "rocksdb/6.29.5", - "boost/1.79.0", + "boost/1.82.0", "onetbb/2021.7.0", "nlohmann_json/3.11.2", "zstd/1.5.4", @@ -81,13 +81,6 @@ class MilvusConan(ConanFile): del self.options["folly"].use_sse4_2 self.options["arrow"].with_jemalloc = False - self.options["boost"].without_fiber = True - self.options["boost"].without_json = True - self.options["boost"].without_wave = True - self.options["boost"].without_math = True - self.options["boost"].without_graph = True - self.options["boost"].without_graph_parallel = True - self.options["boost"].without_nowide = True def imports(self): self.copy("*.dylib", "../lib", "lib") diff --git a/internal/core/src/common/Types.h b/internal/core/src/common/Types.h index dd7fd7769842093cf4fc4add8a89fae9ea124ddd..023d51af81ae6a9837093e415ebeba319064948d 100644 --- a/internal/core/src/common/Types.h +++ b/internal/core/src/common/Types.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -123,7 +124,8 @@ using BitsetTypePtr = std::shared_ptr>; using BitsetTypeOpt = std::optional; template -using FixedVector = boost::container::vector; +using FixedVector = folly::fbvector< + Type>; // boost::container::vector has memory leak when version > 1.79, so use folly::fbvector instead using Config = nlohmann::json; using TargetBitmap = FixedVector; diff --git a/scripts/setenv.sh b/scripts/setenv.sh index 93c40085dd719a3d4ef78b03fbeeb0851cad11cb..40e0a1a677c270e664d827c063aed321fbf1ab46 100644 --- a/scripts/setenv.sh +++ b/scripts/setenv.sh @@ -47,13 +47,13 @@ case "${unameOut}" in export RPATH=$LD_LIBRARY_PATH;; Darwin*) # detect llvm version by valid list - for llvm_version in 15 14 NOT_FOUND ; do + for llvm_version in 16 15 14 NOT_FOUND ; do if brew ls --versions llvm@${llvm_version} > /dev/null; then break fi done if [ "${llvm_version}" = "NOT_FOUND" ] ; then - echo "valid llvm(14 or 15) not installed" + echo "valid llvm(>=14) not installed" exit 1 fi llvm_prefix="$(brew --prefix llvm@${llvm_version})"