diff --git a/build.sh b/build.sh index 5222ab5c..561a7efc 100644 --- a/build.sh +++ b/build.sh @@ -235,14 +235,14 @@ if [[ "X$ENABLE_GE_UT" = "Xon" || "X$ENABLE_GE_COV" = "Xon" ]]; then # fi # if [[ "X$ENABLE_GE_COV" = "Xon" ]]; then - echo "Generating coverage statistics, please wait..." - cd ${BASEPATH} - rm -rf ${BASEPATH}/cov - mkdir ${BASEPATH}/cov - lcov -c -d build/tests/ut/ge -d build/tests/ut/common/graph/ -o cov/tmp.info - lcov --remove cov/tmp.info '*/output/*' '*/build/opensrc/*' '*/build/proto/*' '*/third_party/*' '*/tests/*' '/usr/local/*' -o cov/coverage.info - cd ${BASEPATH}/cov - genhtml coverage.info + echo "Generating coverage statistics, please wait..." + cd ${BASEPATH} + rm -rf ${BASEPATH}/cov + mkdir ${BASEPATH}/cov + lcov -c -d build/tests/ut/ge -d build/tests/ut/common/graph/ -o cov/tmp.info + lcov --remove cov/tmp.info '*/output/*' '*/build/opensrc/*' '*/build/proto/*' '*/third_party/*' '*/tests/*' '/usr/local/*' '*/model_manager/*' -o cov/coverage.info + cd ${BASEPATH}/cov + genhtml coverage.info fi # generate output package in tar form, including ut/st libraries/executables diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index edbf837d..888f565c 100755 --- a/ge/CMakeLists.txt +++ b/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" diff --git a/ge/common/helper/model_cache_helper.cc b/ge/common/helper/model_cache_helper.cc index 0b592e11..7ec8cc0f 100755 --- a/ge/common/helper/model_cache_helper.cc +++ b/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" diff --git a/ge/common/helper/model_helper.cc b/ge/common/helper/model_helper.cc index 1d5a4a9b..92f279be 100644 --- a/ge/common/helper/model_helper.cc +++ b/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" diff --git a/ge/common/profiling/profiling_manager.cc b/ge/common/profiling/profiling_manager.cc index 9ca3aced..32f0ee40 100644 --- a/ge/common/profiling/profiling_manager.cc +++ b/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"; diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt index d7bca1fa..26e53c7b 100644 --- a/ge/executor/CMakeLists.txt +++ b/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" diff --git a/ge/executor/ge_executor.cc b/ge/executor/ge_executor.cc index 0ea0e66d..b71a8be4 100755 --- a/ge/executor/ge_executor.cc +++ b/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; diff --git a/ge/executor/module.mk b/ge/executor/module.mk index 7f2c1c53..4966eeb5 100644 --- a/ge/executor/module.mk +++ b/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 \ diff --git a/ge/ge_inference.mk b/ge/ge_inference.mk index 6f9e60db..a20ff437 100755 --- a/ge/ge_inference.mk +++ b/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) diff --git a/ge/ge_runner.mk b/ge/ge_runner.mk index af938686..4434dc2b 100644 --- a/ge/ge_runner.mk +++ b/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 \ diff --git a/ge/graph/execute/graph_execute.cc b/ge/graph/execute/graph_execute.cc index 3c5618e8..79c22a29 100755 --- a/ge/graph/execute/graph_execute.cc +++ b/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" diff --git a/ge/graph/load/graph_loader.cc b/ge/graph/load/graph_loader.cc index 6272e581..29afc939 100755 --- a/ge/graph/load/graph_loader.cc +++ b/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" diff --git a/ge/graph/load/new_model_manager/aipp_utils.cc b/ge/graph/load/model_manager/aipp_utils.cc similarity index 98% rename from ge/graph/load/new_model_manager/aipp_utils.cc rename to ge/graph/load/model_manager/aipp_utils.cc index e0e60d2b..8a18c421 100755 --- a/ge/graph/load/new_model_manager/aipp_utils.cc +++ b/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 diff --git a/ge/graph/load/new_model_manager/aipp_utils.h b/ge/graph/load/model_manager/aipp_utils.h similarity index 100% rename from ge/graph/load/new_model_manager/aipp_utils.h rename to ge/graph/load/model_manager/aipp_utils.h diff --git a/ge/graph/load/new_model_manager/cpu_queue_schedule.cc b/ge/graph/load/model_manager/cpu_queue_schedule.cc similarity index 99% rename from ge/graph/load/new_model_manager/cpu_queue_schedule.cc rename to ge/graph/load/model_manager/cpu_queue_schedule.cc index 430321bd..d9b716ea 100644 --- a/ge/graph/load/new_model_manager/cpu_queue_schedule.cc +++ b/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" diff --git a/ge/graph/load/new_model_manager/cpu_queue_schedule.h b/ge/graph/load/model_manager/cpu_queue_schedule.h similarity index 97% rename from ge/graph/load/new_model_manager/cpu_queue_schedule.h rename to ge/graph/load/model_manager/cpu_queue_schedule.h index 8999e975..de4c5327 100644 --- a/ge/graph/load/new_model_manager/cpu_queue_schedule.h +++ b/ge/graph/load/model_manager/cpu_queue_schedule.h @@ -20,8 +20,8 @@ #include #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 { diff --git a/ge/graph/load/new_model_manager/data_dumper.cc b/ge/graph/load/model_manager/data_dumper.cc similarity index 99% rename from ge/graph/load/new_model_manager/data_dumper.cc rename to ge/graph/load/model_manager/data_dumper.cc index a12a2b2a..947aac1d 100644 --- a/ge/graph/load/new_model_manager/data_dumper.cc +++ b/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 #include @@ -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" diff --git a/ge/graph/load/new_model_manager/data_dumper.h b/ge/graph/load/model_manager/data_dumper.h similarity index 100% rename from ge/graph/load/new_model_manager/data_dumper.h rename to ge/graph/load/model_manager/data_dumper.h diff --git a/ge/graph/load/new_model_manager/data_inputer.cc b/ge/graph/load/model_manager/data_inputer.cc similarity index 94% rename from ge/graph/load/new_model_manager/data_inputer.cc rename to ge/graph/load/model_manager/data_inputer.cc index 5efc710e..0fe75465 100755 --- a/ge/graph/load/new_model_manager/data_inputer.cc +++ b/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 diff --git a/ge/graph/load/new_model_manager/data_inputer.h b/ge/graph/load/model_manager/data_inputer.h similarity index 100% rename from ge/graph/load/new_model_manager/data_inputer.h rename to ge/graph/load/model_manager/data_inputer.h diff --git a/ge/graph/load/new_model_manager/davinci_model.cc b/ge/graph/load/model_manager/davinci_model.cc similarity index 99% rename from ge/graph/load/new_model_manager/davinci_model.cc rename to ge/graph/load/model_manager/davinci_model.cc index 75a5f6af..2430ae3d 100755 --- a/ge/graph/load/new_model_manager/davinci_model.cc +++ b/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 #include @@ -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" diff --git a/ge/graph/load/new_model_manager/davinci_model.h b/ge/graph/load/model_manager/davinci_model.h similarity index 98% rename from ge/graph/load/new_model_manager/davinci_model.h rename to ge/graph/load/model_manager/davinci_model.h index f02015a8..53db77a7 100755 --- a/ge/graph/load/new_model_manager/davinci_model.h +++ b/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" diff --git a/ge/graph/load/new_model_manager/davinci_model_parser.cc b/ge/graph/load/model_manager/davinci_model_parser.cc similarity index 92% rename from ge/graph/load/new_model_manager/davinci_model_parser.cc rename to ge/graph/load/model_manager/davinci_model_parser.cc index 76526de2..c6f48b84 100644 --- a/ge/graph/load/new_model_manager/davinci_model_parser.cc +++ b/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() {} diff --git a/ge/graph/load/new_model_manager/davinci_model_parser.h b/ge/graph/load/model_manager/davinci_model_parser.h similarity index 100% rename from ge/graph/load/new_model_manager/davinci_model_parser.h rename to ge/graph/load/model_manager/davinci_model_parser.h diff --git a/ge/graph/load/new_model_manager/model_manager.cc b/ge/graph/load/model_manager/model_manager.cc similarity index 99% rename from ge/graph/load/new_model_manager/model_manager.cc rename to ge/graph/load/model_manager/model_manager.cc index edc60e50..7cf869ac 100755 --- a/ge/graph/load/new_model_manager/model_manager.cc +++ b/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 @@ -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" diff --git a/ge/graph/load/new_model_manager/model_manager.h b/ge/graph/load/model_manager/model_manager.h similarity index 100% rename from ge/graph/load/new_model_manager/model_manager.h rename to ge/graph/load/model_manager/model_manager.h diff --git a/ge/graph/load/new_model_manager/model_utils.cc b/ge/graph/load/model_manager/model_utils.cc similarity index 99% rename from ge/graph/load/new_model_manager/model_utils.cc rename to ge/graph/load/model_manager/model_utils.cc index 3c141f06..410e9364 100755 --- a/ge/graph/load/new_model_manager/model_utils.cc +++ b/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 #include "common/debug/log.h" #include "common/op/ge_op_utils.h" diff --git a/ge/graph/load/new_model_manager/model_utils.h b/ge/graph/load/model_manager/model_utils.h similarity index 98% rename from ge/graph/load/new_model_manager/model_utils.h rename to ge/graph/load/model_manager/model_utils.h index 417b9b89..26f8d700 100755 --- a/ge/graph/load/new_model_manager/model_utils.h +++ b/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" diff --git a/ge/graph/load/new_model_manager/task_info/end_graph_task_info.cc b/ge/graph/load/model_manager/task_info/end_graph_task_info.cc similarity index 95% rename from ge/graph/load/new_model_manager/task_info/end_graph_task_info.cc rename to ge/graph/load/model_manager/task_info/end_graph_task_info.cc index b8b02f59..c306c650 100644 --- a/ge/graph/load/new_model_manager/task_info/end_graph_task_info.cc +++ b/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; diff --git a/ge/graph/load/new_model_manager/task_info/end_graph_task_info.h b/ge/graph/load/model_manager/task_info/end_graph_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/end_graph_task_info.h rename to ge/graph/load/model_manager/task_info/end_graph_task_info.h index 614544f9..efce19b2 100644 --- a/ge/graph/load/new_model_manager/task_info/end_graph_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/event_record_task_info.cc b/ge/graph/load/model_manager/task_info/event_record_task_info.cc similarity index 93% rename from ge/graph/load/new_model_manager/task_info/event_record_task_info.cc rename to ge/graph/load/model_manager/task_info/event_record_task_info.cc index 11589258..f736c386 100755 --- a/ge/graph/load/new_model_manager/task_info/event_record_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/event_record_task_info.h b/ge/graph/load/model_manager/task_info/event_record_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/event_record_task_info.h rename to ge/graph/load/model_manager/task_info/event_record_task_info.h index d3f5961e..a79f1d3b 100755 --- a/ge/graph/load/new_model_manager/task_info/event_record_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/event_wait_task_info.cc b/ge/graph/load/model_manager/task_info/event_wait_task_info.cc similarity index 93% rename from ge/graph/load/new_model_manager/task_info/event_wait_task_info.cc rename to ge/graph/load/model_manager/task_info/event_wait_task_info.cc index 5701179b..34058502 100755 --- a/ge/graph/load/new_model_manager/task_info/event_wait_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/event_wait_task_info.h b/ge/graph/load/model_manager/task_info/event_wait_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/event_wait_task_info.h rename to ge/graph/load/model_manager/task_info/event_wait_task_info.h index a92252d7..bd8acab1 100755 --- a/ge/graph/load/new_model_manager/task_info/event_wait_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/fusion_start_task_info.cc b/ge/graph/load/model_manager/task_info/fusion_start_task_info.cc similarity index 92% rename from ge/graph/load/new_model_manager/task_info/fusion_start_task_info.cc rename to ge/graph/load/model_manager/task_info/fusion_start_task_info.cc index 32c79647..6feea9e4 100755 --- a/ge/graph/load/new_model_manager/task_info/fusion_start_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/fusion_start_task_info.h b/ge/graph/load/model_manager/task_info/fusion_start_task_info.h similarity index 94% rename from ge/graph/load/new_model_manager/task_info/fusion_start_task_info.h rename to ge/graph/load/model_manager/task_info/fusion_start_task_info.h index b1897533..284a5e0f 100755 --- a/ge/graph/load/new_model_manager/task_info/fusion_start_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.cc b/ge/graph/load/model_manager/task_info/fusion_stop_task_info.cc similarity index 92% rename from ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.cc rename to ge/graph/load/model_manager/task_info/fusion_stop_task_info.cc index dd4edfd0..22d1589c 100755 --- a/ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.h b/ge/graph/load/model_manager/task_info/fusion_stop_task_info.h similarity index 94% rename from ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.h rename to ge/graph/load/model_manager/task_info/fusion_stop_task_info.h index 880ca487..994498d5 100755 --- a/ge/graph/load/new_model_manager/task_info/fusion_stop_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/hccl_task_info.cc b/ge/graph/load/model_manager/task_info/hccl_task_info.cc similarity index 98% rename from ge/graph/load/new_model_manager/task_info/hccl_task_info.cc rename to ge/graph/load/model_manager/task_info/hccl_task_info.cc index 7b18a9a3..2d0ad560 100644 --- a/ge/graph/load/new_model_manager/task_info/hccl_task_info.cc +++ b/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 #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_; diff --git a/ge/graph/load/new_model_manager/task_info/hccl_task_info.h b/ge/graph/load/model_manager/task_info/hccl_task_info.h similarity index 97% rename from ge/graph/load/new_model_manager/task_info/hccl_task_info.h rename to ge/graph/load/model_manager/task_info/hccl_task_info.h index 777f5bbf..3df155ad 100644 --- a/ge/graph/load/new_model_manager/task_info/hccl_task_info.h +++ b/ge/graph/load/model_manager/task_info/hccl_task_info.h @@ -23,7 +23,7 @@ #include #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 { diff --git a/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc b/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc similarity index 98% rename from ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc rename to ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc index 98d9cb78..c34a4e9a 100644 --- a/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc +++ b/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 @@ -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) { diff --git a/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.h b/ge/graph/load/model_manager/task_info/kernel_ex_task_info.h similarity index 97% rename from ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.h rename to ge/graph/load/model_manager/task_info/kernel_ex_task_info.h index f6873c6c..265316ce 100644 --- a/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc b/ge/graph/load/model_manager/task_info/kernel_task_info.cc similarity index 99% rename from ge/graph/load/new_model_manager/task_info/kernel_task_info.cc rename to ge/graph/load/model_manager/task_info/kernel_task_info.cc index 83bf2779..27fe8eb0 100755 --- a/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc +++ b/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 #include #include @@ -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" diff --git a/ge/graph/load/new_model_manager/task_info/kernel_task_info.h b/ge/graph/load/model_manager/task_info/kernel_task_info.h similarity index 98% rename from ge/graph/load/new_model_manager/task_info/kernel_task_info.h rename to ge/graph/load/model_manager/task_info/kernel_task_info.h index cea25320..7cabf259 100644 --- a/ge/graph/load/new_model_manager/task_info/kernel_task_info.h +++ b/ge/graph/load/model_manager/task_info/kernel_task_info.h @@ -22,7 +22,7 @@ #include #include -#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 { diff --git a/ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc b/ge/graph/load/model_manager/task_info/label_goto_ex_task_info.cc similarity index 94% rename from ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc rename to ge/graph/load/model_manager/task_info/label_goto_ex_task_info.cc index 393c0b31..1921c85d 100755 --- a/ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.cc +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.h b/ge/graph/load/model_manager/task_info/label_goto_ex_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.h rename to ge/graph/load/model_manager/task_info/label_goto_ex_task_info.h index f83cd1d9..25310368 100755 --- a/ge/graph/load/new_model_manager/task_info/label_goto_ex_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/label_set_task_info.cc b/ge/graph/load/model_manager/task_info/label_set_task_info.cc similarity index 94% rename from ge/graph/load/new_model_manager/task_info/label_set_task_info.cc rename to ge/graph/load/model_manager/task_info/label_set_task_info.cc index 5fa96a96..45cb586a 100644 --- a/ge/graph/load/new_model_manager/task_info/label_set_task_info.cc +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/label_set_task_info.h b/ge/graph/load/model_manager/task_info/label_set_task_info.h similarity index 94% rename from ge/graph/load/new_model_manager/task_info/label_set_task_info.h rename to ge/graph/load/model_manager/task_info/label_set_task_info.h index bb02ccf0..36e41f1b 100644 --- a/ge/graph/load/new_model_manager/task_info/label_set_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc b/ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.cc similarity index 97% rename from ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc rename to ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.cc index ae7865a4..c2997678 100644 --- a/ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.cc +++ b/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; diff --git a/ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.h b/ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.h similarity index 94% rename from ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.h rename to ge/graph/load/model_manager/task_info/label_switch_by_index_task_info.h index 538b2d68..00ca0844 100644 --- a/ge/graph/load/new_model_manager/task_info/label_switch_by_index_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc b/ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc similarity index 96% rename from ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc rename to ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.cc index b95705f0..a1f58e42 100755 --- a/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc +++ b/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; diff --git a/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h b/ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.h similarity index 96% rename from ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h rename to ge/graph/load/model_manager/task_info/memcpy_addr_async_task_info.h index c7645b9f..4631c67c 100644 --- a/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc b/ge/graph/load/model_manager/task_info/memcpy_async_task_info.cc similarity index 97% rename from ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc rename to ge/graph/load/model_manager/task_info/memcpy_async_task_info.cc index fa320d81..22f9267d 100755 --- a/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.h b/ge/graph/load/model_manager/task_info/memcpy_async_task_info.h similarity index 96% rename from ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.h rename to ge/graph/load/model_manager/task_info/memcpy_async_task_info.h index 43b5ba13..728305ff 100755 --- a/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/model_exit_task_info.cc b/ge/graph/load/model_manager/task_info/model_exit_task_info.cc similarity index 93% rename from ge/graph/load/new_model_manager/task_info/model_exit_task_info.cc rename to ge/graph/load/model_manager/task_info/model_exit_task_info.cc index ff8057aa..eb200e3f 100644 --- a/ge/graph/load/new_model_manager/task_info/model_exit_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/model_exit_task_info.h b/ge/graph/load/model_manager/task_info/model_exit_task_info.h similarity index 94% rename from ge/graph/load/new_model_manager/task_info/model_exit_task_info.h rename to ge/graph/load/model_manager/task_info/model_exit_task_info.h index c219fcc8..1e4a3923 100644 --- a/ge/graph/load/new_model_manager/task_info/model_exit_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc b/ge/graph/load/model_manager/task_info/profiler_trace_task_info.cc similarity index 93% rename from ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc rename to ge/graph/load/model_manager/task_info/profiler_trace_task_info.cc index 533c459a..b8fd1828 100755 --- a/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc +++ b/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) { diff --git a/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.h b/ge/graph/load/model_manager/task_info/profiler_trace_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.h rename to ge/graph/load/model_manager/task_info/profiler_trace_task_info.h index 8989096d..b57ebfae 100755 --- a/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc b/ge/graph/load/model_manager/task_info/stream_active_task_info.cc similarity index 95% rename from ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc rename to ge/graph/load/model_manager/task_info/stream_active_task_info.cc index 33ebea3b..ec807777 100755 --- a/ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc +++ b/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 #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 { diff --git a/ge/graph/load/new_model_manager/task_info/stream_active_task_info.h b/ge/graph/load/model_manager/task_info/stream_active_task_info.h similarity index 95% rename from ge/graph/load/new_model_manager/task_info/stream_active_task_info.h rename to ge/graph/load/model_manager/task_info/stream_active_task_info.h index c6b263b4..dfbf48d1 100755 --- a/ge/graph/load/new_model_manager/task_info/stream_active_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/stream_switch_task_info.cc b/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc similarity index 97% rename from ge/graph/load/new_model_manager/task_info/stream_switch_task_info.cc rename to ge/graph/load/model_manager/task_info/stream_switch_task_info.cc index 616ba85f..f129950a 100644 --- a/ge/graph/load/new_model_manager/task_info/stream_switch_task_info.cc +++ b/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 #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 { diff --git a/ge/graph/load/new_model_manager/task_info/stream_switch_task_info.h b/ge/graph/load/model_manager/task_info/stream_switch_task_info.h similarity index 96% rename from ge/graph/load/new_model_manager/task_info/stream_switch_task_info.h rename to ge/graph/load/model_manager/task_info/stream_switch_task_info.h index a72d7de2..0e75e183 100755 --- a/ge/graph/load/new_model_manager/task_info/stream_switch_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.cc b/ge/graph/load/model_manager/task_info/stream_switchn_task_info.cc similarity index 97% rename from ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.cc rename to ge/graph/load/model_manager/task_info/stream_switchn_task_info.cc index 27adbbe4..35eb23e3 100755 --- a/ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.cc +++ b/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 #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; diff --git a/ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.h b/ge/graph/load/model_manager/task_info/stream_switchn_task_info.h similarity index 96% rename from ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.h rename to ge/graph/load/model_manager/task_info/stream_switchn_task_info.h index 3d65a086..6e6ca190 100755 --- a/ge/graph/load/new_model_manager/task_info/stream_switchn_task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc b/ge/graph/load/model_manager/task_info/super_kernel/super_kernel.cc similarity index 100% rename from ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel.cc rename to ge/graph/load/model_manager/task_info/super_kernel/super_kernel.cc diff --git a/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel.h b/ge/graph/load/model_manager/task_info/super_kernel/super_kernel.h similarity index 100% rename from ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel.h rename to ge/graph/load/model_manager/task_info/super_kernel/super_kernel.h diff --git a/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc b/ge/graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc similarity index 100% rename from ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.cc rename to ge/graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc diff --git a/ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.h b/ge/graph/load/model_manager/task_info/super_kernel/super_kernel_factory.h similarity index 100% rename from ge/graph/load/new_model_manager/task_info/super_kernel/super_kernel_factory.h rename to ge/graph/load/model_manager/task_info/super_kernel/super_kernel_factory.h diff --git a/ge/graph/load/new_model_manager/task_info/task_info.cc b/ge/graph/load/model_manager/task_info/task_info.cc similarity index 94% rename from ge/graph/load/new_model_manager/task_info/task_info.cc rename to ge/graph/load/model_manager/task_info/task_info.cc index 674d477f..e521f95c 100755 --- a/ge/graph/load/new_model_manager/task_info/task_info.cc +++ b/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 diff --git a/ge/graph/load/new_model_manager/task_info/task_info.h b/ge/graph/load/model_manager/task_info/task_info.h similarity index 96% rename from ge/graph/load/new_model_manager/task_info/task_info.h rename to ge/graph/load/model_manager/task_info/task_info.h index 26f22564..99ec3c4e 100644 --- a/ge/graph/load/new_model_manager/task_info/task_info.h +++ b/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 { diff --git a/ge/graph/load/new_model_manager/task_info/task_info_factory.h b/ge/graph/load/model_manager/task_info/task_info_factory.h similarity index 100% rename from ge/graph/load/new_model_manager/task_info/task_info_factory.h rename to ge/graph/load/model_manager/task_info/task_info_factory.h diff --git a/ge/graph/load/new_model_manager/tbe_handle_store.cc b/ge/graph/load/model_manager/tbe_handle_store.cc similarity index 100% rename from ge/graph/load/new_model_manager/tbe_handle_store.cc rename to ge/graph/load/model_manager/tbe_handle_store.cc diff --git a/ge/graph/load/new_model_manager/tbe_handle_store.h b/ge/graph/load/model_manager/tbe_handle_store.h similarity index 100% rename from ge/graph/load/new_model_manager/tbe_handle_store.h rename to ge/graph/load/model_manager/tbe_handle_store.h diff --git a/ge/graph/load/new_model_manager/ts_mem_mall.h b/ge/graph/load/model_manager/ts_mem_mall.h similarity index 100% rename from ge/graph/load/new_model_manager/ts_mem_mall.h rename to ge/graph/load/model_manager/ts_mem_mall.h diff --git a/ge/graph/load/new_model_manager/zero_copy_offset.cc b/ge/graph/load/model_manager/zero_copy_offset.cc similarity index 98% rename from ge/graph/load/new_model_manager/zero_copy_offset.cc rename to ge/graph/load/model_manager/zero_copy_offset.cc index f27d862d..3f8555bb 100644 --- a/ge/graph/load/new_model_manager/zero_copy_offset.cc +++ b/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 { diff --git a/ge/graph/load/new_model_manager/zero_copy_offset.h b/ge/graph/load/model_manager/zero_copy_offset.h similarity index 98% rename from ge/graph/load/new_model_manager/zero_copy_offset.h rename to ge/graph/load/model_manager/zero_copy_offset.h index 66fcd887..fc63fced 100644 --- a/ge/graph/load/new_model_manager/zero_copy_offset.h +++ b/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" diff --git a/ge/graph/load/new_model_manager/zero_copy_task.cc b/ge/graph/load/model_manager/zero_copy_task.cc similarity index 97% rename from ge/graph/load/new_model_manager/zero_copy_task.cc rename to ge/graph/load/model_manager/zero_copy_task.cc index b938f14b..367de87a 100755 --- a/ge/graph/load/new_model_manager/zero_copy_task.cc +++ b/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 { diff --git a/ge/graph/load/new_model_manager/zero_copy_task.h b/ge/graph/load/model_manager/zero_copy_task.h similarity index 100% rename from ge/graph/load/new_model_manager/zero_copy_task.h rename to ge/graph/load/model_manager/zero_copy_task.h diff --git a/ge/hybrid/executor/hybrid_model_async_executor.cc b/ge/hybrid/executor/hybrid_model_async_executor.cc index 3673edf0..b7c6c33d 100644 --- a/ge/hybrid/executor/hybrid_model_async_executor.cc +++ b/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" diff --git a/ge/hybrid/executor/hybrid_model_async_executor.h b/ge/hybrid/executor/hybrid_model_async_executor.h index 21d2d033..a69cc45f 100644 --- a/ge/hybrid/executor/hybrid_model_async_executor.h +++ b/ge/hybrid/executor/hybrid_model_async_executor.h @@ -21,7 +21,7 @@ #include #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" diff --git a/ge/hybrid/executor/hybrid_model_executor.h b/ge/hybrid/executor/hybrid_model_executor.h index 6299d4ff..6b2e52b4 100644 --- a/ge/hybrid/executor/hybrid_model_executor.h +++ b/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" diff --git a/ge/hybrid/hybrid_davinci_model.h b/ge/hybrid/hybrid_davinci_model.h index 5349390c..369c732a 100644 --- a/ge/hybrid/hybrid_davinci_model.h +++ b/ge/hybrid/hybrid_davinci_model.h @@ -19,7 +19,7 @@ #include #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 { diff --git a/ge/hybrid/model/hybrid_model.cc b/ge/hybrid/model/hybrid_model.cc index 91b6a549..7e5d8fe5 100644 --- a/ge/hybrid/model/hybrid_model.cc +++ b/ge/hybrid/model/hybrid_model.cc @@ -17,7 +17,7 @@ #include "hybrid_model.h" #include #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" diff --git a/ge/hybrid/model/hybrid_model.h b/ge/hybrid/model/hybrid_model.h index e521b776..72495cad 100644 --- a/ge/hybrid/model/hybrid_model.h +++ b/ge/hybrid/model/hybrid_model.h @@ -21,8 +21,8 @@ #include #include #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" diff --git a/ge/hybrid/model/hybrid_model_builder.cc b/ge/hybrid/model/hybrid_model_builder.cc index 7ee0bef7..861cd30a 100755 --- a/ge/hybrid/model/hybrid_model_builder.cc +++ b/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" diff --git a/ge/hybrid/model/hybrid_model_builder.h b/ge/hybrid/model/hybrid_model_builder.h index 55a19b6c..045bf3ef 100644 --- a/ge/hybrid/model/hybrid_model_builder.h +++ b/ge/hybrid/model/hybrid_model_builder.h @@ -21,7 +21,7 @@ #include #include #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" diff --git a/ge/hybrid/node_executor/aicore/aicore_op_task.cc b/ge/hybrid/node_executor/aicore/aicore_op_task.cc index f61caf19..f1bd6466 100644 --- a/ge/hybrid/node_executor/aicore/aicore_op_task.cc +++ b/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; diff --git a/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc b/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc index 2a7cbc67..109939d9 100755 --- a/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc +++ b/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" diff --git a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc b/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc index 7f2c6288..2bca3e06 100755 --- a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc +++ b/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 { diff --git a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.h b/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.h index 2dde993b..6e9740ad 100644 --- a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.h +++ b/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 { diff --git a/ge/init/gelib.cc b/ge/init/gelib.cc index b81632bd..1a97b6f8 100755 --- a/ge/init/gelib.cc +++ b/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" diff --git a/ge/session/inner_session.cc b/ge/session/inner_session.cc index c4f8a53b..5a67f7cd 100755 --- a/ge/session/inner_session.cc +++ b/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" diff --git a/ge/session/session_manager.cc b/ge/session/session_manager.cc index 5d5a299a..3c531747 100755 --- a/ge/session/session_manager.cc +++ b/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; diff --git a/ge/single_op/single_op.cc b/ge/single_op/single_op.cc index 081ce13b..2fa7182b 100755 --- a/ge/single_op/single_op.cc +++ b/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 { diff --git a/ge/single_op/single_op_model.cc b/ge/single_op/single_op_model.cc index 2a1a14e6..220adde8 100755 --- a/ge/single_op/single_op_model.cc +++ b/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" diff --git a/ge/single_op/single_op_model.h b/ge/single_op/single_op_model.h index 6d0109fe..6637271c 100755 --- a/ge/single_op/single_op_model.h +++ b/ge/single_op/single_op_model.h @@ -24,7 +24,7 @@ #include #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" diff --git a/ge/single_op/task/aicpu_kernel_task_builder.cc b/ge/single_op/task/aicpu_kernel_task_builder.cc index 2a5f968f..6580ea31 100755 --- a/ge/single_op/task/aicpu_kernel_task_builder.cc +++ b/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 { diff --git a/ge/single_op/task/aicpu_task_builder.cc b/ge/single_op/task/aicpu_task_builder.cc index 1bfbcb3c..90ddc696 100755 --- a/ge/single_op/task/aicpu_task_builder.cc +++ b/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) diff --git a/ge/single_op/task/build_task_utils.cc b/ge/single_op/task/build_task_utils.cc index 071e514b..9e4d55e1 100644 --- a/ge/single_op/task/build_task_utils.cc +++ b/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" diff --git a/ge/single_op/task/tbe_task_builder.cc b/ge/single_op/task/tbe_task_builder.cc index 594352aa..9ba30b8e 100644 --- a/ge/single_op/task/tbe_task_builder.cc +++ b/ge/single_op/task/tbe_task_builder.cc @@ -20,7 +20,7 @@ #include #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" diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index 5979f5cf..dafb97e0 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/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" diff --git a/tests/ut/ge/graph/ge_executor_unittest.cc b/tests/ut/ge/graph/ge_executor_unittest.cc index 3d04fd0c..3ef8a750 100644 --- a/tests/ut/ge/graph/ge_executor_unittest.cc +++ b/tests/ut/ge/graph/ge_executor_unittest.cc @@ -33,11 +33,11 @@ #include "common/properties_manager.h" #include "common/types.h" #include "graph/load/graph_loader.h" -#include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/davinci_model_parser.h" -#include "graph/load/new_model_manager/model_manager.h" -#include "graph/load/new_model_manager/task_info/kernel_task_info.h" -#include "graph/load/new_model_manager/task_info/kernel_ex_task_info.h" +#include "graph/load/model_manager/davinci_model.h" +#include "graph/load/model_manager/davinci_model_parser.h" +#include "graph/load/model_manager/model_manager.h" +#include "graph/load/model_manager/task_info/kernel_task_info.h" +#include "graph/load/model_manager/task_info/kernel_ex_task_info.h" #include "ge/common/dump/dump_properties.h" #include "graph/manager/graph_mem_allocator.h" #include "graph/utils/graph_utils.h" diff --git a/tests/ut/ge/graph/graph_load_unittest.cc b/tests/ut/ge/graph/graph_load_unittest.cc index af9d5a37..54972af7 100644 --- a/tests/ut/ge/graph/graph_load_unittest.cc +++ b/tests/ut/ge/graph/graph_load_unittest.cc @@ -24,7 +24,7 @@ #include "common/helper/model_helper.h" #include "common/op/ge_op_utils.h" #include "common/types.h" -#include "graph/load/new_model_manager/davinci_model_parser.h" +#include "graph/load/model_manager/davinci_model_parser.h" #include "graph/op_desc.h" #include "graph/types.h" #include "graph/utils/attr_utils.h" @@ -35,7 +35,7 @@ #include "graph/load/graph_loader.h" #include "framework/common/ge_inner_error_codes.h" -#include "graph/load/new_model_manager/model_manager.h" +#include "graph/load/model_manager/model_manager.h" #include "graph/manager/graph_manager_utils.h" #include "model/ge_model.h" #undef private diff --git a/tests/ut/ge/graph/load/data_dumper_unittest.cc b/tests/ut/ge/graph/load/data_dumper_unittest.cc index e53b76f4..1866f4eb 100644 --- a/tests/ut/ge/graph/load/data_dumper_unittest.cc +++ b/tests/ut/ge/graph/load/data_dumper_unittest.cc @@ -18,8 +18,8 @@ #define private public #define protected public -#include "graph/load/new_model_manager/data_dumper.h" -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/data_dumper.h" +#include "graph/load/model_manager/davinci_model.h" #undef private #undef protected diff --git a/tests/ut/ge/graph/load/davinci_model_unittest.cc b/tests/ut/ge/graph/load/davinci_model_unittest.cc index 0c03c934..35413a6b 100644 --- a/tests/ut/ge/graph/load/davinci_model_unittest.cc +++ b/tests/ut/ge/graph/load/davinci_model_unittest.cc @@ -20,7 +20,7 @@ #define protected public #include "graph/utils/graph_utils.h" #include "common/profiling/profiling_manager.h" -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/davinci_model.h" using namespace std; diff --git a/tests/ut/ge/graph/load/end_graph_task_unittest.cc b/tests/ut/ge/graph/load/end_graph_task_unittest.cc index 29e7a53a..a66aaaff 100644 --- a/tests/ut/ge/graph/load/end_graph_task_unittest.cc +++ b/tests/ut/ge/graph/load/end_graph_task_unittest.cc @@ -18,8 +18,8 @@ #define private public #define protected public -#include "graph/load/new_model_manager/task_info/end_graph_task_info.h" -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/task_info/end_graph_task_info.h" +#include "graph/load/model_manager/davinci_model.h" #undef private #undef protected diff --git a/tests/ut/ge/graph/load/hccl_task_info_unittest.cc b/tests/ut/ge/graph/load/hccl_task_info_unittest.cc index 5c056007..6a2468ee 100644 --- a/tests/ut/ge/graph/load/hccl_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/hccl_task_info_unittest.cc @@ -19,8 +19,8 @@ #define private public #define protected public -#include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/task_info/hccl_task_info.h" +#include "graph/load/model_manager/davinci_model.h" +#include "graph/load/model_manager/task_info/hccl_task_info.h" namespace ge { class UtestHcclTaskInfo : public testing::Test { diff --git a/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc b/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc index 443d2975..53436820 100644 --- a/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc @@ -19,9 +19,9 @@ #define private public #define protected public -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/davinci_model.h" -#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 "cce/aicpu_engine_struct.h" namespace ge { diff --git a/tests/ut/ge/graph/load/kernel_task_info_unittest.cc b/tests/ut/ge/graph/load/kernel_task_info_unittest.cc index fe886b49..a3a27a7b 100644 --- a/tests/ut/ge/graph/load/kernel_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/kernel_task_info_unittest.cc @@ -19,9 +19,9 @@ #define private public #define protected public -#include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/task_info/kernel_task_info.h" -#include "graph/load/new_model_manager/task_info/hccl_task_info.h" +#include "graph/load/model_manager/davinci_model.h" +#include "graph/load/model_manager/task_info/kernel_task_info.h" +#include "graph/load/model_manager/task_info/hccl_task_info.h" namespace ge { extern OpDescPtr CreateOpDesc(string name, string type); diff --git a/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc b/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc index 9348d49e..1652841d 100644 --- a/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc @@ -19,8 +19,8 @@ #define private public #define protected public -#include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.h" +#include "graph/load/model_manager/davinci_model.h" +#include "graph/load/model_manager/task_info/memcpy_addr_async_task_info.h" namespace ge { class UtestMemcpyAddrAsyncTaskInfo : public testing::Test { diff --git a/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc b/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc index 8769ec39..afc04130 100644 --- a/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc @@ -19,8 +19,8 @@ #define private public #define protected public -#include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/task_info/memcpy_async_task_info.h" +#include "graph/load/model_manager/davinci_model.h" +#include "graph/load/model_manager/task_info/memcpy_async_task_info.h" namespace ge { diff --git a/tests/ut/ge/graph/load/model_utils_unittest.cc b/tests/ut/ge/graph/load/model_utils_unittest.cc index bd86c71e..ac886cea 100644 --- a/tests/ut/ge/graph/load/model_utils_unittest.cc +++ b/tests/ut/ge/graph/load/model_utils_unittest.cc @@ -17,7 +17,7 @@ #include #define protected public #define private public -#include "graph/load/new_model_manager/model_utils.h" +#include "graph/load/model_manager/model_utils.h" #include "graph/manager/graph_var_manager.h" using namespace std; diff --git a/tests/ut/ge/graph/load/new_model_manager_data_inputer_unittest.cc b/tests/ut/ge/graph/load/new_model_manager_data_inputer_unittest.cc index 56e673f7..43c2ad15 100644 --- a/tests/ut/ge/graph/load/new_model_manager_data_inputer_unittest.cc +++ b/tests/ut/ge/graph/load/new_model_manager_data_inputer_unittest.cc @@ -17,7 +17,7 @@ #include -#include "graph/load/new_model_manager/data_inputer.h" +#include "graph/load/model_manager/data_inputer.h" #include "common/debug/log.h" #include "common/debug/memory_dumper.h" diff --git a/tests/ut/ge/graph/load/new_model_manager_davinci_model_unittest.cc b/tests/ut/ge/graph/load/new_model_manager_davinci_model_unittest.cc index 00069930..38a250ad 100644 --- a/tests/ut/ge/graph/load/new_model_manager_davinci_model_unittest.cc +++ b/tests/ut/ge/graph/load/new_model_manager_davinci_model_unittest.cc @@ -24,29 +24,29 @@ #include "graph/compute_graph.h" #include "graph/utils/graph_utils.h" #include "graph/model_serialize.h" -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/davinci_model.h" #include "common/properties_manager.h" #include "common/op/ge_op_utils.h" #include #include "runtime/dev.h" #include "runtime/kernel.h" #include "cce/fwk_adpt_struct.h" -#include "graph/load/new_model_manager/task_info/task_info_factory.h" -#include "graph/load/new_model_manager/task_info/task_info.h" -#include "graph/load/new_model_manager/task_info/stream_active_task_info.h" -#include "graph/load/new_model_manager/task_info/stream_switch_task_info.h" -#include "graph/load/new_model_manager/task_info/profiler_trace_task_info.h" -#include "graph/load/new_model_manager/task_info/memcpy_async_task_info.h" -#include "graph/load/new_model_manager/task_info/label_set_task_info.h" -#include "graph/load/new_model_manager/task_info/kernel_ex_task_info.h" -#include "graph/load/new_model_manager/task_info/kernel_task_info.h" -#include "graph/load/new_model_manager/task_info/hccl_task_info.h" -#include "graph/load/new_model_manager/task_info/fusion_start_task_info.h" -#include "graph/load/new_model_manager/task_info/fusion_stop_task_info.h" -#include "graph/load/new_model_manager/task_info/event_record_task_info.h" -#include "graph/load/new_model_manager/task_info/event_wait_task_info.h" +#include "graph/load/model_manager/task_info/task_info_factory.h" +#include "graph/load/model_manager/task_info/task_info.h" +#include "graph/load/model_manager/task_info/stream_active_task_info.h" +#include "graph/load/model_manager/task_info/stream_switch_task_info.h" +#include "graph/load/model_manager/task_info/profiler_trace_task_info.h" +#include "graph/load/model_manager/task_info/memcpy_async_task_info.h" +#include "graph/load/model_manager/task_info/label_set_task_info.h" +#include "graph/load/model_manager/task_info/kernel_ex_task_info.h" +#include "graph/load/model_manager/task_info/kernel_task_info.h" +#include "graph/load/model_manager/task_info/hccl_task_info.h" +#include "graph/load/model_manager/task_info/fusion_start_task_info.h" +#include "graph/load/model_manager/task_info/fusion_stop_task_info.h" +#include "graph/load/model_manager/task_info/event_record_task_info.h" +#include "graph/load/model_manager/task_info/event_wait_task_info.h" #include "graph/manager/graph_var_manager.h" -#include "graph/load/new_model_manager/model_manager.h" +#include "graph/load/model_manager/model_manager.h" #undef private #undef protected diff --git a/tests/ut/ge/graph/load/new_model_manager_model_manager_aicpu_unittest.cc b/tests/ut/ge/graph/load/new_model_manager_model_manager_aicpu_unittest.cc index 43e094b5..a68fb307 100644 --- a/tests/ut/ge/graph/load/new_model_manager_model_manager_aicpu_unittest.cc +++ b/tests/ut/ge/graph/load/new_model_manager_model_manager_aicpu_unittest.cc @@ -30,9 +30,9 @@ #include "common/helper/om_file_helper.h" #include "common/op/ge_op_utils.h" #include "graph/load/graph_loader.h" -#include "graph/load/new_model_manager/davinci_model.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.h" +#include "graph/load/model_manager/davinci_model_parser.h" +#include "graph/load/model_manager/model_manager.h" //#include "new_op_test_utils.h" #undef private #undef protected diff --git a/tests/ut/ge/graph/load/new_model_manager_model_manager_unittest.cc b/tests/ut/ge/graph/load/new_model_manager_model_manager_unittest.cc index 1c6e5a10..8750610a 100644 --- a/tests/ut/ge/graph/load/new_model_manager_model_manager_unittest.cc +++ b/tests/ut/ge/graph/load/new_model_manager_model_manager_unittest.cc @@ -25,13 +25,13 @@ #define private public #define protected public -#include "graph/load/new_model_manager/model_manager.h" +#include "graph/load/model_manager/model_manager.h" #include "common/helper/om_file_helper.h" #include "common/op/ge_op_utils.h" #include "graph/load/graph_loader.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 "new_op_test_utils.h" #undef private #undef protected diff --git a/tests/ut/ge/graph/load/new_model_manager_task_build_unittest.cc b/tests/ut/ge/graph/load/new_model_manager_task_build_unittest.cc index 620fac09..f10ccd7f 100644 --- a/tests/ut/ge/graph/load/new_model_manager_task_build_unittest.cc +++ b/tests/ut/ge/graph/load/new_model_manager_task_build_unittest.cc @@ -30,7 +30,7 @@ #include "graph/compute_graph.h" #include "graph/utils/graph_utils.h" #include "graph/model_serialize.h" -#include "graph/load/new_model_manager/davinci_model.h" +#include "graph/load/model_manager/davinci_model.h" #include "common/properties_manager.h" #include "common/op/ge_op_utils.h" #include diff --git a/tests/ut/ge/graph/load/new_op_test_utils.h b/tests/ut/ge/graph/load/new_op_test_utils.h index 4cbc78ac..984cbfb4 100644 --- a/tests/ut/ge/graph/load/new_op_test_utils.h +++ b/tests/ut/ge/graph/load/new_op_test_utils.h @@ -40,7 +40,7 @@ #define private public #include "graph/compute_graph.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" #include "graph/node.h" #include "graph/op_desc.h" #include "graph/utils/attr_utils.h" diff --git a/tests/ut/ge/graph/load/output_net_output_unittest.cc b/tests/ut/ge/graph/load/output_net_output_unittest.cc index ecd28fe3..97246dad 100644 --- a/tests/ut/ge/graph/load/output_net_output_unittest.cc +++ b/tests/ut/ge/graph/load/output_net_output_unittest.cc @@ -23,8 +23,8 @@ #define private public #include "common/debug/memory_dumper.h" #include "common/op/ge_op_utils.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/manager/graph_var_manager.h" #include "new_op_test_utils.h" #include "proto/om.pb.h" diff --git a/tests/ut/ge/graph/load/tbe_handle_store_unittest.cc b/tests/ut/ge/graph/load/tbe_handle_store_unittest.cc index a98e14c6..82ffb388 100644 --- a/tests/ut/ge/graph/load/tbe_handle_store_unittest.cc +++ b/tests/ut/ge/graph/load/tbe_handle_store_unittest.cc @@ -18,7 +18,7 @@ #define protected public #define private public -#include "graph/load/new_model_manager/tbe_handle_store.h" +#include "graph/load/model_manager/tbe_handle_store.h" #include "runtime/kernel.h" #undef protected #undef private diff --git a/tests/ut/ge/single_op/single_op_model_unittest.cc b/tests/ut/ge/single_op/single_op_model_unittest.cc index b6b97d89..ab909e11 100644 --- a/tests/ut/ge/single_op/single_op_model_unittest.cc +++ b/tests/ut/ge/single_op/single_op_model_unittest.cc @@ -18,7 +18,7 @@ #include //#include "cce/taskdown_common.hpp" -#include "graph/load/new_model_manager/model_utils.h" +#include "graph/load/model_manager/model_utils.h" #include "graph/utils/graph_utils.h" #include "runtime/rt.h"