m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename new_model_manager to model_manager.

Browse Source
pull/976/head
zhangxiaokun 4 years ago
parent 9b92fba296
commit c193588e2f
120 changed files with 406 additions and 406 deletions
Show Stats Download Patch File Download Diff File

126
ge/CMakeLists.txt
Unescape View File

@ -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"

2
ge/common/helper/model_cache_helper.cc
Unescape View File

@ -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"

2
ge/common/helper/model_helper.cc
Unescape View File

@ -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"

2
ge/common/profiling/profiling_manager.cc
Unescape View File

@ -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";

62
ge/executor/CMakeLists.txt
Unescape View File

@ -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"

6
ge/executor/ge_executor.cc
Unescape View File

@ -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;

62
ge/executor/module.mk
Unescape View File

@ -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 \

64
ge/ge_inference.mk
Unescape View File

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

64
ge/ge_runner.mk
Unescape View File

@ -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 \

2
ge/graph/execute/graph_execute.cc
Unescape View File

@ -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"

4
ge/graph/load/graph_loader.cc
Unescape View File

@ -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"

2
ge/graph/load/new_model_manager/aipp_utils.cc → ge/graph/load/model_manager/aipp_utils.cc
Unescape View File

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

0
ge/graph/load/new_model_manager/aipp_utils.h → ge/graph/load/model_manager/aipp_utils.h
Unescape View File

2
ge/graph/load/new_model_manager/cpu_queue_schedule.cc → ge/graph/load/model_manager/cpu_queue_schedule.cc
Unescape View File

@ -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"

4
ge/graph/load/new_model_manager/cpu_queue_schedule.h → ge/graph/load/model_manager/cpu_queue_schedule.h
Unescape View File

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

4
ge/graph/load/new_model_manager/data_dumper.cc → ge/graph/load/model_manager/data_dumper.cc
Unescape View File

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

0
ge/graph/load/new_model_manager/data_dumper.h → ge/graph/load/model_manager/data_dumper.h
Unescape View File

2
ge/graph/load/new_model_manager/data_inputer.cc → ge/graph/load/model_manager/data_inputer.cc
Unescape View File

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

0
ge/graph/load/new_model_manager/data_inputer.h → ge/graph/load/model_manager/data_inputer.h
Unescape View File

8
ge/graph/load/new_model_manager/davinci_model.cc → ge/graph/load/model_manager/davinci_model.cc
Unescape View File

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

12
ge/graph/load/new_model_manager/davinci_model.h → ge/graph/load/model_manager/davinci_model.h
Unescape View File

@ -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"

2
ge/graph/load/new_model_manager/davinci_model_parser.cc → ge/graph/load/model_manager/davinci_model_parser.cc
Unescape View File

@ -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() {}

0
ge/graph/load/new_model_manager/davinci_model_parser.h → ge/graph/load/model_manager/davinci_model_parser.h
Unescape View File

6
ge/graph/load/new_model_manager/model_manager.cc → ge/graph/load/model_manager/model_manager.cc
Unescape View File

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

0
ge/graph/load/new_model_manager/model_manager.h → ge/graph/load/model_manager/model_manager.h
Unescape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save