From 61d10fa6c6a3c63848c87884a31a35254a774cde Mon Sep 17 00:00:00 2001 From: zhangxiaokun Date: Mon, 19 Jul 2021 16:13:08 +0800 Subject: [PATCH] link so for ge_runner --- ge/CMakeLists.txt | 58 ++++++-------------------------- ge/common/CMakeLists.txt | 4 +++ ge/graph/passes/dimension_adjust_pass.cc | 2 ++ ge/graph/passes/dimension_adjust_pass.h | 2 -- ge/offline/CMakeLists.txt | 3 +- 5 files changed, 19 insertions(+), 50 deletions(-) diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index cbcc0854..534c0c30 100755 --- a/ge/CMakeLists.txt +++ b/ge/CMakeLists.txt @@ -115,9 +115,9 @@ set(EXECUTOR_SRC_LIST "common/ge/op_tiling_manager.cc" "common/ge/plugin_manager.cc" "common/profiling/ge_profiling.cc" - "common/profiling/profiling_manager.cc" + #"common/profiling/profiling_manager.cc" "executor/ge_executor.cc" - "ge_local_engine/engine/host_cpu_engine.cc" + #"ge_local_engine/engine/host_cpu_engine.cc" "graph/execute/graph_execute.cc" "graph/execute/model_executor.cc" "graph/load/graph_loader.cc" @@ -165,45 +165,10 @@ set(EXECUTOR_SRC_LIST "graph/manager/util/debug.cc" #"graph/manager/util/hcom_util.cc" # Just for runner. "graph/passes/pass_utils.cc" - "host_kernels/add_kernel.cc" - "host_kernels/broadcast_args_kernel.cc" - "host_kernels/broadcast_gradient_args_kernel.cc" - "host_kernels/cast_kernel.cc" - "host_kernels/concat_offset_kernel.cc" - "host_kernels/concat_v2_kernel.cc" - "host_kernels/dynamic_stitch_kernel.cc" - "host_kernels/empty_kernel.cc" - "host_kernels/expanddims_kernel.cc" - "host_kernels/fill_kernel.cc" - "host_kernels/floordiv_kernel.cc" - "host_kernels/floormod_kernel.cc" - "host_kernels/gather_v2_kernel.cc" - "host_kernels/greater_kernel.cc" - "host_kernels/identity_kernel.cc" - "host_kernels/kernel_utils.cc" - "host_kernels/maximum_kernel.cc" - "host_kernels/mul_kernel.cc" - "host_kernels/pack_kernel.cc" - "host_kernels/permute_kernel.cc" - "host_kernels/range_kernel.cc" "host_kernels/rank_kernel.cc" - "host_kernels/reduce_prod_kernel.cc" - "host_kernels/reformat_kernel.cc" - "host_kernels/reshape_kernel.cc" - "host_kernels/rsqrt_kernel.cc" "host_kernels/shape_kernel.cc" "host_kernels/shape_n_kernel.cc" "host_kernels/size_kernel.cc" - "host_kernels/slice_d_kernel.cc" - "host_kernels/slice_kernel.cc" - "host_kernels/squeeze_kernel.cc" - "host_kernels/ssd_prior_box_kernel.cc" - "host_kernels/strided_slice_kernel.cc" - "host_kernels/sub_kernel.cc" - "host_kernels/transdata_kernel.cc" - "host_kernels/transpose_kernel.cc" - "host_kernels/unpack_kernel.cc" - "host_kernels/unsqueeze_kernel.cc" "hybrid/common/npu_memory_allocator.cc" "hybrid/common/tensor_value.cc" "hybrid/executor/hybrid_execution_context.cc" @@ -240,7 +205,7 @@ set(EXECUTOR_SRC_LIST "hybrid/node_executor/rts/rts_node_task.cc" "hybrid/node_executor/rts/rts_task_factory.cc" "hybrid/node_executor/task_context.cc" - "opskernel_manager/ops_kernel_builder_manager.cc" + #"opskernel_manager/ops_kernel_builder_manager.cc" "single_op/single_op.cc" "single_op/single_op_manager.cc" "single_op/single_op_model.cc" @@ -259,9 +224,9 @@ set(COMPILER_SRC_LIST "common/dump/dump_op.cc" "common/ge/op_tiling_manager.cc" "common/ge/plugin_manager.cc" - "common/profiling/profiling_manager.cc" + #"common/profiling/profiling_manager.cc" "engine_manager/dnnengine_manager.cc" - "ge_local_engine/engine/host_cpu_engine.cc" + #"ge_local_engine/engine/host_cpu_engine.cc" "ge_opt_info/ge_opt_info.cc" "generator/ge_generator.cc" "generator/generator_api.cc" @@ -442,14 +407,13 @@ set(COMPILER_SRC_LIST "host_kernels/transpose_kernel.cc" "host_kernels/unpack_kernel.cc" "host_kernels/unsqueeze_kernel.cc" - "hybrid/node_executor/aicpu/aicpu_ext_info.cc" "init/gelib.cc" "ir_build/attr_options/keep_dtype_option.cc" "ir_build/attr_options/utils.cc" "ir_build/attr_options/weight_compress_option.cc" "ir_build/ge_ir_build.cc" "ir_build/option_utils.cc" - "opskernel_manager/ops_kernel_builder_manager.cc" + #"opskernel_manager/ops_kernel_builder_manager.cc" "opskernel_manager/ops_kernel_manager.cc" ) @@ -469,8 +433,6 @@ if (NOT ENABLE_D AND NOT ENABLE_ACL AND NOT ENABLE_MS_TESTCASES) message("CMAKE_CXX_COMPILER_VERSION = ${CMAKE_CXX_COMPILER_VERSION}") ############ libge_runner.so ############ add_library(ge_runner SHARED - ${EXECUTOR_SRC_LIST} - ${COMPILER_SRC_LIST} ${RUNNER_SRC_LIST} $,msprofiler_fwk,msprofiler_fwk_object>> ) @@ -546,7 +508,9 @@ target_link_libraries(ge_runner PRIVATE $<$>:$> adump_server static_mmpa - ge_proto_common + ge_compiler + #ge_proto_common + ge_executor_shared ge_proto_client -Wl,--no-as-needed graph @@ -586,7 +550,7 @@ target_compile_definitions(ge_compiler PRIVATE target_compile_options(ge_compiler PRIVATE -O2 -fno-common - -fvisibility=hidden + -fvisibility=default $<$:-Werror=unused-variable> $<$:-Werror=unused-const-variable -Werror=format> ) @@ -720,7 +684,7 @@ target_compile_options(ge_executor_shared PRIVATE -Werror -O2 -Wno-deprecated-declarations - -fvisibility=hidden + -fvisibility=default ) target_compile_definitions(ge_executor_shared PRIVATE diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index f5cb6dd9..e0fb07f5 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -53,6 +53,10 @@ set(SRC_LIST "${GE_CODE_DIR}/ge/graph/manager/graph_var_manager.cc" "${GE_CODE_DIR}/ge/graph/manager/graph_manager_utils.cc" "${GE_CODE_DIR}/ge/graph/build/memory/var_mem_assign_util.cc" + #### all in one test #### + "${GE_CODE_DIR}/ge/common/profiling/profiling_manager.cc" + "${GE_CODE_DIR}/ge/ge_local_engine/engine/host_cpu_engine.cc" + "${GE_CODE_DIR}/ge/opskernel_manager/ops_kernel_builder_manager.cc" ) if (NOT ENABLE_D AND NOT ENABLE_ACL) diff --git a/ge/graph/passes/dimension_adjust_pass.cc b/ge/graph/passes/dimension_adjust_pass.cc index 03cf3053..d8eb0afa 100755 --- a/ge/graph/passes/dimension_adjust_pass.cc +++ b/ge/graph/passes/dimension_adjust_pass.cc @@ -20,6 +20,8 @@ #include #include #include "graph/utils/node_utils.h" +#include "inc/kernel.h" +#include "inc/kernel_factory.h" namespace ge { namespace { diff --git a/ge/graph/passes/dimension_adjust_pass.h b/ge/graph/passes/dimension_adjust_pass.h index cba283ed..34baa28e 100755 --- a/ge/graph/passes/dimension_adjust_pass.h +++ b/ge/graph/passes/dimension_adjust_pass.h @@ -26,8 +26,6 @@ #include "graph/utils/attr_utils.h" #include "graph/utils/graph_utils.h" #include "graph/utils/op_desc_utils.h" -#include "inc/kernel.h" -#include "inc/kernel_factory.h" #include "graph/passes/pass_utils.h" namespace ge { diff --git a/ge/offline/CMakeLists.txt b/ge/offline/CMakeLists.txt index 935d8a30..72ecca38 100644 --- a/ge/offline/CMakeLists.txt +++ b/ge/offline/CMakeLists.txt @@ -2,7 +2,6 @@ set(SRC_LIST "main.cc" "single_op_parser.cc" "../session/omg.cc" - "../ir_build/option_utils.cc" ) ############ atc_atc.bin ############ @@ -127,6 +126,8 @@ target_link_libraries(fwk_atc.bin PRIVATE graph error_manager ge_runner + ge_compiler + ge_executor_shared parser_common gflags json