Pre Merge pull request !716 from 王涛/r1.2.0

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})
 

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

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
     $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt>
@@ -212,7 +212,7 @@ target_link_libraries(ge_common PRIVATE
     register
     c_sec
     error_manager
-    slog
+    alog
     static_mmpa
     -Wl,--as-needed
     json

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

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

ge/ge_runtime/CMakeLists.txt

@@ -53,7 +53,7 @@ target_include_directories(ge_runtime PRIVATE
 target_link_libraries(ge_runtime PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    slog
+    alog
     runtime
     c_sec
     graph

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<string, set<uintptr_t>> &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<string, set<uintptr_t>> &batch_addrs, const string &batch_label, uintptr_t addr);
-
  private:
   const string name_;
 

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

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

ge/plugin/engine/CMakeLists.txt

@@ -34,7 +34,7 @@ target_include_directories(engine PRIVATE
 target_link_libraries(engine PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    slog
+    alog
     -Wl,--as-needed
     -lrt
     -ldl

metadef

@@ -1 +1 @@
-Subproject commit a71110f5e42dc768ddbbd51289eb467518dedf9b
+Subproject commit c3269edc0ec089dce4ae2e80f41fea42a57e7b6f

parser

@@ -1 +1 @@
-Subproject commit 2e55b1168df38cd3c76412a8d00bc8b6e7f19f82
+Subproject commit 0a8a3210e39fd602f68169a558b18a5f855f9fb0