From 374dc70de0fd26b597911e36e2b319fe5df45a44 Mon Sep 17 00:00:00 2001 From: zhou_chao1993 Date: Wed, 9 Jun 2021 11:56:46 +0800 Subject: [PATCH] modify camel --- ge/CMakeLists.txt | 168 ++++++++++++++++++++++++----------------------- ge/common/CMakeLists.txt | 1 - ge/ge_runner.mk | 26 -------- 3 files changed, 85 insertions(+), 110 deletions(-) diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index fb5b2ef6..68cb616c 100755 --- a/ge/CMakeLists.txt +++ b/ge/CMakeLists.txt @@ -111,34 +111,34 @@ endif () ################################################################## set(TRAIN_SRC_LIST - "common/formats/format_transfers/datatype_transfer.cc" - "common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc" - "common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc" - "common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc" - "common/formats/format_transfers/format_transfer_fractal_nz.cc" - "common/formats/format_transfers/format_transfer_fractal_z.cc" - "common/formats/format_transfers/format_transfer_fractal_zz.cc" - "common/formats/format_transfers/format_transfer_fracz_hwcn.cc" - "common/formats/format_transfers/format_transfer_fracz_nchw.cc" - "common/formats/format_transfers/format_transfer_fracz_nhwc.cc" - "common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc" - "common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc" - "common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc" - "common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" - "common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc" - "common/formats/format_transfers/format_transfer_transpose.cc" - "common/formats/formats.cc" - "common/formats/utils/formats_trans_utils.cc" - "common/fp16_t.cc" + #"common/formats/format_transfers/datatype_transfer.cc" + #"common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc" + #"common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc" + #"common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc" + #"common/formats/format_transfers/format_transfer_fractal_nz.cc" + #"common/formats/format_transfers/format_transfer_fractal_z.cc" + #"common/formats/format_transfers/format_transfer_fractal_zz.cc" + #"common/formats/format_transfers/format_transfer_fracz_hwcn.cc" + #"common/formats/format_transfers/format_transfer_fracz_nchw.cc" + #"common/formats/format_transfers/format_transfer_fracz_nhwc.cc" + #"common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc" + #"common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc" + #"common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc" + #"common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" + #"common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc" + #"common/formats/format_transfers/format_transfer_transpose.cc" + #"common/formats/formats.cc" + #"common/formats/utils/formats_trans_utils.cc" + #"common/fp16_t.cc" "common/ge/plugin_manager.cc" "common/ge/op_tiling_manager.cc" "common/helper/model_cache_helper.cc" "common/profiling/profiling_manager.cc" - "common/dump/dump_manager.cc" - "common/dump/exception_dumper.cc" - "common/dump/dump_properties.cc" - "common/dump/opdebug_register.cc" - "common/dump/dump_op.cc" + #"common/dump/dump_manager.cc" + #"common/dump/exception_dumper.cc" + #"common/dump/dump_properties.cc" + #"common/dump/opdebug_register.cc" + #"common/dump/dump_op.cc" "common/profiling/ge_profiling.cc" "common/profiling/ge_runner_profiling.cc" "engine_manager/dnnengine_manager.cc" @@ -359,7 +359,7 @@ set(TRAIN_SRC_LIST "graph/passes/parallel_group_pass.cc" "graph/passes/set_input_output_offset_pass.cc" "graph/passes/buffer_pool_memory_pass.cc" - "graph/preprocess/graph_preprocess.cc" + #"graph/preprocess/graph_preprocess.cc" "graph/preprocess/insert_op/ge_aipp_op.cc" "graph/preprocess/insert_op/util_insert_aipp_op.cc" "graph/preprocess/multi_batch_options.cc" @@ -445,32 +445,32 @@ set(TRAIN_SRC_LIST set(INFER_SRC_LIST "graph/manager/trans_var_data_utils.cc" "common/fp16_t.cc" - "common/formats/utils/formats_trans_utils.cc" - "common/formats/format_transfers/datatype_transfer.cc" - "common/formats/format_transfers/format_transfer_transpose.cc" - "common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" - "common/formats/format_transfers/format_transfer_fractal_z.cc" - "common/formats/format_transfers/format_transfer_fractal_nz.cc" - "common/formats/format_transfers/format_transfer_fractal_zz.cc" - "common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc" - "common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc" - "common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc" - "common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc" - "common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc" - "common/formats/format_transfers/format_transfer_fracz_nchw.cc" - "common/formats/format_transfers/format_transfer_fracz_nhwc.cc" - "common/formats/format_transfers/format_transfer_fracz_hwcn.cc" - "common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc" - "common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc" - "common/formats/format_transfers/format_transfer_nchw_fz_c04.cc" - "common/formats/formats.cc" + #"common/formats/utils/formats_trans_utils.cc" + #"common/formats/format_transfers/datatype_transfer.cc" + #"common/formats/format_transfers/format_transfer_transpose.cc" + #"common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" + #"common/formats/format_transfers/format_transfer_fractal_z.cc" + #"common/formats/format_transfers/format_transfer_fractal_nz.cc" + #"common/formats/format_transfers/format_transfer_fractal_zz.cc" + #"common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc" + #"common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc" + #"common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc" + #"common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc" + #"common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc" + #"common/formats/format_transfers/format_transfer_fracz_nchw.cc" + #"common/formats/format_transfers/format_transfer_fracz_nhwc.cc" + #"common/formats/format_transfers/format_transfer_fracz_hwcn.cc" + #"common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc" + #"common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc" + #"common/formats/format_transfers/format_transfer_nchw_fz_c04.cc" + #"common/formats/formats.cc" "common/profiling/profiling_manager.cc" - "common/dump/dump_properties.cc" - "common/dump/exception_dumper.cc" - "common/dump/dump_manager.cc" - "common/dump/dump_op.cc" - "common/dump/opdebug_register.cc" - "common/dump/dump_server.cc" + #"common/dump/dump_properties.cc" + #"common/dump/exception_dumper.cc" + #"common/dump/dump_manager.cc" + #"common/dump/dump_op.cc" + #"common/dump/opdebug_register.cc" + #"common/dump/dump_server.cc" "common/helper/model_cache_helper.cc" "ge_local_engine/engine/host_cpu_engine.cc" "common/ge/plugin_manager.cc" @@ -487,8 +487,8 @@ set(INFER_SRC_LIST "graph/preprocess/graph_preprocess.cc" "graph/preprocess/multi_batch_options.cc" "graph/preprocess/multi_batch_copy_graph.cc" - "graph/execute/graph_execute.cc" - "graph/load/graph_loader.cc" + #"graph/execute/graph_execute.cc" + #"graph/load/graph_loader.cc" "graph/optimize/graph_optimize.cc" "graph/optimize/mem_rw_conflict_optimize.cc" "graph/optimize/summary_optimize.cc" @@ -656,37 +656,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/model_manager/model_manager.cc" - "graph/load/model_manager/data_inputer.cc" - "graph/load/model_manager/davinci_model.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" - "hybrid/hybrid_davinci_model_stub.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/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" + #"hybrid/hybrid_davinci_model_stub.cc" "ir_build/ge_ir_build.cc" "ir_build/attr_options/utils.cc" "ir_build/attr_options/keep_dtype_option.cc" @@ -797,6 +797,8 @@ target_link_libraries(ge_runner PRIVATE -Wl,--no-as-needed graph ge_common + ge_executor + ge_compiler ascend_protobuf register c_sec diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index 7974a46d..176b6d29 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -11,7 +11,6 @@ set(SRC_LIST "math/fp16_math.cc" "debug/memory_dumper.cc" "formats/utils/formats_trans_utils.cc" - "dump/dump_properties.cc" "formats/format_transfers/datatype_transfer.cc" "formats/format_transfers/format_transfer_transpose.cc" "formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" diff --git a/ge/ge_runner.mk b/ge/ge_runner.mk index 8ca8572c..3364400b 100644 --- a/ge/ge_runner.mk +++ b/ge/ge_runner.mk @@ -3,32 +3,10 @@ include $(LOCAL_PATH)/stub/Makefile LIBGE_LOCAL_SRC_FILES := \ proto/fusion_model.proto \ proto/optimizer_priority.proto \ - common/formats/format_transfers/datatype_transfer.cc \ - common/formats/format_transfers/format_transfer_c1hwncoc0_hwcn.cc \ - common/formats/format_transfers/format_transfer_dhwcn_fracz3D.cc \ - common/formats/format_transfers/format_transfer_dhwnc_fracz3D_transpose.cc \ - common/formats/format_transfers/format_transfer_fractal_nz.cc \ - common/formats/format_transfers/format_transfer_fractal_z.cc \ - common/formats/format_transfers/format_transfer_fractal_zz.cc \ - common/formats/format_transfers/format_transfer_fracz_hwcn.cc \ - common/formats/format_transfers/format_transfer_fracz_nchw.cc \ - common/formats/format_transfers/format_transfer_fracz_nhwc.cc \ - common/formats/format_transfers/format_transfer_hwcn_c1hwncoc0.cc \ - common/formats/format_transfers/format_transfer_nc1hwc0_nchw.cc \ - common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc \ - common/formats/format_transfers/format_transfer_nchw_nc1hwc0.cc \ - common/formats/format_transfers/format_transfer_nhwc_nc1hwc0.cc \ - common/formats/format_transfers/format_transfer_transpose.cc \ - common/formats/formats.cc \ - common/formats/utils/formats_trans_utils.cc \ - common/fp16_t.cc \ common/ge/plugin_manager.cc\ common/ge/op_tiling_manager.cc\ common/helper/model_cache_helper.cc \ common/profiling/profiling_manager.cc \ - common/dump/dump_manager.cc \ - common/dump/dump_properties.cc \ - common/dump/dump_op.cc \ common/profiling/ge_profiling.cc \ common/profiling/ge_runner_profiling.cc \ engine_manager/dnnengine_manager.cc \ @@ -43,10 +21,6 @@ LIBGE_LOCAL_SRC_FILES := \ graph/build/stream_allocator.cc \ graph/build/stream_graph_optimizer.cc \ graph/build/task_generator.cc \ - graph/common/bcast.cc \ - graph/common/local_context.cc \ - graph/common/omg_util.cc \ - graph/common/transop_util.cc \ graph/execute/graph_execute.cc \ graph/label/case_label_maker.cc \ graph/label/if_label_maker.cc \