rename optimizer to selector (#2067)

* rename

Signed-off-by: wxyu <xy.wang@zilliz.com>

* fix clang-format

Signed-off-by: wxyu <xy.wang@zilliz.com>

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}
         )

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 {

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 <memory>
 #include <mutex>

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 {

core/src/scheduler/selector/BuildIndexPass.h

@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"

core/src/scheduler/selector/FaissFlatPass.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"

core/src/scheduler/selector/FaissIVFFlatPass.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"

core/src/scheduler/selector/FaissIVFPQPass.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"

core/src/scheduler/selector/FaissIVFSQ8HPass.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"

core/src/scheduler/selector/FaissIVFSQ8Pass.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "config/handler/GpuResourceConfigHandler.h"
-#include "scheduler/optimizer/Pass.h"
+#include "scheduler/selector/Pass.h"
 
 namespace milvus {
 namespace scheduler {

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"
 

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 {

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)

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

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 {