diff --git a/metadef b/metadef index 8fb59a0..4f61fa7 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 8fb59a00c6291207f3491fee0c4064efff94d79f +Subproject commit 4f61fa7a7181e0e7dbdd4acbfaf99088a58d920d diff --git a/tests/depends/mmpa/CMakeLists.txt b/tests/depends/mmpa/CMakeLists.txt index 1bdb1fb..ab6f322 100644 --- a/tests/depends/mmpa/CMakeLists.txt +++ b/tests/depends/mmpa/CMakeLists.txt @@ -29,8 +29,8 @@ include_directories(${PARSER_DIR}/metadef/metadef/inc) include_directories(${PARSER_DIR}/metadef/inc/framework) include_directories(${PARSER_DIR}/metadef/metadef/inc/external) -add_library(mmpa_stub SHARED ${SRCS}) -target_link_libraries(mmpa_stub PRIVATE +add_library(parser_mmpa_stub SHARED ${SRCS}) +target_link_libraries(parser_mmpa_stub PRIVATE $ -Wl,--no-as-needed ascend_protobuf diff --git a/tests/depends/profiler/CMakeLists.txt b/tests/depends/profiler/CMakeLists.txt index aa66125..1cfa4f6 100644 --- a/tests/depends/profiler/CMakeLists.txt +++ b/tests/depends/profiler/CMakeLists.txt @@ -14,15 +14,15 @@ # ============================================================================ #cmake_minimum_required(VERSION 2.8) -project(profiler_stub) +project(parser_profiler_stub) file(GLOB_RECURSE SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/profiler_stub.cc" ) include_directories(${PARSER_DIR}/metadef/third_party/fwkacllib/inc) -add_library(profiler_stub SHARED ${SRC_FILES}) +add_library(parser_profiler_stub SHARED ${SRC_FILES}) -target_link_libraries(profiler_stub PRIVATE +target_link_libraries(parser_profiler_stub PRIVATE $ ) diff --git a/tests/depends/slog/CMakeLists.txt b/tests/depends/slog/CMakeLists.txt index a8ae515..89eb63e 100644 --- a/tests/depends/slog/CMakeLists.txt +++ b/tests/depends/slog/CMakeLists.txt @@ -14,13 +14,13 @@ # ============================================================================ #cmake_minimum_required(VERSION 2.8) -project(slog_stub) +project(parser_slog_stub) file(GLOB_RECURSE SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cc" ) include_directories(${PARSER_DIR}/metadef/third_party/fwkacllib/inc) -add_library(slog_stub SHARED ${SRC_FILES}) -target_link_libraries(slog_stub PRIVATE +add_library(parser_slog_stub SHARED ${SRC_FILES}) +target_link_libraries(parser_slog_stub PRIVATE $ ) diff --git a/tests/st/CMakeLists.txt b/tests/st/CMakeLists.txt index 76f2088..37daffc 100644 --- a/tests/st/CMakeLists.txt +++ b/tests/st/CMakeLists.txt @@ -135,6 +135,7 @@ set(MATEDEF_SRC_FILES "${PARSER_DIR}/metadef/third_party/transformer/src/axis_util.cc" "${PARSER_DIR}/metadef/third_party/transformer/src/expand_dimension.cc" "${PARSER_DIR}/metadef/third_party/transformer/src/transfer_shape_according_to_format.cc" + "${PARSER_DIR}/metadef/third_party/transformer/src/transfer_shape_utils.cc" ) # include directories @@ -374,6 +375,6 @@ target_link_libraries(st_parser st_parser_proto json -Wl,--whole-archive st_parser_common -Wl,--no-whole-archive - st_parser_graph st_parser_register error_manager_stub mmpa_stub attr_util_stub - gtest gtest_main slog_stub ascend_protobuf c_sec -lrt -ldl -lgcov + st_parser_graph st_parser_register error_manager_stub parser_mmpa_stub attr_util_stub + gtest gtest_main parser_slog_stub ascend_protobuf c_sec -lrt -ldl -lgcov ) diff --git a/tests/ut/parser/CMakeLists.txt b/tests/ut/parser/CMakeLists.txt index 8fb87b1..b42c582 100644 --- a/tests/ut/parser/CMakeLists.txt +++ b/tests/ut/parser/CMakeLists.txt @@ -136,6 +136,7 @@ set(MATEDEF_SRC_FILES "${PARSER_DIR}/metadef/third_party/transformer/src/axis_util.cc" "${PARSER_DIR}/metadef/third_party/transformer/src/expand_dimension.cc" "${PARSER_DIR}/metadef/third_party/transformer/src/transfer_shape_according_to_format.cc" + "${PARSER_DIR}/metadef/third_party/transformer/src/transfer_shape_utils.cc" ) # include directories @@ -377,6 +378,6 @@ target_link_libraries(ut_parser $ ut_parser_proto -Wl,--whole-archive ut_parser_common -Wl,--no-whole-archive - ut_parser_graph ut_parser_register error_manager_stub mmpa_stub attr_util_stub - gtest gtest_main slog_stub ascend_protobuf c_sec json -lrt -ldl -lgcov + ut_parser_graph ut_parser_register error_manager_stub parser_mmpa_stub attr_util_stub + gtest gtest_main parser_slog_stub ascend_protobuf c_sec json -lrt -ldl -lgcov )