diff --git a/CMakeLists.txt b/CMakeLists.txt index 776a3232..c0c7e590 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(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(slog libslog.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(slog libslog.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(slog libslog.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(slog libslog.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}) 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..1af2464c 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit a71110f5e42dc768ddbbd51289eb467518dedf9b +Subproject commit 1af2464c128ef115c366b9b4056d838b3d4a2f76 diff --git a/parser b/parser index 2e55b116..c972fc43 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 2e55b1168df38cd3c76412a8d00bc8b6e7f19f82 +Subproject commit c972fc433a2b32ac6cf0648cf99979c03288bba6