提交 cb81e199 编写于 作者: S starlord

Merge remote-tracking branch 'source/0.5.0' into branch-0.5.0


Former-commit-id: 008715764397ee10fbbfd6e67218fce68b68b515
...@@ -114,15 +114,15 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ ...@@ -114,15 +114,15 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
"/usr/*" \ "/usr/*" \
"*/boost/*" \ "*/boost/*" \
"*/cmake_build/*_ep-prefix/*" \ "*/cmake_build/*_ep-prefix/*" \
"src/index/cmake_build*" \ "*/src/index/cmake_build*" \
"src/index/thirdparty*" \ "*/src/index/thirdparty*" \
"src/grpc*"\ "*/src/grpc*" \
"src/metrics/MetricBase.h"\ "*/src/metrics/MetricBase.h" \
"src/server/Server.cpp"\ "*/src/server/Server.cpp" \
"src/server/DBWrapper.cpp"\ "*/src/server/DBWrapper.cpp" \
"src/server/grpc_impl/GrpcServer.cpp"\ "*/src/server/grpc_impl/GrpcServer.cpp" \
"src/utils/easylogging++.h"\ "*/src/utils/easylogging++.h" \
"src/utils/easylogging++.cc"\ "*/src/utils/easylogging++.cc"
# gen html report # gen html report
${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/ ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/
...@@ -164,6 +164,9 @@ ExecutionEngineImpl::HybridLoad() const { ...@@ -164,6 +164,9 @@ ExecutionEngineImpl::HybridLoad() const {
quantizer_conf->mode = 1; quantizer_conf->mode = 1;
quantizer_conf->gpu_id = best_device_id; quantizer_conf->gpu_id = best_device_id;
auto quantizer = index_->LoadQuantizer(quantizer_conf); auto quantizer = index_->LoadQuantizer(quantizer_conf);
if (quantizer == nullptr) {
ENGINE_LOG_ERROR << "quantizer is nullptr";
}
index_->SetQuantizer(quantizer); index_->SetQuantizer(quantizer);
auto cache_quantizer = std::make_shared<CachedQuantizer>(quantizer); auto cache_quantizer = std::make_shared<CachedQuantizer>(quantizer);
cache::GpuCacheMgr::GetInstance(best_device_id)->InsertItem(key, cache_quantizer); cache::GpuCacheMgr::GetInstance(best_device_id)->InsertItem(key, cache_quantizer);
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "knowhere/common/BinarySet.h" #include "knowhere/common/BinarySet.h"
#include "knowhere/common/Config.h" #include "knowhere/common/Config.h"
#include "knowhere/index/vector_index/Quantizer.h" #include "knowhere/index/vector_index/Quantizer.h"
#include "utils/Log.h"
#include "utils/Status.h" #include "utils/Status.h"
namespace milvus { namespace milvus {
...@@ -101,6 +102,7 @@ class VecIndex : public cache::DataObj { ...@@ -101,6 +102,7 @@ class VecIndex : public cache::DataObj {
//////////////// ////////////////
virtual knowhere::QuantizerPtr virtual knowhere::QuantizerPtr
LoadQuantizer(const Config& conf) { LoadQuantizer(const Config& conf) {
ENGINE_LOG_ERROR << "LoadQuantizer virtual funciton called.";
return nullptr; return nullptr;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册