milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix fmt lib conflict when compile with raft suppport (#24266) 

Signed-off-by: Yusheng.Ma <Yusheng.Ma@zilliz.com>
pull/24351/head
presburger 2023-05-24 13:05:26 +08:00 committed by GitHub
parent daa615c2b5
commit 152acb3a76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 91 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/core/conanfile.py
View File

@ -31,7 +31,7 @@ class MilvusConan(ConanFile):
"zlib/1.2.13",
"libcurl/7.86.0",
"glog/0.6.0",
"fmt/8.0.1",
"fmt/9.1.0",
"gflags/2.2.2",
"double-conversion/3.2.1",
"libevent/2.1.12",
@ -42,7 +42,7 @@ class MilvusConan(ConanFile):
"xz_utils/5.4.0",
"prometheus-cpp/1.1.0",
"re2/20230301",
"folly/2023.02.24@milvus/dev",
"folly/2023.05.22.02@milvus/dev",
"opentelemetry-cpp/1.8.1.1@milvus/dev",
)
generators = ("cmake", "cmake_find_package")
@ -59,6 +59,7 @@ class MilvusConan(ConanFile):
"boost:without_locale": False,
"glog:with_gflags": False,
"prometheus-cpp:with_pull": False,
"fmt:header_only": True
}
def configure(self):

53
internal/core/src/common/Types.h
View File

@ -159,3 +159,56 @@ struct LargeType {
};
static_assert(std::is_same_v<LargeType&, Parameter<LargeType>>);
} // namespace milvus
//
template <>
struct fmt::formatter<milvus::DataType> : formatter<string_view> {
auto
format(milvus::DataType c, format_context& ctx) const {
string_view name = "unknown";
switch (c) {
case milvus::DataType::NONE:
name = "NONE";
break;
case milvus::DataType::BOOL:
name = "BOOL";
break;
case milvus::DataType::INT8:
name = "INT8";
break;
case milvus::DataType::INT16:
name = "INT16";
break;
case milvus::DataType::INT32:
name = "INT32";
break;
case milvus::DataType::INT64:
name = "INT64";
break;
case milvus::DataType::FLOAT:
name = "FLOAT";
break;
case milvus::DataType::DOUBLE:
name = "DOUBLE";
break;
case milvus::DataType::STRING:
name = "STRING";
break;
case milvus::DataType::VARCHAR:
name = "VARCHAR";
break;
case milvus::DataType::ARRAY:
name = "ARRAY";
break;
case milvus::DataType::JSON:
name = "JSON";
break;
case milvus::DataType::VECTOR_BINARY:
name = "VECTOR_BINARY";
break;
case milvus::DataType::VECTOR_FLOAT:
name = "VECTOR_FLOAT";
break;
}
return formatter<string_view>::format(name, ctx);
}
};

28
internal/core/src/query/PlanProto.h
View File

@ -74,3 +74,31 @@ class ProtoParser {
};
} // namespace milvus::query
//
template <>
struct fmt::formatter<milvus::proto::plan::GenericValue::ValCase>
: formatter<string_view> {
auto
format(milvus::proto::plan::GenericValue::ValCase c,
format_context& ctx) const {
string_view name = "unknown";
switch (c) {
case milvus::proto::plan::GenericValue::ValCase::kBoolVal:
name = "kBoolVal";
break;
case milvus::proto::plan::GenericValue::ValCase::kInt64Val:
name = "kInt64Val";
break;
case milvus::proto::plan::GenericValue::ValCase::kFloatVal:
name = "kFloatVal";
break;
case milvus::proto::plan::GenericValue::ValCase::kStringVal:
name = "kStringVal";
break;
case milvus::proto::plan::GenericValue::ValCase::VAL_NOT_SET:
name = "VAL_NOT_SET";
break;
}
return formatter<string_view>::format(name, ctx);
}
};

2
internal/core/src/query/visitors/ExecExprVisitor.cpp
View File

@ -32,7 +32,7 @@
#include "query/Utils.h"
#include "segcore/SegmentGrowingImpl.h"
#include "simdjson/error.h"
#include "query/PlanProto.h"
namespace milvus::query {
// THIS CONTAINS EXTRA BODY FOR VISITOR
// WILL BE USED BY GENERATOR

1
internal/core/thirdparty/knowhere/CMakeLists.txt vendored
View File

@ -23,7 +23,6 @@ else ()
endif ()
if ( MILVUS_GPU_VERSION STREQUAL "ON" )
set(USE_CUDA ON CACHE BOOL "" FORCE )
set(WITH_RAFT ON CACHE BOOL "" FORCE )
endif ()

8
tests/python_client/common/common_func.py
View File

@ -204,8 +204,10 @@ def gen_schema_multi_string_fields(string_fields):
def gen_vectors(nb, dim):
vectors = [[random.random() for _ in range(dim)] for _ in range(nb)]
vectors = preprocessing.normalize(vectors, axis=1, norm='l2')
return vectors.tolist()
if dim > 1:
vectors = preprocessing.normalize(vectors, axis=1, norm='l2')
vectors = vectors.tolist()
return vectors
def gen_string(nb):
@ -491,7 +493,7 @@ def gen_search_param(index_type, metric_type="L2"):
ivf_search_params = {"metric_type": metric_type, "params": {}}
search_params.append(ivf_search_params)
else:
for nprobe in [64, 128]:
for nprobe in [64,]:
ivf_search_params = {"metric_type": metric_type, "params": {"nprobe": nprobe}}
search_params.append(ivf_search_params)
elif index_type in ["BIN_FLAT", "BIN_IVF_FLAT"]:

2
tests/python_client/common/common_type.py
View File

@ -191,7 +191,7 @@ all_index_types = ["FLAT", "IVF_FLAT", "IVF_SQ8", "IVF_PQ", "HNSW", "DISKANN", "
default_index_params = [{"nlist": 128}, {"nlist": 128}, {"nlist": 128}, {"nlist": 128, "m": 16, "nbits": 8},
{"M": 48, "efConstruction": 500}, {}, {"nlist": 128}, {"nlist": 128},
{"nlist": 128}, {"nlist": 128, "m": 16, "nbits": 8}]
{"nlist": 64}, {"nlist": 64, "m": 16, "nbits": 8}]
Handler_type = ["GRPC", "HTTP"]
binary_support = ["BIN_FLAT", "BIN_IVF_FLAT"]