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

clange format and add FallbackPass

pull/414/head
fishpenguin 2019-11-19 19:40:17 +08:00
parent 30dcfa6719
commit c451f8cbf2
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h
View File

@ -47,7 +47,6 @@ class IVF : public VectorIndex, public FaissBaseIndex {
void
set_index_model(IndexModelPtr model) override;
void
Add(const DatasetPtr& dataset, const Config& config) override;

3
core/src/scheduler/SchedInst.h
View File

@ -104,14 +104,13 @@ class OptimizerInst {
pass_list.push_back(std::make_shared<HybridPass>());
#ifdef MILVUS_CPU_VERSION
pass_list.push_back(std::make_shared<OnlyCPUPass>());
<<<<<<< HEAD
#else
server::Config& config = server::Config::GetInstance();
std::vector<int32_t> build_resources;
config.GetGpuResourceConfigBuildIndexResources(build_resources);
pass_list.push_back(std::make_shared<BuildIndexPass>(build_resources));
#endif
// pass_list.push_back(std::make_shared<FallbackPass>());
pass_list.push_back(std::make_shared<FallbackPass>());
instance = std::make_shared<Optimizer>(pass_list);
}
}