From c451f8cbf2b66c45759f7ca7bba15212343e2a91 Mon Sep 17 00:00:00 2001
From: fishpenguin <kun.yu@zilliz.com>
Date: Tue, 19 Nov 2019 19:40:17 +0800
Subject: [PATCH] clange format and add FallbackPass

---
 core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h | 1 -
 core/src/scheduler/SchedInst.h                                 | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h
index 4bb4092b..e064b6f0 100644
--- a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h
+++ b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h
@@ -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;
 
diff --git a/core/src/scheduler/SchedInst.h b/core/src/scheduler/SchedInst.h
index 48eaffc0..44fea1b6 100644
--- a/core/src/scheduler/SchedInst.h
+++ b/core/src/scheduler/SchedInst.h
@@ -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);
             }
         }
-- 
GitLab