From 86bb779ceee4f8711f7fe3623bec12833b3b6ea6 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Thu, 24 Dec 2020 20:43:58 +0800 Subject: [PATCH 1/9] update c76 submodule --- ge/graph/load/new_model_manager/zero_copy_task.h | 6 +----- metadef | 2 +- parser | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ge/graph/load/new_model_manager/zero_copy_task.h b/ge/graph/load/new_model_manager/zero_copy_task.h index d0bb2b6d..d3d7ebdb 100644 --- a/ge/graph/load/new_model_manager/zero_copy_task.h +++ b/ge/graph/load/new_model_manager/zero_copy_task.h @@ -71,8 +71,7 @@ class ZeroCopyTask { * @param [in] batch_label: batch label. * @return: 0 SUCCESS / others FAILED */ - ge::Status UpdateTaskParam(uintptr_t addr, void *buffer_addr, const map> &batch_addrs, - const string &batch_label); + ge::Status UpdateTaskParam(uintptr_t addr, void *buffer_addr); /** * @ingroup ge @@ -91,9 +90,6 @@ class ZeroCopyTask { return batch_label_; } - protected: - bool CheckDynamicBatch(const map> &batch_addrs, const string &batch_label, uintptr_t addr); - private: const string name_; diff --git a/metadef b/metadef index a71110f5..c3269edc 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit a71110f5e42dc768ddbbd51289eb467518dedf9b +Subproject commit c3269edc0ec089dce4ae2e80f41fea42a57e7b6f diff --git a/parser b/parser index 2e55b116..0a8a3210 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 2e55b1168df38cd3c76412a8d00bc8b6e7f19f82 +Subproject commit 0a8a3210e39fd602f68169a558b18a5f855f9fb0 From eaeaec68ff5dafbd500a1a2f274ddb2559d2ee85 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Thu, 24 Dec 2020 20:57:32 +0800 Subject: [PATCH 2/9] update slog to alog --- CMakeLists.txt | 12 ++++++------ ge/CMakeLists.txt | 6 +++--- ge/common/CMakeLists.txt | 4 ++-- ge/executor/CMakeLists.txt | 2 +- ge/ge_local_engine/CMakeLists.txt | 8 ++++---- ge/ge_runtime/CMakeLists.txt | 2 +- ge/host_cpu_engine/CMakeLists.txt | 8 ++++---- ge/offline/CMakeLists.txt | 6 +++--- ge/plugin/engine/CMakeLists.txt | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 776a3232..1d1ae2cb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,10 +52,10 @@ if (ENABLE_OPEN_SRC) include(cmake/FindModule.cmake) include(cmake/intf_pub_linux.cmake) - # for CPU/GPU mode, find c_sec and slog from local prebuild + # for CPU/GPU mode, find c_sec and alog from local prebuild #if(NOT ENABLE_D AND NOT GE_ONLY) # set(GE_PREBUILD_PATH ${GE_CODE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR}) - # find_module(slog libslog.so ${GE_PREBUILD_PATH}) + # find_module(alog libalog.so ${GE_PREBUILD_PATH}) # if D_LINK_PATH is set in environment variables, search libraries in given path if(DEFINED ENV{D_LINK_PATH}) # D_LINK_PATH is set @@ -72,7 +72,7 @@ if (ENABLE_OPEN_SRC) endif() set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH}) set(STATIC_ACL_LIB ${GE_LIB_PATH}) - find_module(slog libslog.so ${GE_LIB_PATH}) + find_module(alog libalog.so ${GE_LIB_PATH}) find_module(static_mmpa libmmpa.a ${GE_LIB_PATH}) find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH}) find_module(hccl libhccl.so ${GE_LIB_PATH}) @@ -88,7 +88,7 @@ if (ENABLE_OPEN_SRC) elseif(ENABLE_GE_COV OR ENABLE_GE_UT) add_subdirectory(tests) else() - find_module(slog libslog.so ${ASCEND_ATC_DIR}) + find_module(alog libalog.so ${ASCEND_ATC_DIR}) find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR}) if(PLATFORM STREQUAL "train") @@ -154,7 +154,7 @@ elseif (ENABLE_D OR ENABLE_ACL) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(slog libslog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(alog libalog.so ${ASCEND_MS_DRIVER_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) @@ -174,7 +174,7 @@ elseif(ENABLE_MS_TESTCASES) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(slog libslog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(alog libalog.so ${ASCEND_MS_DRIVER_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index 3a0f7638..af841a63 100755 --- a/ge/CMakeLists.txt +++ b/ge/CMakeLists.txt @@ -662,7 +662,7 @@ target_link_libraries(ge_runner PRIVATE ascend_protobuf register c_sec - slog + alog runtime resource error_manager @@ -726,7 +726,7 @@ target_link_libraries(ge_compiler PRIVATE register c_sec error_manager - slog + alog runtime_compile resource -Wl,--as-needed @@ -793,7 +793,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE -Wl,--no-as-needed c_sec runtime - slog + alog ascend_hal_stub -Wl,--as-needed -lrt diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index 05838df8..ab0527e0 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -113,7 +113,7 @@ target_link_libraries(ge_common PRIVATE register c_sec error_manager - slog + alog -Wl,--as-needed json $<$>:-lrt> @@ -212,7 +212,7 @@ target_link_libraries(ge_common PRIVATE register c_sec error_manager - slog + alog static_mmpa -Wl,--as-needed json diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt index d59afd03..e6ddb7c3 100644 --- a/ge/executor/CMakeLists.txt +++ b/ge/executor/CMakeLists.txt @@ -242,7 +242,7 @@ target_link_libraries(ge_executor_shared PRIVATE -Wl,--no-as-needed ge_common runtime - slog + alog mmpa graph register diff --git a/ge/ge_local_engine/CMakeLists.txt b/ge/ge_local_engine/CMakeLists.txt index 8f5c9777..d4602ec0 100755 --- a/ge/ge_local_engine/CMakeLists.txt +++ b/ge/ge_local_engine/CMakeLists.txt @@ -57,7 +57,7 @@ target_link_libraries(ge_local_engine PRIVATE ascend_protobuf register c_sec - slog + alog runtime -Wl,--as-needed ) @@ -99,7 +99,7 @@ target_link_libraries(atc_ge_local_engine PRIVATE ascend_protobuf register c_sec - slog + alog runtime_compile -Wl,--as-needed ) @@ -143,7 +143,7 @@ target_link_libraries(ge_local_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - slog + alog register graph -Wl,--as-needed @@ -183,7 +183,7 @@ target_link_libraries(atc_ge_local_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - slog + alog register graph -Wl,--as-needed diff --git a/ge/ge_runtime/CMakeLists.txt b/ge/ge_runtime/CMakeLists.txt index ce1b89ea..24a9cf60 100644 --- a/ge/ge_runtime/CMakeLists.txt +++ b/ge/ge_runtime/CMakeLists.txt @@ -53,7 +53,7 @@ target_include_directories(ge_runtime PRIVATE target_link_libraries(ge_runtime PRIVATE $ -Wl,--no-as-needed - slog + alog runtime c_sec graph diff --git a/ge/host_cpu_engine/CMakeLists.txt b/ge/host_cpu_engine/CMakeLists.txt index d5ed7674..12fcb006 100644 --- a/ge/host_cpu_engine/CMakeLists.txt +++ b/ge/host_cpu_engine/CMakeLists.txt @@ -50,7 +50,7 @@ target_link_libraries(host_cpu_engine PRIVATE c_sec graph register - slog + alog runtime -Wl,--as-needed ) @@ -91,7 +91,7 @@ target_link_libraries(atc_host_cpu_engine PRIVATE c_sec graph register - slog + alog runtime_compile -Wl,--as-needed ) @@ -134,7 +134,7 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - slog + alog graph register -Wl,--as-needed @@ -173,7 +173,7 @@ target_link_libraries(atc_host_cpu_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - slog + alog graph register -Wl,--as-needed diff --git a/ge/offline/CMakeLists.txt b/ge/offline/CMakeLists.txt index af259ecb..be72460b 100644 --- a/ge/offline/CMakeLists.txt +++ b/ge/offline/CMakeLists.txt @@ -69,7 +69,7 @@ target_link_libraries(atc PRIVATE gflags json runtime_compile - slog + alog static_mmpa -lrt -ldl @@ -130,7 +130,7 @@ target_link_libraries(atc_atc.bin PRIVATE gflags json runtime_compile - slog + alog static_mmpa -lrt -ldl @@ -196,7 +196,7 @@ target_link_libraries(fwk_atc.bin PRIVATE gflags json runtime - slog + alog static_mmpa -lrt -ldl diff --git a/ge/plugin/engine/CMakeLists.txt b/ge/plugin/engine/CMakeLists.txt index 87a6d682..54577c1e 100644 --- a/ge/plugin/engine/CMakeLists.txt +++ b/ge/plugin/engine/CMakeLists.txt @@ -34,7 +34,7 @@ target_include_directories(engine PRIVATE target_link_libraries(engine PRIVATE $ -Wl,--no-as-needed - slog + alog -Wl,--as-needed -lrt -ldl From eea696c45bd48272b316c79ebf1c7509386c4fe0 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 09:19:33 +0800 Subject: [PATCH 3/9] update c76 code --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d1ae2cb..c0c7e590 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ if (ENABLE_OPEN_SRC) # for CPU/GPU mode, find c_sec and alog from local prebuild #if(NOT ENABLE_D AND NOT GE_ONLY) # set(GE_PREBUILD_PATH ${GE_CODE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR}) - # find_module(alog libalog.so ${GE_PREBUILD_PATH}) + # find_module(slog libalog.so ${GE_PREBUILD_PATH}) # if D_LINK_PATH is set in environment variables, search libraries in given path if(DEFINED ENV{D_LINK_PATH}) # D_LINK_PATH is set @@ -72,7 +72,7 @@ if (ENABLE_OPEN_SRC) endif() set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH}) set(STATIC_ACL_LIB ${GE_LIB_PATH}) - find_module(alog libalog.so ${GE_LIB_PATH}) + find_module(slog libalog.so ${GE_LIB_PATH}) find_module(static_mmpa libmmpa.a ${GE_LIB_PATH}) find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH}) find_module(hccl libhccl.so ${GE_LIB_PATH}) @@ -88,7 +88,7 @@ if (ENABLE_OPEN_SRC) elseif(ENABLE_GE_COV OR ENABLE_GE_UT) add_subdirectory(tests) else() - find_module(alog libalog.so ${ASCEND_ATC_DIR}) + find_module(slog libalog.so ${ASCEND_ATC_DIR}) find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR}) if(PLATFORM STREQUAL "train") @@ -154,7 +154,7 @@ elseif (ENABLE_D OR ENABLE_ACL) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(alog libalog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(slog libalog.so ${ASCEND_MS_DRIVER_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) @@ -174,7 +174,7 @@ elseif(ENABLE_MS_TESTCASES) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(alog libalog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(slog libalog.so ${ASCEND_MS_DRIVER_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) From e38e5e06a2956968d5486d14dc063ebec49581c0 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 09:30:35 +0800 Subject: [PATCH 4/9] update c76 cmake --- ge/CMakeLists.txt | 6 +++--- ge/common/CMakeLists.txt | 4 ++-- ge/executor/CMakeLists.txt | 2 +- ge/ge_local_engine/CMakeLists.txt | 8 ++++---- ge/ge_runtime/CMakeLists.txt | 2 +- ge/host_cpu_engine/CMakeLists.txt | 8 ++++---- ge/offline/CMakeLists.txt | 6 +++--- ge/plugin/engine/CMakeLists.txt | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index af841a63..3a0f7638 100755 --- a/ge/CMakeLists.txt +++ b/ge/CMakeLists.txt @@ -662,7 +662,7 @@ target_link_libraries(ge_runner PRIVATE ascend_protobuf register c_sec - alog + slog runtime resource error_manager @@ -726,7 +726,7 @@ target_link_libraries(ge_compiler PRIVATE register c_sec error_manager - alog + slog runtime_compile resource -Wl,--as-needed @@ -793,7 +793,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE -Wl,--no-as-needed c_sec runtime - alog + slog ascend_hal_stub -Wl,--as-needed -lrt diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index ab0527e0..05838df8 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -113,7 +113,7 @@ target_link_libraries(ge_common PRIVATE register c_sec error_manager - alog + slog -Wl,--as-needed json $<$>:-lrt> @@ -212,7 +212,7 @@ target_link_libraries(ge_common PRIVATE register c_sec error_manager - alog + slog static_mmpa -Wl,--as-needed json diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt index e6ddb7c3..d59afd03 100644 --- a/ge/executor/CMakeLists.txt +++ b/ge/executor/CMakeLists.txt @@ -242,7 +242,7 @@ target_link_libraries(ge_executor_shared PRIVATE -Wl,--no-as-needed ge_common runtime - alog + slog mmpa graph register diff --git a/ge/ge_local_engine/CMakeLists.txt b/ge/ge_local_engine/CMakeLists.txt index d4602ec0..8f5c9777 100755 --- a/ge/ge_local_engine/CMakeLists.txt +++ b/ge/ge_local_engine/CMakeLists.txt @@ -57,7 +57,7 @@ target_link_libraries(ge_local_engine PRIVATE ascend_protobuf register c_sec - alog + slog runtime -Wl,--as-needed ) @@ -99,7 +99,7 @@ target_link_libraries(atc_ge_local_engine PRIVATE ascend_protobuf register c_sec - alog + slog runtime_compile -Wl,--as-needed ) @@ -143,7 +143,7 @@ target_link_libraries(ge_local_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - alog + slog register graph -Wl,--as-needed @@ -183,7 +183,7 @@ target_link_libraries(atc_ge_local_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - alog + slog register graph -Wl,--as-needed diff --git a/ge/ge_runtime/CMakeLists.txt b/ge/ge_runtime/CMakeLists.txt index 24a9cf60..ce1b89ea 100644 --- a/ge/ge_runtime/CMakeLists.txt +++ b/ge/ge_runtime/CMakeLists.txt @@ -53,7 +53,7 @@ target_include_directories(ge_runtime PRIVATE target_link_libraries(ge_runtime PRIVATE $ -Wl,--no-as-needed - alog + slog runtime c_sec graph diff --git a/ge/host_cpu_engine/CMakeLists.txt b/ge/host_cpu_engine/CMakeLists.txt index 12fcb006..d5ed7674 100644 --- a/ge/host_cpu_engine/CMakeLists.txt +++ b/ge/host_cpu_engine/CMakeLists.txt @@ -50,7 +50,7 @@ target_link_libraries(host_cpu_engine PRIVATE c_sec graph register - alog + slog runtime -Wl,--as-needed ) @@ -91,7 +91,7 @@ target_link_libraries(atc_host_cpu_engine PRIVATE c_sec graph register - alog + slog runtime_compile -Wl,--as-needed ) @@ -134,7 +134,7 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - alog + slog graph register -Wl,--as-needed @@ -173,7 +173,7 @@ target_link_libraries(atc_host_cpu_opskernel_builder PRIVATE -Wl,--no-as-needed ascend_protobuf c_sec - alog + slog graph register -Wl,--as-needed diff --git a/ge/offline/CMakeLists.txt b/ge/offline/CMakeLists.txt index be72460b..af259ecb 100644 --- a/ge/offline/CMakeLists.txt +++ b/ge/offline/CMakeLists.txt @@ -69,7 +69,7 @@ target_link_libraries(atc PRIVATE gflags json runtime_compile - alog + slog static_mmpa -lrt -ldl @@ -130,7 +130,7 @@ target_link_libraries(atc_atc.bin PRIVATE gflags json runtime_compile - alog + slog static_mmpa -lrt -ldl @@ -196,7 +196,7 @@ target_link_libraries(fwk_atc.bin PRIVATE gflags json runtime - alog + slog static_mmpa -lrt -ldl diff --git a/ge/plugin/engine/CMakeLists.txt b/ge/plugin/engine/CMakeLists.txt index 54577c1e..87a6d682 100644 --- a/ge/plugin/engine/CMakeLists.txt +++ b/ge/plugin/engine/CMakeLists.txt @@ -34,7 +34,7 @@ target_include_directories(engine PRIVATE target_link_libraries(engine PRIVATE $ -Wl,--no-as-needed - alog + slog -Wl,--as-needed -lrt -ldl From d662b5e84eddc3ffa8a6c7d88c487c0b48d1f4fe Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 09:53:20 +0800 Subject: [PATCH 5/9] update c76 submodule --- metadef | 2 +- parser | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadef b/metadef index c3269edc..1af2464c 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit c3269edc0ec089dce4ae2e80f41fea42a57e7b6f +Subproject commit 1af2464c128ef115c366b9b4056d838b3d4a2f76 diff --git a/parser b/parser index 0a8a3210..c972fc43 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 0a8a3210e39fd602f68169a558b18a5f855f9fb0 +Subproject commit c972fc433a2b32ac6cf0648cf99979c03288bba6 From 4ac0f6920482a95bb6f70ac2ecb4fe19563ae725 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 11:35:15 +0800 Subject: [PATCH 6/9] add c76 LOG_CPP --- ge/common/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index 05838df8..39e10ec5 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -73,6 +73,7 @@ target_compile_definitions(ge_common PRIVATE FMK_SUPPORT_DUMP OS_CENTOS google=ascend_private + LOG_CPP ) target_compile_options(ge_common PRIVATE From 455f21252f640fe1c99d003eb6e090ccd422b6a9 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 14:53:51 +0800 Subject: [PATCH 7/9] update c76 log_cpp --- cmake/intf_pub_linux.cmake | 1 + ge/common/CMakeLists.txt | 1 - metadef | 2 +- parser | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/intf_pub_linux.cmake b/cmake/intf_pub_linux.cmake index 40c6bca9..61237d11 100755 --- a/cmake/intf_pub_linux.cmake +++ b/cmake/intf_pub_linux.cmake @@ -16,6 +16,7 @@ target_compile_definitions(intf_pub INTERFACE $<$:CFG_BUILD_DEBUG> WIN64=1 LINUX=0 + LOG_CPP ) target_link_options(intf_pub INTERFACE -Wl,-z,relro diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index 39e10ec5..05838df8 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -73,7 +73,6 @@ target_compile_definitions(ge_common PRIVATE FMK_SUPPORT_DUMP OS_CENTOS google=ascend_private - LOG_CPP ) target_compile_options(ge_common PRIVATE diff --git a/metadef b/metadef index 1af2464c..b755dc18 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 1af2464c128ef115c366b9b4056d838b3d4a2f76 +Subproject commit b755dc1809e4e65708ad531453aa0b5ab3cc4505 diff --git a/parser b/parser index c972fc43..24bdf38c 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit c972fc433a2b32ac6cf0648cf99979c03288bba6 +Subproject commit 24bdf38cbfbdaab638e32f916d0d32718f7f3eda From 1ac3bff4affca8e1dec11a0d2cbce6dc875f5d21 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 16:03:09 +0800 Subject: [PATCH 8/9] update c76 submodule --- metadef | 2 +- parser | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadef b/metadef index b755dc18..5960a598 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit b755dc1809e4e65708ad531453aa0b5ab3cc4505 +Subproject commit 5960a598451a6ce9941c0072c5cc52457d63c30e diff --git a/parser b/parser index 24bdf38c..a85e17ab 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 24bdf38cbfbdaab638e32f916d0d32718f7f3eda +Subproject commit a85e17abeba7b16a4cca2228c1fcbbfe631cb139 From 0f36063e8c558f3b9d521ed2fb2e76d6fa8b62ba Mon Sep 17 00:00:00 2001 From: wqtshg Date: Fri, 25 Dec 2020 16:15:57 +0800 Subject: [PATCH 9/9] update ut --- tests/ut/ge/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index 1dfd8bbc..7400a8cd 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/tests/ut/ge/CMakeLists.txt @@ -483,7 +483,6 @@ set(GRAPH_PASS_COMMON_SRC_FILES "${GE_CODE_DIR}/ge/graph/passes/compile_nodes_pass.cc" "${GE_CODE_DIR}/ge/graph/common/transop_util.cc" "${GE_CODE_DIR}/ge/graph/passes/flow_ctrl_pass.cc" - "${GE_CODE_DIR}/ge/graph/optimize/optimizer/allreduce_fusion_pass.cc" "${GE_CODE_DIR}/ge/graph/passes/folding_pass.cc" "${GE_CODE_DIR}/ge/graph/passes/variable_op_pass.cc" "${GE_CODE_DIR}/ge/graph/passes/transpose_transdata_pass.cc"