Merge pull request #365 from scsven/dev

#327 fix flat doesn't use gpu bug

CHANGELOG.md

@@ -8,6 +8,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#246 - Exclude src/external folder from code coverage for jenkin ci
 - \#248 - Reside src/external in thirdparty
 - \#316 - Some files not merged after vectors added
+- \#327 - Search does not use GPU when index type is FLAT
 - \#340 - Test cases run failed on 0.6.0
 
 ## Feature

core/src/scheduler/interface/interfaces.h

@@ -33,8 +33,7 @@ namespace milvus {
 namespace interface {
 
 struct dumpable {
-    virtual ~dumpable() {
-    }
+    virtual ~dumpable() = default;
 
     virtual json
     Dump() const = 0;

core/src/scheduler/optimizer/OnlyGPUPass.cpp

@@ -34,7 +34,8 @@ OnlyGPUPass::Run(const TaskPtr& task) {
 
     auto search_task = std::static_pointer_cast<XSearchTask>(task);
     if (search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IVFSQ8 &&
-        search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IVFFLAT) {
+        search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IVFFLAT &&
+        search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IDMAP) {
         return false;
     }