From c0d5a47eba7014bca432c0974efdf332d6fdeed4 Mon Sep 17 00:00:00 2001 From: Wang XiangYu Date: Fri, 24 Apr 2020 19:42:17 +0800 Subject: [PATCH] rename optimizer to selector (#2067) * rename Signed-off-by: wxyu * fix clang-format Signed-off-by: wxyu --- core/src/CMakeLists.txt | 4 ++-- core/src/scheduler/JobMgr.cpp | 3 +-- core/src/scheduler/SchedInst.h | 16 ++++++++-------- .../{optimizer => selector}/BuildIndexPass.cpp | 2 +- .../{optimizer => selector}/BuildIndexPass.h | 2 +- .../{optimizer => selector}/FaissFlatPass.cpp | 2 +- .../{optimizer => selector}/FaissFlatPass.h | 2 +- .../{optimizer => selector}/FaissIVFFlatPass.cpp | 2 +- .../{optimizer => selector}/FaissIVFFlatPass.h | 2 +- .../{optimizer => selector}/FaissIVFPQPass.cpp | 2 +- .../{optimizer => selector}/FaissIVFPQPass.h | 2 +- .../{optimizer => selector}/FaissIVFSQ8HPass.cpp | 2 +- .../{optimizer => selector}/FaissIVFSQ8HPass.h | 2 +- .../{optimizer => selector}/FaissIVFSQ8Pass.cpp | 2 +- .../{optimizer => selector}/FaissIVFSQ8Pass.h | 2 +- .../{optimizer => selector}/FallbackPass.cpp | 2 +- .../{optimizer => selector}/FallbackPass.h | 0 .../{optimizer => selector}/Optimizer.cpp | 2 +- .../{optimizer => selector}/Optimizer.h | 0 .../src/scheduler/{optimizer => selector}/Pass.h | 0 core/unittest/CMakeLists.txt | 4 ++-- core/unittest/scheduler/CMakeLists.txt | 2 +- .../{test_optimizer.cpp => test_selector.cpp} | 14 +++++++------- 23 files changed, 35 insertions(+), 36 deletions(-) rename core/src/scheduler/{optimizer => selector}/BuildIndexPass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/BuildIndexPass.h (97%) rename core/src/scheduler/{optimizer => selector}/FaissFlatPass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/FaissFlatPass.h (97%) rename core/src/scheduler/{optimizer => selector}/FaissIVFFlatPass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/FaissIVFFlatPass.h (97%) rename core/src/scheduler/{optimizer => selector}/FaissIVFPQPass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/FaissIVFPQPass.h (97%) rename core/src/scheduler/{optimizer => selector}/FaissIVFSQ8HPass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/FaissIVFSQ8HPass.h (97%) rename core/src/scheduler/{optimizer => selector}/FaissIVFSQ8Pass.cpp (98%) rename core/src/scheduler/{optimizer => selector}/FaissIVFSQ8Pass.h (97%) rename core/src/scheduler/{optimizer => selector}/FallbackPass.cpp (96%) rename core/src/scheduler/{optimizer => selector}/FallbackPass.h (100%) rename core/src/scheduler/{optimizer => selector}/Optimizer.cpp (95%) rename core/src/scheduler/{optimizer => selector}/Optimizer.h (100%) rename core/src/scheduler/{optimizer => selector}/Pass.h (100%) rename core/unittest/scheduler/{test_optimizer.cpp => test_selector.cpp} (92%) diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt index 6b8150cb64..6d5c7cd0d2 100644 --- a/core/src/CMakeLists.txt +++ b/core/src/CMakeLists.txt @@ -54,7 +54,7 @@ aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler scheduler_main_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/action scheduler_action_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/event scheduler_event_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/job scheduler_job_files) -aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/optimizer scheduler_optimizer_files) +aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/selector scheduler_selector_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/resource scheduler_resource_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/task scheduler_task_files) set(scheduler_files @@ -62,7 +62,7 @@ set(scheduler_files ${scheduler_action_files} ${scheduler_event_files} ${scheduler_job_files} - ${scheduler_optimizer_files} + ${scheduler_selector_files} ${scheduler_resource_files} ${scheduler_task_files} ) diff --git a/core/src/scheduler/JobMgr.cpp b/core/src/scheduler/JobMgr.cpp index d30ae6bcf3..1a2a9359f7 100644 --- a/core/src/scheduler/JobMgr.cpp +++ b/core/src/scheduler/JobMgr.cpp @@ -19,10 +19,9 @@ #include "SchedInst.h" #include "TaskCreator.h" -#include "optimizer/Optimizer.h" #include "scheduler/Algorithm.h" -#include "scheduler/optimizer/Optimizer.h" #include "scheduler/tasklabel/SpecResLabel.h" +#include "selector/Optimizer.h" #include "task/Task.h" namespace milvus { diff --git a/core/src/scheduler/SchedInst.h b/core/src/scheduler/SchedInst.h index 2ef7e5dd43..c78d271108 100644 --- a/core/src/scheduler/SchedInst.h +++ b/core/src/scheduler/SchedInst.h @@ -16,14 +16,14 @@ #include "ResourceMgr.h" #include "Scheduler.h" #include "Utils.h" -#include "optimizer/BuildIndexPass.h" -#include "optimizer/FaissFlatPass.h" -#include "optimizer/FaissIVFFlatPass.h" -#include "optimizer/FaissIVFPQPass.h" -#include "optimizer/FaissIVFSQ8HPass.h" -#include "optimizer/FaissIVFSQ8Pass.h" -#include "optimizer/FallbackPass.h" -#include "optimizer/Optimizer.h" +#include "selector/BuildIndexPass.h" +#include "selector/FaissFlatPass.h" +#include "selector/FaissIVFFlatPass.h" +#include "selector/FaissIVFPQPass.h" +#include "selector/FaissIVFSQ8HPass.h" +#include "selector/FaissIVFSQ8Pass.h" +#include "selector/FallbackPass.h" +#include "selector/Optimizer.h" #include #include diff --git a/core/src/scheduler/optimizer/BuildIndexPass.cpp b/core/src/scheduler/selector/BuildIndexPass.cpp similarity index 98% rename from core/src/scheduler/optimizer/BuildIndexPass.cpp rename to core/src/scheduler/selector/BuildIndexPass.cpp index b0702177f3..42a0736b0f 100644 --- a/core/src/scheduler/optimizer/BuildIndexPass.cpp +++ b/core/src/scheduler/selector/BuildIndexPass.cpp @@ -12,7 +12,7 @@ #include "scheduler/SchedInst.h" #include "scheduler/Utils.h" -#include "scheduler/optimizer/BuildIndexPass.h" +#include "scheduler/selector/BuildIndexPass.h" #include "scheduler/tasklabel/SpecResLabel.h" #ifdef MILVUS_GPU_VERSION namespace milvus { diff --git a/core/src/scheduler/optimizer/BuildIndexPass.h b/core/src/scheduler/selector/BuildIndexPass.h similarity index 97% rename from core/src/scheduler/optimizer/BuildIndexPass.h rename to core/src/scheduler/selector/BuildIndexPass.h index cd6095d38f..7f3b8047fc 100644 --- a/core/src/scheduler/optimizer/BuildIndexPass.h +++ b/core/src/scheduler/selector/BuildIndexPass.h @@ -23,7 +23,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FaissFlatPass.cpp b/core/src/scheduler/selector/FaissFlatPass.cpp similarity index 98% rename from core/src/scheduler/optimizer/FaissFlatPass.cpp rename to core/src/scheduler/selector/FaissFlatPass.cpp index bb9f0814f9..c3b86ee99b 100644 --- a/core/src/scheduler/optimizer/FaissFlatPass.cpp +++ b/core/src/scheduler/selector/FaissFlatPass.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. #ifdef MILVUS_GPU_VERSION -#include "scheduler/optimizer/FaissFlatPass.h" +#include "scheduler/selector/FaissFlatPass.h" #include "cache/GpuCacheMgr.h" #include "config/Config.h" #include "scheduler/SchedInst.h" diff --git a/core/src/scheduler/optimizer/FaissFlatPass.h b/core/src/scheduler/selector/FaissFlatPass.h similarity index 97% rename from core/src/scheduler/optimizer/FaissFlatPass.h rename to core/src/scheduler/selector/FaissFlatPass.h index 6878f1c4cb..a1ebeb9b47 100644 --- a/core/src/scheduler/optimizer/FaissFlatPass.h +++ b/core/src/scheduler/selector/FaissFlatPass.h @@ -24,7 +24,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FaissIVFFlatPass.cpp b/core/src/scheduler/selector/FaissIVFFlatPass.cpp similarity index 98% rename from core/src/scheduler/optimizer/FaissIVFFlatPass.cpp rename to core/src/scheduler/selector/FaissIVFFlatPass.cpp index cc45eb9e38..6ba62b3a0c 100644 --- a/core/src/scheduler/optimizer/FaissIVFFlatPass.cpp +++ b/core/src/scheduler/selector/FaissIVFFlatPass.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. #ifdef MILVUS_GPU_VERSION -#include "scheduler/optimizer/FaissIVFFlatPass.h" +#include "scheduler/selector/FaissIVFFlatPass.h" #include "cache/GpuCacheMgr.h" #include "config/Config.h" #include "scheduler/SchedInst.h" diff --git a/core/src/scheduler/optimizer/FaissIVFFlatPass.h b/core/src/scheduler/selector/FaissIVFFlatPass.h similarity index 97% rename from core/src/scheduler/optimizer/FaissIVFFlatPass.h rename to core/src/scheduler/selector/FaissIVFFlatPass.h index fe21996cda..dda315c64a 100644 --- a/core/src/scheduler/optimizer/FaissIVFFlatPass.h +++ b/core/src/scheduler/selector/FaissIVFFlatPass.h @@ -24,7 +24,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FaissIVFPQPass.cpp b/core/src/scheduler/selector/FaissIVFPQPass.cpp similarity index 98% rename from core/src/scheduler/optimizer/FaissIVFPQPass.cpp rename to core/src/scheduler/selector/FaissIVFPQPass.cpp index 53f16dd088..de213f4079 100644 --- a/core/src/scheduler/optimizer/FaissIVFPQPass.cpp +++ b/core/src/scheduler/selector/FaissIVFPQPass.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. #ifdef MILVUS_GPU_VERSION -#include "scheduler/optimizer/FaissIVFPQPass.h" +#include "scheduler/selector/FaissIVFPQPass.h" #include "cache/GpuCacheMgr.h" #include "config/Config.h" #include "scheduler/SchedInst.h" diff --git a/core/src/scheduler/optimizer/FaissIVFPQPass.h b/core/src/scheduler/selector/FaissIVFPQPass.h similarity index 97% rename from core/src/scheduler/optimizer/FaissIVFPQPass.h rename to core/src/scheduler/selector/FaissIVFPQPass.h index cb3239197a..f4fca581d2 100644 --- a/core/src/scheduler/optimizer/FaissIVFPQPass.h +++ b/core/src/scheduler/selector/FaissIVFPQPass.h @@ -24,7 +24,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FaissIVFSQ8HPass.cpp b/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp similarity index 98% rename from core/src/scheduler/optimizer/FaissIVFSQ8HPass.cpp rename to core/src/scheduler/selector/FaissIVFSQ8HPass.cpp index 8e99be828a..e1f79a1650 100644 --- a/core/src/scheduler/optimizer/FaissIVFSQ8HPass.cpp +++ b/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp @@ -10,7 +10,7 @@ // or implied. See the License for the specific language governing permissions and limitations under the License. #ifdef MILVUS_GPU_VERSION -#include "scheduler/optimizer/FaissIVFSQ8HPass.h" +#include "scheduler/selector/FaissIVFSQ8HPass.h" #include "cache/GpuCacheMgr.h" #include "config/Config.h" #include "scheduler/SchedInst.h" diff --git a/core/src/scheduler/optimizer/FaissIVFSQ8HPass.h b/core/src/scheduler/selector/FaissIVFSQ8HPass.h similarity index 97% rename from core/src/scheduler/optimizer/FaissIVFSQ8HPass.h rename to core/src/scheduler/selector/FaissIVFSQ8HPass.h index ffff0a899a..c9da0f5829 100644 --- a/core/src/scheduler/optimizer/FaissIVFSQ8HPass.h +++ b/core/src/scheduler/selector/FaissIVFSQ8HPass.h @@ -24,7 +24,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FaissIVFSQ8Pass.cpp b/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp similarity index 98% rename from core/src/scheduler/optimizer/FaissIVFSQ8Pass.cpp rename to core/src/scheduler/selector/FaissIVFSQ8Pass.cpp index 0f19f282b8..28a210a61b 100644 --- a/core/src/scheduler/optimizer/FaissIVFSQ8Pass.cpp +++ b/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. #ifdef MILVUS_GPU_VERSION -#include "scheduler/optimizer/FaissIVFSQ8Pass.h" +#include "scheduler/selector/FaissIVFSQ8Pass.h" #include "cache/GpuCacheMgr.h" #include "config/Config.h" #include "scheduler/SchedInst.h" diff --git a/core/src/scheduler/optimizer/FaissIVFSQ8Pass.h b/core/src/scheduler/selector/FaissIVFSQ8Pass.h similarity index 97% rename from core/src/scheduler/optimizer/FaissIVFSQ8Pass.h rename to core/src/scheduler/selector/FaissIVFSQ8Pass.h index 89219beb78..b3207763f7 100644 --- a/core/src/scheduler/optimizer/FaissIVFSQ8Pass.h +++ b/core/src/scheduler/selector/FaissIVFSQ8Pass.h @@ -24,7 +24,7 @@ #include #include "config/handler/GpuResourceConfigHandler.h" -#include "scheduler/optimizer/Pass.h" +#include "scheduler/selector/Pass.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/FallbackPass.cpp b/core/src/scheduler/selector/FallbackPass.cpp similarity index 96% rename from core/src/scheduler/optimizer/FallbackPass.cpp rename to core/src/scheduler/selector/FallbackPass.cpp index 281f57cfeb..e4bb51f8d0 100644 --- a/core/src/scheduler/optimizer/FallbackPass.cpp +++ b/core/src/scheduler/selector/FallbackPass.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. -#include "scheduler/optimizer/FallbackPass.h" +#include "scheduler/selector/FallbackPass.h" #include "scheduler/SchedInst.h" #include "scheduler/tasklabel/SpecResLabel.h" diff --git a/core/src/scheduler/optimizer/FallbackPass.h b/core/src/scheduler/selector/FallbackPass.h similarity index 100% rename from core/src/scheduler/optimizer/FallbackPass.h rename to core/src/scheduler/selector/FallbackPass.h diff --git a/core/src/scheduler/optimizer/Optimizer.cpp b/core/src/scheduler/selector/Optimizer.cpp similarity index 95% rename from core/src/scheduler/optimizer/Optimizer.cpp rename to core/src/scheduler/selector/Optimizer.cpp index 68ef4f185f..497287fa05 100644 --- a/core/src/scheduler/optimizer/Optimizer.cpp +++ b/core/src/scheduler/selector/Optimizer.cpp @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. -#include "scheduler/optimizer/Optimizer.h" +#include "scheduler/selector/Optimizer.h" namespace milvus { namespace scheduler { diff --git a/core/src/scheduler/optimizer/Optimizer.h b/core/src/scheduler/selector/Optimizer.h similarity index 100% rename from core/src/scheduler/optimizer/Optimizer.h rename to core/src/scheduler/selector/Optimizer.h diff --git a/core/src/scheduler/optimizer/Pass.h b/core/src/scheduler/selector/Pass.h similarity index 100% rename from core/src/scheduler/optimizer/Pass.h rename to core/src/scheduler/selector/Pass.h diff --git a/core/unittest/CMakeLists.txt b/core/unittest/CMakeLists.txt index e317a6d04e..09e87aa956 100644 --- a/core/unittest/CMakeLists.txt +++ b/core/unittest/CMakeLists.txt @@ -45,7 +45,7 @@ aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/event scheduler_event_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/job scheduler_job_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/resource scheduler_resource_files) aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/task scheduler_task_files) -aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/optimizer scheduler_optimizer_files) +aux_source_directory(${MILVUS_ENGINE_SRC}/scheduler/selector scheduler_selector_files) set(scheduler_files ${scheduler_main_files} ${scheduler_action_files} @@ -53,7 +53,7 @@ set(scheduler_files ${scheduler_job_files} ${scheduler_resource_files} ${scheduler_task_files} - ${scheduler_optimizer_files} + ${scheduler_selector_files} ) aux_source_directory(${MILVUS_THIRDPARTY_SRC}/easyloggingpp thirdparty_easyloggingpp_files) diff --git a/core/unittest/scheduler/CMakeLists.txt b/core/unittest/scheduler/CMakeLists.txt index 501c73fdb6..0dc9b2ea68 100644 --- a/core/unittest/scheduler/CMakeLists.txt +++ b/core/unittest/scheduler/CMakeLists.txt @@ -21,7 +21,7 @@ set(test_files ${CMAKE_CURRENT_SOURCE_DIR}/test_scheduler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_task.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_job.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_optimizer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/test_selector.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_tasktable.cpp) add_executable(test_scheduler diff --git a/core/unittest/scheduler/test_optimizer.cpp b/core/unittest/scheduler/test_selector.cpp similarity index 92% rename from core/unittest/scheduler/test_optimizer.cpp rename to core/unittest/scheduler/test_selector.cpp index 0757fc235c..71a97ff516 100644 --- a/core/unittest/scheduler/test_optimizer.cpp +++ b/core/unittest/scheduler/test_selector.cpp @@ -14,15 +14,15 @@ #include "scheduler/task/BuildIndexTask.h" #include "scheduler/task/SearchTask.h" -#include "scheduler/optimizer/FaissIVFFlatPass.h" #include "scheduler/SchedInst.h" #include "scheduler/resource/CpuResource.h" -#include "scheduler/optimizer/BuildIndexPass.h" -#include "scheduler/optimizer/FaissFlatPass.h" -#include "scheduler/optimizer/FaissIVFPQPass.h" -#include "scheduler/optimizer/FaissIVFSQ8HPass.h" -#include "scheduler/optimizer/FaissIVFSQ8Pass.h" -#include "scheduler/optimizer/FallbackPass.h" +#include "scheduler/selector/BuildIndexPass.h" +#include "scheduler/selector/FaissFlatPass.h" +#include "scheduler/selector/FaissIVFFlatPass.h" +#include "scheduler/selector/FaissIVFPQPass.h" +#include "scheduler/selector/FaissIVFSQ8HPass.h" +#include "scheduler/selector/FaissIVFSQ8Pass.h" +#include "scheduler/selector/FallbackPass.h" namespace milvus { namespace scheduler {