Rename new_model_manager to model_manager.

ge/CMakeLists.txt

@@ -129,38 +129,38 @@ set(TRAIN_SRC_LIST
     "graph/label/partitioned_call_label_maker.cc"
     "graph/label/while_label_maker.cc"
     "graph/load/graph_loader.cc"
-    "graph/load/new_model_manager/cpu_queue_schedule.cc"
-    "graph/load/new_model_manager/data_dumper.cc"
-    "graph/load/new_model_manager/data_inputer.cc"
-    "graph/load/new_model_manager/davinci_model.cc"
-    "graph/load/new_model_manager/davinci_model_parser.cc"
-    "graph/load/new_model_manager/model_manager.cc"
-    "graph/load/new_model_manager/model_utils.cc"
-    "graph/load/new_model_manager/aipp_utils.cc"
-    "graph/load/new_model_manager/task_info/end_graph_task_info.cc"
-    "graph/load/new_model_manager/task_info/model_exit_task_info.cc"
-    "graph/load/new_model_manager/task_info/event_record_task_info.cc"
-    "graph/load/new_model_manager/task_info/event_wait_task_info.cc"
-    "graph/load/new_model_manager/task_info/fusion_start_task_info.cc"
-    "graph/load/new_model_manager/task_info/fusion_stop_task_info.cc"
-    "graph/load/new_model_manager/task_info/hccl_task_info.cc"
-    "graph/load/new_model_manager/task_info/kernel_ex_task_info.cc"
-    "graph/load/new_model_manager/task_info/kernel_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_set_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc"
-    "graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc"
-    "graph/load/new_model_manager/task_info/memcpy_async_task_info.cc"
-    "graph/load/new_model_manager/task_info/profiler_trace_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_active_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_switch_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_switchn_task_info.cc"
-    "graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc"
-    "graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc"
-    "graph/load/new_model_manager/task_info/task_info.cc"
-    "graph/load/new_model_manager/tbe_handle_store.cc"
-    "graph/load/new_model_manager/zero_copy_task.cc"
-    "graph/load/new_model_manager/zero_copy_offset.cc"
+    "graph/load/model_manager/cpu_queue_schedule.cc"
+    "graph/load/model_manager/data_dumper.cc"
+    "graph/load/model_manager/data_inputer.cc"
+    "graph/load/model_manager/davinci_model.cc"
+    "graph/load/model_manager/davinci_model_parser.cc"
+    "graph/load/model_manager/model_manager.cc"
+    "graph/load/model_manager/model_utils.cc"
+    "graph/load/model_manager/aipp_utils.cc"
+    "graph/load/model_manager/task_info/end_graph_task_info.cc"
+    "graph/load/model_manager/task_info/model_exit_task_info.cc"
+    "graph/load/model_manager/task_info/event_record_task_info.cc"
+    "graph/load/model_manager/task_info/event_wait_task_info.cc"
+    "graph/load/model_manager/task_info/fusion_start_task_info.cc"
+    "graph/load/model_manager/task_info/fusion_stop_task_info.cc"
+    "graph/load/model_manager/task_info/hccl_task_info.cc"
+    "graph/load/model_manager/task_info/kernel_ex_task_info.cc"
+    "graph/load/model_manager/task_info/kernel_task_info.cc"
+    "graph/load/model_manager/task_info/label_set_task_info.cc"
+    "graph/load/model_manager/task_info/label_switch_by_index_task_info.cc"
+    "graph/load/model_manager/task_info/label_goto_ex_task_info.cc"
+    "graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc"
+    "graph/load/model_manager/task_info/memcpy_async_task_info.cc"
+    "graph/load/model_manager/task_info/profiler_trace_task_info.cc"
+    "graph/load/model_manager/task_info/stream_active_task_info.cc"
+    "graph/load/model_manager/task_info/stream_switch_task_info.cc"
+    "graph/load/model_manager/task_info/stream_switchn_task_info.cc"
+    "graph/load/model_manager/task_info/super_kernel/super_kernel.cc"
+    "graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc"
+    "graph/load/model_manager/task_info/task_info.cc"
+    "graph/load/model_manager/tbe_handle_store.cc"
+    "graph/load/model_manager/zero_copy_task.cc"
+    "graph/load/model_manager/zero_copy_offset.cc"
     "graph/manager/graph_context.cc"
     "graph/manager/graph_manager.cc"
     "graph/manager/graph_manager_utils.cc"
@@ -606,37 +606,37 @@ set(INFER_SRC_LIST
     "graph/manager/util/rt_context_util.cc"
     "graph/manager/util/variable_accelerate_ctrl.cc"
     "graph/manager/util/debug.cc"
-    "graph/load/new_model_manager/model_manager.cc"
-    "graph/load/new_model_manager/data_inputer.cc"
-    "graph/load/new_model_manager/davinci_model.cc"
-    "graph/load/new_model_manager/davinci_model_parser.cc"
-    "graph/load/new_model_manager/model_utils.cc"
-    "graph/load/new_model_manager/aipp_utils.cc"
-    "graph/load/new_model_manager/tbe_handle_store.cc"
-    "graph/load/new_model_manager/cpu_queue_schedule.cc"
-    "graph/load/new_model_manager/zero_copy_task.cc"
-    "graph/load/new_model_manager/zero_copy_offset.cc"
-    "graph/load/new_model_manager/data_dumper.cc"
-    "graph/load/new_model_manager/task_info/task_info.cc"
-    "graph/load/new_model_manager/task_info/event_record_task_info.cc"
-    "graph/load/new_model_manager/task_info/event_wait_task_info.cc"
-    "graph/load/new_model_manager/task_info/fusion_start_task_info.cc"
-    "graph/load/new_model_manager/task_info/fusion_stop_task_info.cc"
-    "graph/load/new_model_manager/task_info/kernel_ex_task_info.cc"
-    "graph/load/new_model_manager/task_info/kernel_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_set_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc"
-    "graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc"
-    "graph/load/new_model_manager/task_info/memcpy_async_task_info.cc"
-    "graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc"
-    "graph/load/new_model_manager/task_info/profiler_trace_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_active_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_switch_task_info.cc"
-    "graph/load/new_model_manager/task_info/stream_switchn_task_info.cc"
-    "graph/load/new_model_manager/task_info/end_graph_task_info.cc"
-    "graph/load/new_model_manager/task_info/model_exit_task_info.cc"
-    "graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc"
-    "graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc"
+    "graph/load/model_manager/model_manager.cc"
+    "graph/load/model_manager/data_inputer.cc"
+    "graph/load/model_manager/davinci_model.cc"
+    "graph/load/model_manager/davinci_model_parser.cc"
+    "graph/load/model_manager/model_utils.cc"
+    "graph/load/model_manager/aipp_utils.cc"
+    "graph/load/model_manager/tbe_handle_store.cc"
+    "graph/load/model_manager/cpu_queue_schedule.cc"
+    "graph/load/model_manager/zero_copy_task.cc"
+    "graph/load/model_manager/zero_copy_offset.cc"
+    "graph/load/model_manager/data_dumper.cc"
+    "graph/load/model_manager/task_info/task_info.cc"
+    "graph/load/model_manager/task_info/event_record_task_info.cc"
+    "graph/load/model_manager/task_info/event_wait_task_info.cc"
+    "graph/load/model_manager/task_info/fusion_start_task_info.cc"
+    "graph/load/model_manager/task_info/fusion_stop_task_info.cc"
+    "graph/load/model_manager/task_info/kernel_ex_task_info.cc"
+    "graph/load/model_manager/task_info/kernel_task_info.cc"
+    "graph/load/model_manager/task_info/label_set_task_info.cc"
+    "graph/load/model_manager/task_info/label_switch_by_index_task_info.cc"
+    "graph/load/model_manager/task_info/label_goto_ex_task_info.cc"
+    "graph/load/model_manager/task_info/memcpy_async_task_info.cc"
+    "graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc"
+    "graph/load/model_manager/task_info/profiler_trace_task_info.cc"
+    "graph/load/model_manager/task_info/stream_active_task_info.cc"
+    "graph/load/model_manager/task_info/stream_switch_task_info.cc"
+    "graph/load/model_manager/task_info/stream_switchn_task_info.cc"
+    "graph/load/model_manager/task_info/end_graph_task_info.cc"
+    "graph/load/model_manager/task_info/model_exit_task_info.cc"
+    "graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc"
+    "graph/load/model_manager/task_info/super_kernel/super_kernel.cc"
     "single_op/task/op_task.cc"
     "single_op/task/build_task_utils.cc"
     "single_op/task/tbe_task_builder.cc"

ge/common/helper/model_cache_helper.cc

@@ -28,7 +28,7 @@
 #include "framework/common/util.h"
 #include "graph/detail/attributes_holder.h"
 #include "graph/detail/model_serialize_imp.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
 #include "graph/model.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/common/helper/model_helper.cc

@@ -23,7 +23,7 @@
 #include "framework/common/debug/ge_log.h"
 #include "framework/omg/version.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/graph_utils.h"
 

ge/common/profiling/profiling_manager.cc

@@ -21,7 +21,7 @@
 #include "framework/common/string_util.h"
 #include "graph/ge_context.h"
 #include "runtime/base.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace {
 const char *const kTrainingTrace = "training_trace";

ge/executor/CMakeLists.txt

@@ -32,37 +32,37 @@ set(SRC_LIST
     "../hybrid/node_executor/aicpu/aicpu_ext_info.cc"
     "../model/ge_model.cc"
     "../model/ge_root_model.cc"
-    "../graph/load/new_model_manager/davinci_model.cc"
-    "../graph/load/new_model_manager/davinci_model_parser.cc"
-    "../graph/load/new_model_manager/model_manager.cc"
-    "../graph/load/new_model_manager/tbe_handle_store.cc"
-    "../graph/load/new_model_manager/cpu_queue_schedule.cc"
-    "../graph/load/new_model_manager/model_utils.cc"
-    "../graph/load/new_model_manager/aipp_utils.cc"
-    "../graph/load/new_model_manager/data_inputer.cc"
-    "../graph/load/new_model_manager/data_dumper.cc"
-    "../graph/load/new_model_manager/zero_copy_task.cc"
-    "../graph/load/new_model_manager/zero_copy_offset.cc"
-    "../graph/load/new_model_manager/task_info/task_info.cc"
-    "../graph/load/new_model_manager/task_info/event_record_task_info.cc"
-    "../graph/load/new_model_manager/task_info/event_wait_task_info.cc"
-    "../graph/load/new_model_manager/task_info/fusion_start_task_info.cc"
-    "../graph/load/new_model_manager/task_info/fusion_stop_task_info.cc"
-    "../graph/load/new_model_manager/task_info/kernel_ex_task_info.cc"
-    "../graph/load/new_model_manager/task_info/kernel_task_info.cc"
-    "../graph/load/new_model_manager/task_info/label_set_task_info.cc"
-    "../graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc"
-    "../graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc"
-    "../graph/load/new_model_manager/task_info/memcpy_async_task_info.cc"
-    "../graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc"
-    "../graph/load/new_model_manager/task_info/profiler_trace_task_info.cc"
-    "../graph/load/new_model_manager/task_info/stream_active_task_info.cc"
-    "../graph/load/new_model_manager/task_info/stream_switch_task_info.cc"
-    "../graph/load/new_model_manager/task_info/stream_switchn_task_info.cc"
-    "../graph/load/new_model_manager/task_info/end_graph_task_info.cc"
-    "../graph/load/new_model_manager/task_info/model_exit_task_info.cc"
-    "../graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc"
-    "../graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc"
+    "../graph/load/model_manager/davinci_model.cc"
+    "../graph/load/model_manager/davinci_model_parser.cc"
+    "../graph/load/model_manager/model_manager.cc"
+    "../graph/load/model_manager/tbe_handle_store.cc"
+    "../graph/load/model_manager/cpu_queue_schedule.cc"
+    "../graph/load/model_manager/model_utils.cc"
+    "../graph/load/model_manager/aipp_utils.cc"
+    "../graph/load/model_manager/data_inputer.cc"
+    "../graph/load/model_manager/data_dumper.cc"
+    "../graph/load/model_manager/zero_copy_task.cc"
+    "../graph/load/model_manager/zero_copy_offset.cc"
+    "../graph/load/model_manager/task_info/task_info.cc"
+    "../graph/load/model_manager/task_info/event_record_task_info.cc"
+    "../graph/load/model_manager/task_info/event_wait_task_info.cc"
+    "../graph/load/model_manager/task_info/fusion_start_task_info.cc"
+    "../graph/load/model_manager/task_info/fusion_stop_task_info.cc"
+    "../graph/load/model_manager/task_info/kernel_ex_task_info.cc"
+    "../graph/load/model_manager/task_info/kernel_task_info.cc"
+    "../graph/load/model_manager/task_info/label_set_task_info.cc"
+    "../graph/load/model_manager/task_info/label_switch_by_index_task_info.cc"
+    "../graph/load/model_manager/task_info/label_goto_ex_task_info.cc"
+    "../graph/load/model_manager/task_info/memcpy_async_task_info.cc"
+    "../graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc"
+    "../graph/load/model_manager/task_info/profiler_trace_task_info.cc"
+    "../graph/load/model_manager/task_info/stream_active_task_info.cc"
+    "../graph/load/model_manager/task_info/stream_switch_task_info.cc"
+    "../graph/load/model_manager/task_info/stream_switchn_task_info.cc"
+    "../graph/load/model_manager/task_info/end_graph_task_info.cc"
+    "../graph/load/model_manager/task_info/model_exit_task_info.cc"
+    "../graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc"
+    "../graph/load/model_manager/task_info/super_kernel/super_kernel.cc"
     "../graph/common/local_context.cc"
     "../opskernel_manager/ops_kernel_builder_manager.cc"
     "../single_op/single_op_manager.cc"

ge/executor/ge_executor.cc

@@ -29,15 +29,15 @@
 #include "framework/common/util.h"
 #include "graph/execute/graph_execute.h"
 #include "graph/load/graph_loader.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/graph_mem_allocator.h"
 #include "graph/model.h"
 #include "graph/utils/graph_utils.h"
 #include "mmpa/mmpa_api.h"
 #include "single_op/single_op_manager.h"
 #include "graph/manager/graph_var_manager.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 #include "opskernel_manager/ops_kernel_builder_manager.h"
 
 using std::string;

ge/executor/module.mk

@@ -22,37 +22,37 @@ local_ge_executor_src_files :=  \
     ../graph/manager/util/debug.cc \
     ../model/ge_model.cc \
     ../model/ge_root_model.cc \
-    ../graph/load/new_model_manager/davinci_model.cc \
-    ../graph/load/new_model_manager/davinci_model_parser.cc \
-    ../graph/load/new_model_manager/model_manager.cc \
-    ../graph/load/new_model_manager/tbe_handle_store.cc \
-    ../graph/load/new_model_manager/cpu_queue_schedule.cc \
-    ../graph/load/new_model_manager/model_utils.cc \
-    ../graph/load/new_model_manager/aipp_utils.cc \
-    ../graph/load/new_model_manager/data_inputer.cc \
-    ../graph/load/new_model_manager/data_dumper.cc \
-    ../graph/load/new_model_manager/zero_copy_task.cc \
-    ../graph/load/new_model_manager/zero_copy_offset.cc \
-    ../graph/load/new_model_manager/task_info/task_info.cc                  \
-    ../graph/load/new_model_manager/task_info/event_record_task_info.cc     \
-    ../graph/load/new_model_manager/task_info/event_wait_task_info.cc       \
-    ../graph/load/new_model_manager/task_info/fusion_start_task_info.cc     \
-    ../graph/load/new_model_manager/task_info/fusion_stop_task_info.cc      \
-    ../graph/load/new_model_manager/task_info/kernel_ex_task_info.cc        \
-    ../graph/load/new_model_manager/task_info/kernel_task_info.cc           \
-    ../graph/load/new_model_manager/task_info/label_set_task_info.cc        \
-    ../graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc \
-    ../graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc    \
-    ../graph/load/new_model_manager/task_info/memcpy_async_task_info.cc     \
-    ../graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc \
-    ../graph/load/new_model_manager/task_info/profiler_trace_task_info.cc   \
-    ../graph/load/new_model_manager/task_info/stream_active_task_info.cc    \
-    ../graph/load/new_model_manager/task_info/stream_switch_task_info.cc    \
-    ../graph/load/new_model_manager/task_info/stream_switchn_task_info.cc   \
-    ../graph/load/new_model_manager/task_info/end_graph_task_info.cc        \
-    ../graph/load/new_model_manager/task_info/model_exit_task_info.cc       \
-    ../graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc   \
-    ../graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc  \
+    ../graph/load/model_manager/davinci_model.cc \
+    ../graph/load/model_manager/davinci_model_parser.cc \
+    ../graph/load/model_manager/model_manager.cc \
+    ../graph/load/model_manager/tbe_handle_store.cc \
+    ../graph/load/model_manager/cpu_queue_schedule.cc \
+    ../graph/load/model_manager/model_utils.cc \
+    ../graph/load/model_manager/aipp_utils.cc \
+    ../graph/load/model_manager/data_inputer.cc \
+    ../graph/load/model_manager/data_dumper.cc \
+    ../graph/load/model_manager/zero_copy_task.cc \
+    ../graph/load/model_manager/zero_copy_offset.cc \
+    ../graph/load/model_manager/task_info/task_info.cc                  \
+    ../graph/load/model_manager/task_info/event_record_task_info.cc     \
+    ../graph/load/model_manager/task_info/event_wait_task_info.cc       \
+    ../graph/load/model_manager/task_info/fusion_start_task_info.cc     \
+    ../graph/load/model_manager/task_info/fusion_stop_task_info.cc      \
+    ../graph/load/model_manager/task_info/kernel_ex_task_info.cc        \
+    ../graph/load/model_manager/task_info/kernel_task_info.cc           \
+    ../graph/load/model_manager/task_info/label_set_task_info.cc        \
+    ../graph/load/model_manager/task_info/label_switch_by_index_task_info.cc \
+    ../graph/load/model_manager/task_info/label_goto_ex_task_info.cc    \
+    ../graph/load/model_manager/task_info/memcpy_async_task_info.cc     \
+    ../graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc \
+    ../graph/load/model_manager/task_info/profiler_trace_task_info.cc   \
+    ../graph/load/model_manager/task_info/stream_active_task_info.cc    \
+    ../graph/load/model_manager/task_info/stream_switch_task_info.cc    \
+    ../graph/load/model_manager/task_info/stream_switchn_task_info.cc   \
+    ../graph/load/model_manager/task_info/end_graph_task_info.cc        \
+    ../graph/load/model_manager/task_info/model_exit_task_info.cc       \
+    ../graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc   \
+    ../graph/load/model_manager/task_info/super_kernel/super_kernel.cc  \
     ../opskernel_manager/ops_kernel_builder_manager.cc \
     ../single_op/single_op_manager.cc \
     ../single_op/single_op_model.cc \

ge/ge_inference.mk

@@ -228,37 +228,37 @@ OME_HOST_SRC_FILES := \
     graph/manager/util/rt_context_util.cc               \
     graph/manager/util/variable_accelerate_ctrl.cc       \
     graph/manager/util/debug.cc  \
-    graph/load/new_model_manager/model_manager.cc                        \
-    graph/load/new_model_manager/data_inputer.cc                         \
-    graph/load/new_model_manager/davinci_model.cc                        \
-    graph/load/new_model_manager/davinci_model_parser.cc                 \
-    graph/load/new_model_manager/model_utils.cc                          \
-    graph/load/new_model_manager/aipp_utils.cc                           \
-    graph/load/new_model_manager/tbe_handle_store.cc                     \
-    graph/load/new_model_manager/cpu_queue_schedule.cc                   \
-    graph/load/new_model_manager/zero_copy_task.cc                       \
-    graph/load/new_model_manager/zero_copy_offset.cc                     \
-    graph/load/new_model_manager/data_dumper.cc                          \
-    graph/load/new_model_manager/task_info/task_info.cc                  \
-    graph/load/new_model_manager/task_info/event_record_task_info.cc     \
-    graph/load/new_model_manager/task_info/event_wait_task_info.cc       \
-    graph/load/new_model_manager/task_info/fusion_start_task_info.cc     \
-    graph/load/new_model_manager/task_info/fusion_stop_task_info.cc      \
-    graph/load/new_model_manager/task_info/kernel_ex_task_info.cc        \
-    graph/load/new_model_manager/task_info/kernel_task_info.cc           \
-    graph/load/new_model_manager/task_info/label_set_task_info.cc        \
-    graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc \
-    graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc    \
-    graph/load/new_model_manager/task_info/memcpy_async_task_info.cc     \
-    graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc \
-    graph/load/new_model_manager/task_info/profiler_trace_task_info.cc   \
-    graph/load/new_model_manager/task_info/stream_active_task_info.cc    \
-    graph/load/new_model_manager/task_info/stream_switch_task_info.cc    \
-    graph/load/new_model_manager/task_info/stream_switchn_task_info.cc   \
-    graph/load/new_model_manager/task_info/end_graph_task_info.cc        \
-    graph/load/new_model_manager/task_info/model_exit_task_info.cc       \
-    graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc   \
-    graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc  \
+    graph/load/model_manager/model_manager.cc                        \
+    graph/load/model_manager/data_inputer.cc                         \
+    graph/load/model_manager/davinci_model.cc                        \
+    graph/load/model_manager/davinci_model_parser.cc                 \
+    graph/load/model_manager/model_utils.cc                          \
+    graph/load/model_manager/aipp_utils.cc                           \
+    graph/load/model_manager/tbe_handle_store.cc                     \
+    graph/load/model_manager/cpu_queue_schedule.cc                   \
+    graph/load/model_manager/zero_copy_task.cc                       \
+    graph/load/model_manager/zero_copy_offset.cc                     \
+    graph/load/model_manager/data_dumper.cc                          \
+    graph/load/model_manager/task_info/task_info.cc                  \
+    graph/load/model_manager/task_info/event_record_task_info.cc     \
+    graph/load/model_manager/task_info/event_wait_task_info.cc       \
+    graph/load/model_manager/task_info/fusion_start_task_info.cc     \
+    graph/load/model_manager/task_info/fusion_stop_task_info.cc      \
+    graph/load/model_manager/task_info/kernel_ex_task_info.cc        \
+    graph/load/model_manager/task_info/kernel_task_info.cc           \
+    graph/load/model_manager/task_info/label_set_task_info.cc        \
+    graph/load/model_manager/task_info/label_switch_by_index_task_info.cc \
+    graph/load/model_manager/task_info/label_goto_ex_task_info.cc    \
+    graph/load/model_manager/task_info/memcpy_async_task_info.cc     \
+    graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc \
+    graph/load/model_manager/task_info/profiler_trace_task_info.cc   \
+    graph/load/model_manager/task_info/stream_active_task_info.cc    \
+    graph/load/model_manager/task_info/stream_switch_task_info.cc    \
+    graph/load/model_manager/task_info/stream_switchn_task_info.cc   \
+    graph/load/model_manager/task_info/end_graph_task_info.cc        \
+    graph/load/model_manager/task_info/model_exit_task_info.cc       \
+    graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc   \
+    graph/load/model_manager/task_info/super_kernel/super_kernel.cc  \
     single_op/task/op_task.cc                                            \
     single_op/task/build_task_utils.cc                                   \
     single_op/task/tbe_task_builder.cc                                   \
@@ -270,7 +270,7 @@ OME_HOST_SRC_FILES := \
     single_op/single_op_manager.cc                                       \
     hybrid/hybrid_davinci_model_stub.cc                                  \
     hybrid/node_executor/aicpu/aicpu_ext_info.cc                         \
-    # graph/load/new_model_manager/task_info/hccl_task_info.cc
+    # graph/load/model_manager/task_info/hccl_task_info.cc
 
 OME_DEVICE_SRC_FILES := $(OME_HOST_SRC_FILES)
 

ge/ge_runner.mk

@@ -54,38 +54,38 @@ LIBGE_LOCAL_SRC_FILES := \
     graph/label/partitioned_call_label_maker.cc \
     graph/label/while_label_maker.cc \
     graph/load/graph_loader.cc \
-    graph/load/new_model_manager/cpu_queue_schedule.cc \
-    graph/load/new_model_manager/data_dumper.cc \
-    graph/load/new_model_manager/data_inputer.cc \
-    graph/load/new_model_manager/davinci_model.cc \
-    graph/load/new_model_manager/davinci_model_parser.cc \
-    graph/load/new_model_manager/model_manager.cc \
-    graph/load/new_model_manager/model_utils.cc \
-    graph/load/new_model_manager/aipp_utils.cc \
-    graph/load/new_model_manager/task_info/end_graph_task_info.cc \
-    graph/load/new_model_manager/task_info/model_exit_task_info.cc \
-    graph/load/new_model_manager/task_info/event_record_task_info.cc \
-    graph/load/new_model_manager/task_info/event_wait_task_info.cc \
-    graph/load/new_model_manager/task_info/fusion_start_task_info.cc \
-    graph/load/new_model_manager/task_info/fusion_stop_task_info.cc \
-    graph/load/new_model_manager/task_info/hccl_task_info.cc \
-    graph/load/new_model_manager/task_info/kernel_ex_task_info.cc \
-    graph/load/new_model_manager/task_info/kernel_task_info.cc \
-    graph/load/new_model_manager/task_info/label_set_task_info.cc \
-    graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc \
-    graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc \
-    graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc \
-    graph/load/new_model_manager/task_info/memcpy_async_task_info.cc \
-    graph/load/new_model_manager/task_info/profiler_trace_task_info.cc \
-    graph/load/new_model_manager/task_info/stream_active_task_info.cc \
-    graph/load/new_model_manager/task_info/stream_switch_task_info.cc \
-    graph/load/new_model_manager/task_info/stream_switchn_task_info.cc \
-    graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc \
-    graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc   \
-    graph/load/new_model_manager/task_info/task_info.cc \
-    graph/load/new_model_manager/tbe_handle_store.cc \
-    graph/load/new_model_manager/zero_copy_task.cc \
-    graph/load/new_model_manager/zero_copy_offset.cc    \
+    graph/load/model_manager/cpu_queue_schedule.cc \
+    graph/load/model_manager/data_dumper.cc \
+    graph/load/model_manager/data_inputer.cc \
+    graph/load/model_manager/davinci_model.cc \
+    graph/load/model_manager/davinci_model_parser.cc \
+    graph/load/model_manager/model_manager.cc \
+    graph/load/model_manager/model_utils.cc \
+    graph/load/model_manager/aipp_utils.cc \
+    graph/load/model_manager/task_info/end_graph_task_info.cc \
+    graph/load/model_manager/task_info/model_exit_task_info.cc \
+    graph/load/model_manager/task_info/event_record_task_info.cc \
+    graph/load/model_manager/task_info/event_wait_task_info.cc \
+    graph/load/model_manager/task_info/fusion_start_task_info.cc \
+    graph/load/model_manager/task_info/fusion_stop_task_info.cc \
+    graph/load/model_manager/task_info/hccl_task_info.cc \
+    graph/load/model_manager/task_info/kernel_ex_task_info.cc \
+    graph/load/model_manager/task_info/kernel_task_info.cc \
+    graph/load/model_manager/task_info/label_set_task_info.cc \
+    graph/load/model_manager/task_info/label_switch_by_index_task_info.cc \
+    graph/load/model_manager/task_info/label_goto_ex_task_info.cc \
+    graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc \
+    graph/load/model_manager/task_info/memcpy_async_task_info.cc \
+    graph/load/model_manager/task_info/profiler_trace_task_info.cc \
+    graph/load/model_manager/task_info/stream_active_task_info.cc \
+    graph/load/model_manager/task_info/stream_switch_task_info.cc \
+    graph/load/model_manager/task_info/stream_switchn_task_info.cc \
+    graph/load/model_manager/task_info/super_kernel/super_kernel.cc \
+    graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc   \
+    graph/load/model_manager/task_info/task_info.cc \
+    graph/load/model_manager/tbe_handle_store.cc \
+    graph/load/model_manager/zero_copy_task.cc \
+    graph/load/model_manager/zero_copy_offset.cc    \
     graph/manager/graph_context.cc \
     graph/manager/graph_manager.cc \
     graph/manager/graph_manager_utils.cc \

ge/graph/execute/graph_execute.cc

@@ -21,7 +21,7 @@
 
 #include "common/ge_inner_error_codes.h"
 #include "common/model_parser/base.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "omm/csa_interact.h"
 #include "runtime/dev.h"
 #include "runtime/mem.h"

ge/graph/load/graph_loader.cc

@@ -22,8 +22,8 @@
 #include "common/helper/model_helper.h"
 #include "common/util.h"
 #include "graph/ge_context.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/graph_var_manager.h"
 #include "omm/csa_interact.h"
 #include "runtime/dev.h"

ge/graph/load/new_model_manager/aipp_utils.cc → ge/graph/load/model_manager/aipp_utils.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/aipp_utils.h"
+#include "graph/load/model_manager/aipp_utils.h"
 
 #include <string>
 

ge/graph/load/new_model_manager/cpu_queue_schedule.cc → ge/graph/load/model_manager/cpu_queue_schedule.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/cpu_queue_schedule.h"
+#include "graph/load/model_manager/cpu_queue_schedule.h"
 #include "common/debug/ge_log.h"
 #include "common/debug/log.h"
 

ge/graph/load/new_model_manager/cpu_queue_schedule.h → ge/graph/load/model_manager/cpu_queue_schedule.h

@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "common/ge_inner_error_codes.h"
-#include "graph/load/new_model_manager/task_info/task_info.h"
-#include "graph/load/new_model_manager/zero_copy_offset.h"
+#include "graph/load/model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/zero_copy_offset.h"
 #include "runtime/kernel.h"
 
 namespace ge {

ge/graph/load/new_model_manager/data_dumper.cc → ge/graph/load/model_manager/data_dumper.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/data_dumper.h"
+#include "graph/load/model_manager/data_dumper.h"
 
 #include <cstdlib>
 #include <ctime>
@@ -29,7 +29,7 @@
 #include "framework/common/util.h"
 #include "graph/anchor.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/manager/util/debug.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/graph/load/new_model_manager/data_inputer.cc → ge/graph/load/model_manager/data_inputer.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/data_inputer.h"
+#include "graph/load/model_manager/data_inputer.h"
 
 #include <securec.h>
 

ge/graph/load/new_model_manager/davinci_model.cc → ge/graph/load/model_manager/davinci_model.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 #include <graph/utils/node_utils.h>
 #include <algorithm>
@@ -36,9 +36,9 @@
 #include "graph/debug/ge_attr_define.h"
 #include "graph/ge_context.h"
 #include "graph/graph.h"
-#include "graph/load/new_model_manager/cpu_queue_schedule.h"
-#include "graph/load/new_model_manager/model_manager.h"
-#include "graph/load/new_model_manager/tbe_handle_store.h"
+#include "graph/load/model_manager/cpu_queue_schedule.h"
+#include "graph/load/model_manager/model_manager.h"
+#include "graph/load/model_manager/tbe_handle_store.h"
 #include "graph/manager/graph_mem_allocator.h"
 #include "graph/manager/graph_var_manager.h"
 #include "graph/manager/trans_var_data_utils.h"

ge/graph/load/new_model_manager/davinci_model.h → ge/graph/load/model_manager/davinci_model.h

@@ -32,12 +32,12 @@
 #include "common/types.h"
 #include "framework/common/util.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/aipp_utils.h"
-#include "graph/load/new_model_manager/data_dumper.h"
-#include "graph/load/new_model_manager/data_inputer.h"
-#include "graph/load/new_model_manager/model_utils.h"
-#include "graph/load/new_model_manager/zero_copy_offset.h"
-#include "graph/load/new_model_manager/zero_copy_task.h"
+#include "graph/load/model_manager/aipp_utils.h"
+#include "graph/load/model_manager/data_dumper.h"
+#include "graph/load/model_manager/data_inputer.h"
+#include "graph/load/model_manager/model_utils.h"
+#include "graph/load/model_manager/zero_copy_offset.h"
+#include "graph/load/model_manager/zero_copy_task.h"
 #include "graph/model.h"
 #include "graph/node.h"
 #include "graph/op_desc.h"

ge/graph/load/new_model_manager/davinci_model_parser.cc → ge/graph/load/model_manager/davinci_model_parser.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
 
 namespace ge {
 DavinciModelParser::DavinciModelParser() {}

ge/graph/load/new_model_manager/model_manager.cc → ge/graph/load/model_manager/model_manager.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 
 #include <string>
 
@@ -28,8 +28,8 @@
 #include "framework/common/util.h"
 #include "graph/common/ge_call_wrapper.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
 #include "model/ge_root_model.h"
 #include "graph/common/local_context.h"
 #include "graph/utils/attr_utils.h"

ge/graph/load/new_model_manager/model_utils.cc → ge/graph/load/model_manager/model_utils.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include <string>
 #include "common/debug/log.h"
 #include "common/op/ge_op_utils.h"

ge/graph/load/new_model_manager/model_utils.h → ge/graph/load/model_manager/model_utils.h

@@ -21,7 +21,7 @@
 
 #include "common/ge_inner_error_codes.h"
 #include "common/types.h"
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 #include "graph/utils/tensor_adapter.h"
 

ge/graph/load/new_model_manager/task_info/end_graph_task_info.cc → ge/graph/load/model_manager/task_info/end_graph_task_info.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/end_graph_task_info.h"
+#include "graph/load/model_manager/task_info/end_graph_task_info.h"
 
 #include "common/properties_manager.h"
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace {
 const uint32_t kDumpFlag = 2;

ge/graph/load/new_model_manager/task_info/end_graph_task_info.h → ge/graph/load/model_manager/task_info/end_graph_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_END_GRAPH_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_END_GRAPH_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class EndGraphTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/event_record_task_info.cc → ge/graph/load/model_manager/task_info/event_record_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/event_record_task_info.h"
+#include "graph/load/model_manager/task_info/event_record_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status EventRecordTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/event_record_task_info.h → ge/graph/load/model_manager/task_info/event_record_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_EVENT_RECORD_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_EVENT_RECORD_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class EventRecordTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/event_wait_task_info.cc → ge/graph/load/model_manager/task_info/event_wait_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/event_wait_task_info.h"
+#include "graph/load/model_manager/task_info/event_wait_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status EventWaitTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/event_wait_task_info.h → ge/graph/load/model_manager/task_info/event_wait_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_EVENT_WAIT_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_EVENT_WAIT_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class EventWaitTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/fusion_start_task_info.cc → ge/graph/load/model_manager/task_info/fusion_start_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/fusion_start_task_info.h"
+#include "graph/load/model_manager/task_info/fusion_start_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status FusionStartTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/fusion_start_task_info.h → ge/graph/load/model_manager/task_info/fusion_start_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_FUSION_START_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_FUSION_START_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class FusionStartTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.cc → ge/graph/load/model_manager/task_info/fusion_stop_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/fusion_stop_task_info.h"
+#include "graph/load/model_manager/task_info/fusion_stop_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status FusionStopTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.h → ge/graph/load/model_manager/task_info/fusion_stop_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_FUSION_STOP_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_FUSION_STOP_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class FusionStopTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/hccl_task_info.cc → ge/graph/load/model_manager/task_info/hccl_task_info.cc

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/hccl_task_info.h"
+#include "graph/load/model_manager/task_info/hccl_task_info.h"
 
 #include <utility>
 
 #include "common/opskernel/ops_kernel_info_store.h"
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/model_utils.h"
 
 namespace ge {
 std::mutex HcclTaskInfo::hccl_follow_stream_mutex_;

ge/graph/load/new_model_manager/task_info/hccl_task_info.h → ge/graph/load/model_manager/task_info/hccl_task_info.h

@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "common/opskernel/ge_task_info.h"
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/manager/util/hcom_util.h"
 namespace ge {
 class HcclTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc → ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/kernel_ex_task_info.h"
+#include "graph/load/model_manager/task_info/kernel_ex_task_info.h"
 
 #include <vector>
 
@@ -24,8 +24,8 @@
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/fmk_error_codes.h"
 #include "graph/attr_value.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/model_manager.h"
 
 namespace ge {
 Status KernelExTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.h → ge/graph/load/model_manager/task_info/kernel_ex_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_KERNEL_EX_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_KERNEL_EX_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/kernel_task_info.cc → ge/graph/load/model_manager/task_info/kernel_task_info.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/kernel_task_info.h"
+#include "graph/load/model_manager/task_info/kernel_task_info.h"
 #include <map>
 #include <memory>
 #include <string>
@@ -25,9 +25,9 @@
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/l2_cache_optimize.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/model_manager.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/model_manager.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "runtime/kernel.h"
 #include "super_kernel/super_kernel.h"
 #include "super_kernel/super_kernel_factory.h"

ge/graph/load/new_model_manager/task_info/kernel_task_info.h → ge/graph/load/model_manager/task_info/kernel_task_info.h

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 namespace ge {
 class KernelTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc → ge/graph/load/model_manager/task_info/label_goto_ex_task_info.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/label_goto_ex_task_info.h"
+#include "graph/load/model_manager/task_info/label_goto_ex_task_info.h"
 
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 #include "graph/debug/ge_attr_define.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.h → ge/graph/load/model_manager/task_info/label_goto_ex_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_GOTO_EX_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_GOTO_EX_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class LabelGotoExTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/label_set_task_info.cc → ge/graph/load/model_manager/task_info/label_set_task_info.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/label_set_task_info.h"
+#include "graph/load/model_manager/task_info/label_set_task_info.h"
 
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 #include "graph/debug/ge_attr_define.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/label_set_task_info.h → ge/graph/load/model_manager/task_info/label_set_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_SET_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_SET_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class LabelSetTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc → ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/label_switch_by_index_task_info.h"
+#include "graph/load/model_manager/task_info/label_switch_by_index_task_info.h"
 
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 constexpr uint8_t kLabelSwitchIndexNum = 1;

ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.h → ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_SWITCH_BY_INDEX_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_LABEL_SWITCH_BY_INDEX_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class LabelSwitchByIndexTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc → ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h"
+#include "graph/load/model_manager/task_info/memcpy_addr_async_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace {
 const uint32_t kAlignBytes = 64;

ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h → ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MEMCPY_ADDR_ASYNC_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MEMCPY_ADDR_ASYNC_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class MemcpyAddrAsyncTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc → ge/graph/load/model_manager/task_info/memcpy_async_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/memcpy_async_task_info.h"
+#include "graph/load/model_manager/task_info/memcpy_async_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status MemcpyAsyncTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.h → ge/graph/load/model_manager/task_info/memcpy_async_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MEMCPY_ASYNC_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MEMCPY_ASYNC_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/model_exit_task_info.cc → ge/graph/load/model_manager/task_info/model_exit_task_info.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/model_exit_task_info.h"
+#include "graph/load/model_manager/task_info/model_exit_task_info.h"
 
 #include "common/properties_manager.h"
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status ModelExitTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/model_exit_task_info.h → ge/graph/load/model_manager/task_info/model_exit_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MODEL_EXIT_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_MODEL_EXIT_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class ModelExitTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc → ge/graph/load/model_manager/task_info/profiler_trace_task_info.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/profiler_trace_task_info.h"
+#include "graph/load/model_manager/task_info/profiler_trace_task_info.h"
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 Status ProfilerTraceTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_model) {

ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.h → ge/graph/load/model_manager/task_info/profiler_trace_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_PROFILER_TRACE_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_PROFILER_TRACE_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class ProfilerTraceTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc → ge/graph/load/model_manager/task_info/stream_active_task_info.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/stream_active_task_info.h"
+#include "graph/load/model_manager/task_info/stream_active_task_info.h"
 
 #include <vector>
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 #include "graph/debug/ge_attr_define.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/stream_active_task_info.h → ge/graph/load/model_manager/task_info/stream_active_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_ACTIVE_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_ACTIVE_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class StreamActiveTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/stream_switch_task_info.cc → ge/graph/load/model_manager/task_info/stream_switch_task_info.cc

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/stream_switch_task_info.h"
+#include "graph/load/model_manager/task_info/stream_switch_task_info.h"
 
 #include <vector>
 
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/debug/ge_attr_define.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/stream_switch_task_info.h → ge/graph/load/model_manager/task_info/stream_switch_task_info.h

@@ -16,7 +16,7 @@
 
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_SWITCH_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_SWITCH_TASK_INFO_H_
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 namespace ge {
 class StreamSwitchTaskInfo : public TaskInfo {

ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.cc → ge/graph/load/model_manager/task_info/stream_switchn_task_info.cc

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "graph/load/new_model_manager/task_info/stream_switchn_task_info.h"
+#include "graph/load/model_manager/task_info/stream_switchn_task_info.h"
 #include <vector>
 #include "framework/common/debug/ge_log.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/davinci_model.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/davinci_model.h"
+#include "graph/load/model_manager/model_utils.h"
 
 namespace {
 const uint8_t kStreamSwitchnInputNum = 1;

ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.h → ge/graph/load/model_manager/task_info/stream_switchn_task_info.h

@@ -17,7 +17,7 @@
 #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_SWITCHN_TASK_INFO_H_
 #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_TASK_INFO_STREAM_SWITCHN_TASK_INFO_H_
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/op_desc.h"
 
 namespace ge {

ge/graph/load/new_model_manager/task_info/task_info.cc → ge/graph/load/model_manager/task_info/task_info.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 
 #include <vector>
 

ge/graph/load/new_model_manager/task_info/task_info.h → ge/graph/load/model_manager/task_info/task_info.h

@@ -22,8 +22,8 @@
 #include "cce/customize.h"
 #include "framework/common/taskdown_common.h"
 #include "framework/common/ge_inner_error_codes.h"
-#include "graph/load/new_model_manager/ts_mem_mall.h"
-#include "graph/load/new_model_manager/task_info/task_info_factory.h"
+#include "graph/load/model_manager/ts_mem_mall.h"
+#include "graph/load/model_manager/task_info/task_info_factory.h"
 #include "proto/task.pb.h"
 
 namespace ge {

ge/graph/load/new_model_manager/zero_copy_offset.cc → ge/graph/load/model_manager/zero_copy_offset.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/zero_copy_offset.h"
+#include "graph/load/model_manager/zero_copy_offset.h"
 
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/util.h"
-#include "graph/load/new_model_manager/model_utils.h"
-#include "graph/load/new_model_manager/zero_copy_task.h"
+#include "graph/load/model_manager/model_utils.h"
+#include "graph/load/model_manager/zero_copy_task.h"
 
 namespace ge {
 namespace {

ge/graph/load/new_model_manager/zero_copy_offset.h → ge/graph/load/model_manager/zero_copy_offset.h

@@ -25,7 +25,7 @@
 #include "external/ge/ge_api_error_codes.h"
 #include "framework/common/ge_types.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/zero_copy_task.h"
+#include "graph/load/model_manager/zero_copy_task.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "runtime/mem.h"

ge/graph/load/new_model_manager/zero_copy_task.cc → ge/graph/load/model_manager/zero_copy_task.cc

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "graph/load/new_model_manager/zero_copy_task.h"
+#include "graph/load/model_manager/zero_copy_task.h"
 
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/util.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "common/ge_compiler_options.h"
 
 namespace ge {

ge/hybrid/executor/hybrid_model_async_executor.cc

@@ -15,7 +15,7 @@
  */
 
 #include "hybrid/executor/hybrid_model_async_executor.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "graph/utils/type_utils.h"
 #include "graph/ge_context.h"

ge/hybrid/executor/hybrid_model_async_executor.h

@@ -21,7 +21,7 @@
 #include <future>
 #include "external/ge/ge_api_error_codes.h"
 #include "external/ge/ge_api_types.h"
-#include "graph/load/new_model_manager/data_inputer.h"
+#include "graph/load/model_manager/data_inputer.h"
 #include "hybrid/executor/hybrid_model_executor.h"
 #include "runtime/stream.h"
 

ge/hybrid/executor/hybrid_model_executor.h

@@ -17,7 +17,7 @@
 #ifndef GE_HYBRID_EXECUTOR_HYBRID_MODEL_EXECUTOR_H_
 #define GE_HYBRID_EXECUTOR_HYBRID_MODEL_EXECUTOR_H_
 #include "common/thread_pool.h"
-#include "graph/load/new_model_manager/data_inputer.h"
+#include "graph/load/model_manager/data_inputer.h"
 #include "hybrid/executor/hybrid_execution_context.h"
 #include "hybrid/executor/rt_callback_manager.h"
 #include "hybrid/executor/subgraph_executor.h"

ge/hybrid/hybrid_davinci_model.h

@@ -19,7 +19,7 @@
 
 #include <memory>
 #include "external/ge/ge_api_error_codes.h"
-#include "graph/load/new_model_manager/data_inputer.h"
+#include "graph/load/model_manager/data_inputer.h"
 #include "model/ge_root_model.h"
 
 namespace ge {

ge/hybrid/model/hybrid_model.cc

@@ -17,7 +17,7 @@
 #include "hybrid_model.h"
 #include <vector>
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/node_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/hybrid/model/hybrid_model.h

@@ -21,8 +21,8 @@
 #include <queue>
 #include <memory>
 #include "framework/common/ge_inner_error_codes.h"
-#include "graph/load/new_model_manager/data_inputer.h"
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/data_inputer.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/node.h"
 #include "hybrid/common/tensor_value.h"
 #include "hybrid/model/node_item.h"

ge/hybrid/model/hybrid_model_builder.cc

@@ -20,8 +20,8 @@
 #include "graph/ge_context.h"
 #include "graph/build/memory/var_mem_assign_util.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_utils.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/graph_var_manager.h"
 #include "graph/manager/host_mem_manager.h"
 #include "graph/manager/trans_var_data_utils.h"

ge/hybrid/model/hybrid_model_builder.h

@@ -21,7 +21,7 @@
 #include <queue>
 #include <memory>
 #include "framework/common/ge_inner_error_codes.h"
-#include "graph/load/new_model_manager/task_info/task_info.h"
+#include "graph/load/model_manager/task_info/task_info.h"
 #include "graph/node.h"
 #include "hybrid/model/hybrid_model.h"
 #include "hybrid/model/node_item.h"

ge/hybrid/node_executor/aicore/aicore_op_task.cc

@@ -19,7 +19,7 @@
 #include "framework/common/debug/log.h"
 #include "hybrid/executor/hybrid_execution_context.h"
 #include "hybrid/node_executor/aicore/aicore_task_builder.h"
-#include "graph/load/new_model_manager/tbe_handle_store.h"
+#include "graph/load/model_manager/tbe_handle_store.h"
 #include "graph/types.h"
 
 using optiling::OpRunInfo;

ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc

@@ -18,7 +18,7 @@
 #include "framework/common/taskdown_common.h"
 #include "common/formats/formats.h"
 #include "aicpu/common/aicpu_task_struct.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/utils/node_utils.h"
 #include "hybrid/executor/hybrid_execution_context.h"
 #include "hybrid/model/hybrid_model.h"

ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc

@@ -21,8 +21,8 @@
 #include "common/ge/ge_util.h"
 #include "graph/attr_value.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_utils.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "hybrid/executor/hybrid_execution_context.h"
 
 namespace ge {

ge/hybrid/node_executor/compiledsubgraph/known_node_executor.h

@@ -19,7 +19,7 @@
 #include "hybrid/node_executor/node_executor.h"
 #include "hybrid/model/hybrid_model.h"
 #include "graph/op_desc.h"
-#include "graph/load/new_model_manager/davinci_model.h"
+#include "graph/load/model_manager/davinci_model.h"
 
 namespace ge {
 namespace hybrid {

ge/init/gelib.cc

@@ -37,7 +37,7 @@
 #include "graph/common/ge_call_wrapper.h"
 #include "graph/ge_context.h"
 #include "graph/ge_global_options.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/graph_mem_allocator.h"
 #include "graph/manager/host_mem_manager.h"
 #include "graph/manager/graph_var_manager.h"

ge/session/inner_session.cc

@@ -29,7 +29,7 @@
 #include "graph/ge_global_options.h"
 #include "graph/ge_local_context.h"
 #include "graph/common/local_context.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/graph_var_manager.h"
 #include "graph/utils/tensor_adapter.h"
 #include "runtime/mem.h"

ge/session/session_manager.cc

@@ -20,7 +20,7 @@
 #include "common/ge/ge_util.h"
 #include "framework/common/debug/ge_log.h"
 #include "graph/ge_context.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "graph/manager/util/rt_context_util.h"
 
 using std::map;

ge/single_op/single_op.cc

@@ -22,11 +22,11 @@
 #include "common/profiling/profiling_manager.h"
 #include "framework/common/debug/ge_log.h"
 #include "framework/common/util.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "runtime/mem.h"
 #include "single_op/single_op_manager.h"
 #include "single_op/task/build_task_utils.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 
 namespace ge {
 namespace {

ge/single_op/single_op_model.cc

@@ -23,7 +23,7 @@
 
 #include "framework/common/debug/ge_log.h"
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/utils/attr_utils.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/tensor_utils.h"

ge/single_op/single_op_model.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "common/helper/model_helper.h"
-#include "graph/load/new_model_manager/davinci_model_parser.h"
+#include "graph/load/model_manager/davinci_model_parser.h"
 #include "single_op/single_op.h"
 #include "single_op/stream_resource.h"
 

ge/single_op/task/aicpu_kernel_task_builder.cc

@@ -16,7 +16,7 @@
 
 #include "single_op/task/aicpu_kernel_task_builder.h"
 #include "framework/common/taskdown_common.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_manager.h"
 #include "build_task_utils.h"
 
 namespace ge {

ge/single_op/task/aicpu_task_builder.cc

@@ -19,8 +19,8 @@
 #include "single_op/task/build_task_utils.h"
 #include "runtime/mem.h"
 #include "framework/common/debug/ge_log.h"
-#include "graph/load/new_model_manager/model_utils.h"
-#include "graph/load/new_model_manager/model_manager.h"
+#include "graph/load/model_manager/model_utils.h"
+#include "graph/load/model_manager/model_manager.h"
 
 namespace ge {
   AiCpuTaskBuilder::AiCpuTaskBuilder(const OpDescPtr &op_desc, const domi::KernelExDef &kernel_def)

ge/single_op/task/build_task_utils.cc

@@ -17,7 +17,7 @@
 #include "single_op/task/build_task_utils.h"
 
 #include "runtime/rt.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/manager/graph_var_manager.h"
 #include "graph/utils/type_utils.h"
 #include "framework/common/debug/ge_log.h"

ge/single_op/task/tbe_task_builder.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "graph/debug/ge_attr_define.h"
-#include "graph/load/new_model_manager/model_utils.h"
+#include "graph/load/model_manager/model_utils.h"
 #include "graph/manager/graph_var_manager.h"
 #include "runtime/rt.h"
 #include "single_op/task/build_task_utils.h"

tests/ut/ge/CMakeLists.txt

@@ -132,7 +132,7 @@ set(COMMON_SRC_FILES
     "${GE_CODE_DIR}/ge/opskernel_manager/ops_kernel_manager.cc"
     "${GE_CODE_DIR}/ge/session/session_manager.cc"
     "${GE_CODE_DIR}/ge/opskernel_manager/ops_kernel_builder_manager.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/model_manager.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/model_manager.cc"
     "${GE_CODE_DIR}/ge/common/profiling/profiling_manager.cc"
     "${GE_CODE_DIR}/ge/graph/manager/host_mem_manager.cc"
     "${GE_CODE_DIR}/ge/session/inner_session.cc"
@@ -140,15 +140,15 @@ set(COMMON_SRC_FILES
     "${GE_CODE_DIR}/ge/graph/execute/graph_execute.cc"
     "${GE_CODE_DIR}/ge/graph/preprocess/graph_preprocess.cc"
     "${GE_CODE_DIR}/ge/hybrid/hybrid_davinci_model_stub.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/davinci_model.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/data_inputer.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/data_inputer.cc"
     "${GE_CODE_DIR}/ge/common/dump/dump_properties.cc"
     "${GE_CODE_DIR}/ge/common/helper/model_helper.cc"
     "${GE_CODE_DIR}/ge/common/dump/dump_manager.cc"
     "${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc"
     "${GE_CODE_DIR}/ge/model/ge_root_model.cc"
     "${GE_CODE_DIR}/ge/common/model_parser/base.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/data_dumper.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc"
     "${GE_CODE_DIR}/ge/graph/manager/graph_manager.cc"
     "${GE_CODE_DIR}/ge/common/dump/dump_server.cc"
     "${GE_CODE_DIR}/ge/graph/preprocess/insert_op/util_insert_aipp_op.cc"
@@ -254,13 +254,13 @@ set(COMMON_SRC_FILES
 	"${GE_CODE_DIR}/ge/graph/passes/useless_control_out_remove_pass.cc"
     "${GE_CODE_DIR}/ge/model/ge_model.cc"
     "${GE_CODE_DIR}/ge/common/cust_aicpu_kernel_store.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/model_utils.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/zero_copy_offset.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/zero_copy_task.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/cpu_queue_schedule.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/aipp_utils.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/model_utils.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/zero_copy_offset.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/zero_copy_task.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/cpu_queue_schedule.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/aipp_utils.cc"
     "${GE_CODE_DIR}/ge/omm/csa_interact.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/tbe_handle_store.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/tbe_handle_store.cc"
     "${GE_CODE_DIR}/ge/common/kernel_store.cc"
     "${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc"
     "${GE_CODE_DIR}/ge/common/auth/file_saver.cc"
@@ -386,32 +386,32 @@ set(DISTINCT_GRAPH_LOAD_SRC_FILES
     "${GE_CODE_DIR}/ge/common/model_parser/base.cc"
     "${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc"
     "${GE_CODE_DIR}/ge/common/util.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/cpu_queue_schedule.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/data_dumper.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/data_inputer.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/davinci_model.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/davinci_model_parser.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/model_manager.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/model_utils.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/tbe_handle_store.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/event_record_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/event_wait_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/fusion_start_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/hccl_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/label_set_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/stream_switch_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/end_graph_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/model_exit_task_info.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc"
-    "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/cpu_queue_schedule.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/data_inputer.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model_parser.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/model_manager.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/model_utils.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/tbe_handle_store.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/event_record_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/event_wait_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/fusion_start_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/fusion_stop_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/hccl_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/kernel_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/label_set_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/memcpy_async_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/profiler_trace_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/stream_active_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/end_graph_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/model_exit_task_info.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/super_kernel/super_kernel.cc"
+    "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc"
     "${GE_CODE_DIR}/ge/model/ge_model.cc"
     "${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc"
     "${GE_CODE_DIR}/ge/common/debug/memory_dumper.cc"