diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d9c3a6..776a3232 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,8 @@ if (ENABLE_OPEN_SRC) find_module(error_manager_static liberror_manager.a ${GE_LIB_PATH}) find_module(msprofiler_fwk libmsprofiler_fwk.a ${GE_LIB_PATH}) #find_module(ascendcl_static libascendcl.a ${GE_LIB_PATH}) + elseif(ENABLE_GE_COV OR ENABLE_GE_UT) + add_subdirectory(tests) else() find_module(slog libslog.so ${ASCEND_ATC_DIR}) find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR}) @@ -132,11 +134,6 @@ if (ENABLE_OPEN_SRC) else() message(STATUS "PLATFORM param is invalid, should be train or inference, you choose nothing!") endif() - - if (ENABLE_GE_COV OR ENABLE_GE_UT) - add_subdirectory(tests) - endif() - endif() set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef) diff --git a/metadef b/metadef index 129b50b4..5546f5f4 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 129b50b41f79d0dfeb9fe8987b1c19c9ac51eb8b +Subproject commit 5546f5f4701130f2dd11a6d69817dc37d52c497e diff --git a/parser b/parser index e9f7d019..427477d9 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit e9f7d0197aba57eb5247cb1e029c10e393631c89 +Subproject commit 427477d9ec1c586b33670330b54abb8baf56da5b diff --git a/tests/ut/common/graph/CMakeLists.txt b/tests/ut/common/graph/CMakeLists.txt index e627d43f..99b21182 100644 --- a/tests/ut/common/graph/CMakeLists.txt +++ b/tests/ut/common/graph/CMakeLists.txt @@ -61,41 +61,44 @@ set(UT_FILES ) set(SRC_FILES - #"${GE_CODE_DIR}/metadef/graph/option/ge_local_context.cc" - #"${GE_CODE_DIR}/metadef/graph/option/ge_context.cc" - #"${GE_CODE_DIR}/metadef/graph/anchor.cc" - #"${GE_CODE_DIR}/metadef/graph/ge_attr_value.cc" - #"${GE_CODE_DIR}/metadef/graph/attr_value.cc" - #"${GE_CODE_DIR}/metadef/graph/buffer.cc" - #"${GE_CODE_DIR}/metadef/graph/compute_graph.cc" - #"${GE_CODE_DIR}/metadef/graph/ge_attr_define.cc" - #"${GE_CODE_DIR}/metadef/graph/graph.cc" - #"${GE_CODE_DIR}/metadef/graph/gnode.cc" - #"${GE_CODE_DIR}/metadef/graph/ascend_string.cc" - #"${GE_CODE_DIR}/metadef/graph/model.cc" - #"${GE_CODE_DIR}/metadef/graph/model_serialize.cc" - #"${GE_CODE_DIR}/metadef/graph/node.cc" - #"${GE_CODE_DIR}/metadef/graph/op_desc.cc" - #"${GE_CODE_DIR}/metadef/graph/operator.cc" - #"${GE_CODE_DIR}/metadef/graph/operator_reg.cc" - #"${GE_CODE_DIR}/metadef/graph/operator_factory.cc" - #"${GE_CODE_DIR}/metadef/graph/operator_factory_impl.cc" - #"${GE_CODE_DIR}/metadef/graph/range_vistor.cc" - #"${GE_CODE_DIR}/metadef/graph/tensor.cc" - #"${GE_CODE_DIR}/metadef/graph/ge_tensor.cc" - #"${GE_CODE_DIR}/metadef/graph/shape_refiner.cc" - #"${GE_CODE_DIR}/metadef/graph/format_refiner.cc" - #"${GE_CODE_DIR}/metadef/graph/inference_context.cc" - #"${GE_CODE_DIR}/metadef/graph/detail/attributes_holder.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/anchor_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/graph_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/node_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/op_desc_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/type_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/ge_ir_utils.cc" - #"${GE_CODE_DIR}/metadef/graph/utils/tensor_utils.cc" + "${GE_CODE_DIR}/metadef/graph/option/ge_local_context.cc" + "${GE_CODE_DIR}/metadef/graph/option/ge_context.cc" + "${GE_CODE_DIR}/metadef/graph/anchor.cc" + "${GE_CODE_DIR}/metadef/graph/ge_attr_value.cc" + "${GE_CODE_DIR}/metadef/graph/attr_value.cc" + "${GE_CODE_DIR}/metadef/graph/buffer.cc" + "${GE_CODE_DIR}/metadef/graph/compute_graph.cc" + "${GE_CODE_DIR}/metadef/graph/ge_attr_define.cc" + "${GE_CODE_DIR}/metadef/graph/graph.cc" + "${GE_CODE_DIR}/metadef/graph/gnode.cc" + "${GE_CODE_DIR}/metadef/graph/ascend_string.cc" + "${GE_CODE_DIR}/metadef/graph/model.cc" + "${GE_CODE_DIR}/metadef/graph/model_serialize.cc" + "${GE_CODE_DIR}/metadef/graph/node.cc" + "${GE_CODE_DIR}/metadef/graph/op_desc.cc" + "${GE_CODE_DIR}/metadef/graph/operator.cc" + "${GE_CODE_DIR}/metadef/graph/operator_factory.cc" + "${GE_CODE_DIR}/metadef/graph/operator_factory_impl.cc" + "${GE_CODE_DIR}/metadef/graph/tensor.cc" + "${GE_CODE_DIR}/metadef/graph/ge_tensor.cc" + "${GE_CODE_DIR}/metadef/graph/shape_refiner.cc" + "${GE_CODE_DIR}/metadef/graph/format_refiner.cc" + "${GE_CODE_DIR}/metadef/graph/inference_context.cc" + "${GE_CODE_DIR}/metadef/graph/detail/attributes_holder.cc" + "${GE_CODE_DIR}/metadef/graph/utils/anchor_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/graph_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/node_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/op_desc_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/type_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/ge_ir_utils.cc" + "${GE_CODE_DIR}/metadef/graph/utils/tensor_utils.cc" "${GE_CODE_DIR}/metadef/ops/op_imp.cpp" - #"${GE_CODE_DIR}/metadef/graph/opsproto/opsproto_manager.cc" + "${GE_CODE_DIR}/metadef/graph/opsproto/opsproto_manager.cc" + "${GE_CODE_DIR}/metadef/graph/utils/transformer_utils.cc" + "${GE_CODE_DIR}/metadef/graph/runtime_inference_context.cc" + "${GE_CODE_DIR}/metadef/graph/ref_relation.cc" + "${GE_CODE_DIR}/metadef/third_party/transformer/src/transfer_shape_according_to_format.cpp" + "${GE_CODE_DIR}/metadef/third_party/transformer/src/axis_util.cpp" ) #add_executable(ut_libgraph ${UT_FILES} ${SRC_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) @@ -111,12 +114,13 @@ target_compile_definitions(ut_libgraph PRIVATE target_link_libraries(ut_libgraph $ - graph gtest gtest_main slog_stub ascend_protobuf c_sec + error_manager_stub + mmpa_stub -lrt -ldl -lgcov