!920 bug fix

From: @dimitri_rose
Reviewed-by: @wqtshg,@xchu42
Signed-off-by: @wqtshg

.gitignore

@@ -2,7 +2,6 @@
 /build
 /output
 /prebuilts
-/cov
 *.ir
 *.out
 

.gitmodules

@@ -1,8 +1,6 @@
-[submodule "parser"]
-	path = parser
-	url = https://gitee.com/ascend/parser.git
-	branch = master
 [submodule "metadef"]
 	path = metadef
 	url = https://gitee.com/ascend/metadef.git
-	branch = master
+[submodule "parser"]
+	path = parser
+	url = https://gitee.com/ascend/parser.git

CMakeLists.txt

@@ -8,50 +8,24 @@ if (NOT BUILD_PATH)
     set(BUILD_PATH "${CMAKE_SOURCE_DIR}/build")
 endif()
 
-if(DEFINED ENV{ASCEND_CUSTOM_PATH})
-    set(ASCEND_DIR $ENV{ASCEND_CUSTOM_PATH})
-else()
-    set(ASCEND_DIR /usr/local/Ascend)
-endif()
-
-if(DEFINED ENV{D_PKG_SERVER})
-    set(GE_PB_PKG $ENV{D_PKG_SERVER})
-    message("Download packages from DPKG server")
-elseif(DEFINED ENV{MSLIBS_SERVER})
-    set(GE_PB_PKG "http://$ENV{MSLIBS_SERVER}:8081")
-    message("Download packages from MSPKG server")
-endif ()
-
-set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64)
-set(ASCEND_DRIVER_COMMON_DIR ${ASCEND_DIR}/driver/lib64/common)
-set(ASCEND_DRIVER_SHARE_DIR ${ASCEND_DIR}/driver/lib64/share)
-set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
-set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
-set(ASCEND_ACL_DIR ${ASCEND_DIR}/acllib/lib64)
-set(STATIC_ACL_LIB ${ASCEND_ACL_DIR})
-
-set(ASCEND_MS_RUNTIME_PATH ${ASCEND_RUNTIME_DIR} ${ASCEND_ACL_DIR} ${ASCEND_ATC_DIR})
-set(ASCEND_MS_DRIVER_PATH ${ASCEND_DRIVER_DIR} ${ASCEND_DRIVER_COMMON_DIR})
-set(ATLAS_RUNTIME_DIR ${ASCEND_DIR}/ascend-toolkit/latest/fwkacllib/lib64)
-set(ATLAS_ACL_DIR ${ASCEND_DIR}/ascend-toolkit/latest/acllib/lib64)
-set(ATLAS_ATC_DIR ${ASCEND_DIR}/ascend-toolkit/latest/atc/lib64)
-set(ATLAS_MS_RUNTIME_PATH ${ATLAS_RUNTIME_DIR} ${ATLAS_ACL_DIR} ${ATLAS_ATC_DIR})
-
 option(ENABLE_OPEN_SRC "Enable graphengine compile in opensource." FALSE)
 
 if (ENABLE_OPEN_SRC)
-    set(HI_PYTHON python3)
+    set(HI_PYTHON python3.7)
 
     include(cmake/external_libs/protobuf_shared.cmake)
     include(cmake/external_libs/protobuf_static.cmake)
     include(cmake/external_libs/protoc.cmake)
     include(cmake/external_libs/gflags.cmake)
-    include(cmake/external_libs/gtest.cmake)
     include(cmake/external_libs/securec.cmake)
     include(cmake/external_libs/json.cmake)
     include(cmake/FindModule.cmake)
     include(cmake/intf_pub_linux.cmake)
 
+    # for CPU/GPU mode, find c_sec and slog 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})
     # 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
@@ -68,26 +42,42 @@ 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 libalog.so ${GE_LIB_PATH})
-        find_module(static_mmpa libmmpa.a ${GE_LIB_PATH})
-        find_module(msprofiler_ext libmsprofiler.a ${GE_LIB_PATH})
+        find_module(slog libslog.so ${GE_LIB_PATH})
+        find_module(mmpa libmmpa.so ${GE_LIB_PATH})
+        find_module(msprof libmsprof.so ${GE_LIB_PATH})
         find_module(hccl libhccl.so ${GE_LIB_PATH})
         find_module(adump_server libadump_server.a ${GE_LIB_PATH})
         find_module(runtime libruntime.so ${GE_LIB_PATH})
         find_module(runtime_compile libruntime_compile.so ${GE_LIB_PATH})
         find_module(resource libresource.so ${GE_LIB_PATH})
+        find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
         find_module(ascend_hal_stub libascend_hal.so ${GE_LIB_PATH})
-        find_module(msprofiler_fwk_ext 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)
+        find_module(error_manager_static liberror_manager.a ${GE_LIB_PATH})
+        find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH})
     else()
-        find_module(slog libalog.so ${ASCEND_ATC_DIR})
-        find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
+        if(DEFINED ENV{ASCEND_CUSTOM_PATH})
+            set(ASCEND_DIR $ENV{ASCEND_CUSTOM_PATH})
+        else()
+            set(ASCEND_DIR /usr/local/Ascend)
+        endif()
+        set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64)
+        set(ASCEND_DRIVER_COMMON_DIR ${ASCEND_DIR}/driver/lib64/common)
+        set(ASCEND_DRIVER_SHARE_DIR ${ASCEND_DIR}/driver/lib64/share)
+        set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
+        set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
+        set(ASCEND_ACL_DIR ${ASCEND_DIR}/acllib/lib64)
+        set(STATIC_ACL_LIB ${ASCEND_ACL_DIR})
+        find_module(slog libslog.so ${ASCEND_ATC_DIR})
+        find_module(mmpa libmmpa.so ${ASCEND_ATC_DIR})
         if(PLATFORM STREQUAL "train")
+            find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR})
+            find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR})
             find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
             find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
-            find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${ASCEND_RUNTIME_DIR})
+            find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
+            find_module(resource libresource.so ${ASCEND_ATC_DIR})
+            find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
+            find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR})
             find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver)
             if(PRODUCT STREQUAL "flr3")
                 message(FATAL_ERROR "This platform is not supported in train mode, build terminated")
@@ -95,25 +85,35 @@ if (ENABLE_OPEN_SRC)
         elseif(PLATFORM STREQUAL "inference")
             find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR})
             find_module(runtime libruntime.so ${ASCEND_ACL_DIR})
-	    find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
-            find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR})
+            find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
+            find_module(resource libresource.so ${ASCEND_ATC_DIR})
+            find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR})
+            find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR})
+            find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR})
             if(PRODUCT STREQUAL "flr3")
+                find_module(msprof libmsprof.so ${ASCEND_DRIVER_SHARE_DIR})
             elseif(PRODUCT STREQUAL "flr1")
                 find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver)
+                find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR})
             elseif(PRODUCT STREQUAL "flr2")
                 # flr2 ascend_hal_stub limsprof ?
             else()
                 find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
+                find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR})
             endif()
         elseif(PLATFORM STREQUAL "all")
-	    find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
-	    find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
-            find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${ASCEND_RUNTIME_DIR})
-	    find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
-	    find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
-	    find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR})
+            find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR})
+            find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR})
+            find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
+            find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
+            find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
+            find_module(resource libresource.so ${ASCEND_ATC_DIR})
+            find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
+            find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR})
+            find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR})
+            find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver)
         else()
-            message(STATUS "PLATFORM param is invalid, should be train or inference, you choose nothing!")
+             message(FATAL_ERROR "PLATFORM param is invalid, should be train or inference, build terminated")
         endif()
     endif()
 
@@ -125,40 +125,6 @@ if (ENABLE_OPEN_SRC)
     add_subdirectory(parser)
     #add_subdirectory(metadef/graph)
     #add_subdirectory(metadef/register)
-elseif (ENABLE_D OR ENABLE_ACL)
-    # compiling with MindSpore
-    include(cmake/external_libs/protobuf_static.cmake)
-    include(cmake/external_libs/protoc.cmake)
-    include(cmake/external_libs/securec.cmake)
-    include(cmake/external_libs/json.cmake)
-    include(cmake/FindModule.cmake)
-    include(cmake/intf_pub_linux.cmake)
-
-    # common libraries
-    find_module(slog libalog.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-    find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-
-    if (ENABLE_D)
-        # training
-        find_module(runtime libruntime.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-        find_module(register libregister.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-    endif ()
-
-    set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef)
-    add_subdirectory(metadef)
-elseif(ENABLE_MS_TESTCASES)
-    include(cmake/external_libs/protobuf_static.cmake)
-    include(cmake/external_libs/protoc.cmake)
-    include(cmake/external_libs/securec.cmake)
-    include(cmake/FindModule.cmake)
-    include(cmake/intf_pub_linux.cmake)
-
-    # common libraries
-    find_module(slog libalog.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-    find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH})
-
-    set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef)
-    add_subdirectory(metadef)
 else()
     set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/../metadef)
     set(PARSER_DIR ${CMAKE_CURRENT_LIST_DIR}/../parser)

README_CN.md

@@ -1,12 +1,12 @@
 [View English](./README.md)
 
-图引擎模块(GE)是MindSpore的一个子模块，其代码由C++实现，位于前端模块ME和底层硬件之间，起到承接作用。图引擎模块以ME下发的图作为输入，然后进行一系列的深度图优化操作，最后输出一张可以在底层硬件上高效运行的图。GE针对昇腾AI处理器的硬件结构特点，做了特定的优化工作，以此来充分发挥出昇腾AI处理器的强大算力。在进行模型训练/推理时，GE会被自动调用而用户并不感知。GE主要由GE API和GE Core两部分组成，详细的架构图如下所示。
+图引擎模块(GE)由C++实现，位于前端模块MindSpore/Tensorflow和底层硬件之间，起到承接作用。图引擎模块以ME/TF下发的图作为输入，然后进行一系列的深度图优化操作，最后输出一张可以在底层硬件上高效运行的图。GE针对昇腾AI处理器的硬件结构特点，做了特定的优化工作，以此来充分发挥出昇腾AI处理器的强大算力。在进行模型训练/推理时，GE会被自动调用而用户并不感知。GE主要由GE API和GE Core两部分组成，详细的架构图如下所示。
 
 ![GE_schema](docs/GE_Architecture_CN.png)
 
 - GE API
 
-    GE API是连接前端模块ME和GE Core的接口，负责GE Core中初始化、Session管理模块的接口，支持运行环境初始化，Session创建、销毁，图添加执行。
+    GE API是连接前端模块ME/TF和GE Core的接口，负责GE Core中初始化、Session管理模块的接口，支持运行环境初始化，Session创建、销毁，图添加执行。
 
 - GE Core
 
@@ -50,11 +50,12 @@
 
 ## 安装GE
 
-GE内嵌在MindSpore安装包中，MindSpore安装完毕后，GE以三个动态库的方式被调用。
+GE内嵌在MindSpore/Ascend安装包中，MindSpore/Ascend安装完毕后，GE以动态库的方式被调用。
 
 ## 源码安装
 
-GE也支持由源码编译，进行源码编译前，首先确保你有昇腾910 AI处理器的环境，同时系统满足以下要求：
+GE也支持由源码编译，进行源码编译前，首先确保你有昇腾910 AI处理器的环境（可通过[昇腾开发者社区](https://ascend.huawei.com
+)获取），同时系统满足以下要求：
 
 - GCC >= 7.3.0
 - CMake >= 3.14.0
@@ -62,7 +63,7 @@ GE也支持由源码编译，进行源码编译前，首先确保你有昇腾910
 - Libtool >= 2.4.6
 - Automake >= 1.15.1
 
-编译完成后会生成几个动态库，他们会链接到MindSpore中执行，无法单独运行。
+编译完成后会生成几个动态库，他们会链接到MindSpore/Ascend中执行，无法单独运行。
 
 1. 下载GE源码。
 
@@ -102,6 +103,26 @@ bash build.sh
 
 欢迎参与贡献，更多信息详见[Contributor Wiki](https://gitee.com/mindspore/mindspore/blob/master/CONTRIBUTING.md)。
 
+## 路标
+
+以下将展示graphengine近期的计划，我们会根据用户的反馈诉求，持续调整计划的优先级。
+
+总体而言，我们会努力在以下几个方面不断改进。
+
+    1、完备性：Cast/ConcatV2算子支持输入数据类型为int64的常量折叠；
+
+    2、完备性：onnx parser支持一对多映射；
+
+    3、架构优化：ATC解耦并迁移至parser；
+
+    4、易用性：提供tensorflow训练的checkpoint文件转pb文件的一键式转化工具；
+
+    5、易用性：提供一键式本地编译环境构建工具；
+
+    6、可维测：ATC转换生成的om模型包含框架信息、cann版本信息和芯片信息等；
+
+热忱希望各位在用户社区加入讨论，并贡献您的建议。
+
 ## Release Notes
 
 Release Notes请参考[RELEASE](RELEASE.md).

classify_rule.txt

@@ -1,5 +0,0 @@
-[graphengine]
-ge
-inc
-metadef
-parser

cmake/FindModule.cmake

@@ -3,16 +3,10 @@
   name   - find the library name
   path   - find the library path
 #]]
-function(find_module module name)
+function(find_module module name path)
     if (TARGET ${module})
         return()
     endif()
-
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs)
-    cmake_parse_arguments(MODULE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(path ${MODULE_UNPARSED_ARGUMENTS})
     find_library(${module}_LIBRARY_DIR NAMES ${name} NAMES_PER_DIR PATHS ${path}
       PATH_SUFFIXES lib
     )
@@ -21,7 +15,7 @@ function(find_module module name)
     if ("${${module}_LIBRARY_DIR}" STREQUAL "${module}_LIBRARY_DIR-NOTFOUND")
       message(FATAL_ERROR "${name} not found in ${path}")
     endif()
-
+    
     add_library(${module} SHARED IMPORTED)
     set_target_properties(${module} PROPERTIES
       IMPORTED_LOCATION ${${module}_LIBRARY_DIR}

cmake/external_libs/gflags.cmake

@@ -3,6 +3,7 @@ if (HAVE_GFLAGS)
 endif()
 
 include(ExternalProject)
+#set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output)
 
 if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
     (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend"))
@@ -18,13 +19,11 @@ else()
     set(MD5 "")
 endif ()
 
-set (gflags_CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -Dgoogle=ascend_private")
 ExternalProject_Add(gflags_build
                     URL ${REQ_URL}
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
-                    #SOURCE_DIR ${GE_CODE_DIR}/../../third_party/gflags/src/gflags-2.2.2 
-                    TLS_VERIFY OFF
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS=${gflags_CXXFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR>
+                    #SOURCE_DIR ${GE_CODE_DIR}/../third_party/gflags/src/gflags-2.2.2 
+                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR>
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install
                     EXCLUDE_FROM_ALL TRUE 

cmake/external_libs/gtest.cmake

@@ -1,81 +0,0 @@
-if (HAVE_GTEST)
-    return()
-endif()
-
-include(ExternalProject)
-
-if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
-    (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend"))
-    set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE)
-    message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
-endif()
-
-if (GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/ge_gtest/release-1.8.1.tar.gz")
-    set(MD5 "")
-elseif (ENABLE_GITEE)
-    set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.1.tar.gz")
-    set(MD5 "")
-else()
-    set(REQ_URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz")
-    set(MD5 "")
-endif ()
-
-set (gtest_CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
-set (gtest_CFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
-ExternalProject_Add(gtest_build
-                    URL ${REQ_URL}
-                    TLS_VERIFY OFF
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS=${gtest_CXXFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gtest <SOURCE_DIR>
-                    -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_MACOSX_RPATH=TRUE
-                    BUILD_COMMAND $(MAKE)
-                    INSTALL_COMMAND $(MAKE) install
-                    EXCLUDE_FROM_ALL TRUE 
-)
-
-set(GTEST_PKG_DIR ${CMAKE_INSTALL_PREFIX}/gtest)
-
-file(MAKE_DIRECTORY ${GTEST_PKG_DIR}/include)
-
-add_library(gtest SHARED IMPORTED)
-
-set_target_properties(gtest PROPERTIES
-    IMPORTED_LOCATION ${GTEST_PKG_DIR}/lib/libgtest.so
-)
-
-add_library(gtest_main SHARED IMPORTED)
-
-set_target_properties(gtest_main PROPERTIES
-    IMPORTED_LOCATION ${GTEST_PKG_DIR}/lib/libgtest_main.so
-)
-
-target_include_directories(gtest INTERFACE ${GTEST_PKG_DIR}/include)
-target_include_directories(gtest_main INTERFACE ${GTEST_PKG_DIR}/include)
-
-
-add_library(gmock SHARED IMPORTED)
-
-set_target_properties(gmock PROPERTIES
-    IMPORTED_LOCATION ${GTEST_PKG_DIR}/lib/libgmock.so
-)
-
-add_library(gmock_main SHARED IMPORTED)
-
-set_target_properties(gmock_main PROPERTIES
-    IMPORTED_LOCATION ${GTEST_PKG_DIR}/lib/libgmock_main.so
-)
-
-target_include_directories(gmock INTERFACE ${GTEST_PKG_DIR}/include)
-target_include_directories(gmock_main INTERFACE ${GTEST_PKG_DIR}/include)
-
-
-set(INSTALL_BASE_DIR "")
-set(INSTALL_LIBRARY_DIR lib)
-
-install(FILES ${GTEST_PKG_DIR}/lib/libgtest.so ${GTEST_PKG_DIR}/lib/libgtest_main.so ${GTEST_PKG_DIR}/lib/libgmock.so ${GTEST_PKG_DIR}/lib/libgmock_main.so OPTIONAL
-        DESTINATION ${INSTALL_LIBRARY_DIR})
-
-add_dependencies(gtest gtest_build)
-
-#set(HAVE_GFLAGS TRUE CACHE BOOL "gflags build add")
-set(HAVE_GTEST TRUE)

cmake/external_libs/json.cmake

@@ -5,14 +5,10 @@ endif()
 include(ExternalProject)
 
 set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/include)
-if (GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/ge_nlohmann_json/include.zip")
-    set(MD5 "0dc903888211db3a0f170304cd9f3a89")
-    set(JSON_INCLUDE_DIR ${JSON_SRC_DIR})
-#elseif (ENABLE_GITEE)
-#    set(REQ_URL "https://gitee.com/mirrors/JSON-for-Modern-CPP/repository/archive/v3.6.1.zip")
-#    set(MD5 "5bda78ce308e6cfcf614dcf1d5ff27a7")
-#set(JSON_INCLUDE_DIR "${JSON_SRC_DIR}/include")
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/JSON-for-Modern-CPP/repository/archive/v3.6.1.zip")
+    set(MD5 "5bda78ce308e6cfcf614dcf1d5ff27a7")
+    set(JSON_INCLUDE_DIR "${JSON_SRC_DIR}/include")
 else()
     set(REQ_URL "https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip")
     set(MD5 "0dc903888211db3a0f170304cd9f3a89")
@@ -22,7 +18,6 @@ ExternalProject_Add(json_build
                     URL ${REQ_URL}
                     #URL /home/txd/workspace/cloud_code/pkg/include.zip
                     SOURCE_DIR  ${JSON_SRC_DIR}
-                    TLS_VERIFY OFF
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""
                     INSTALL_COMMAND ""

cmake/external_libs/onnx.cmake

@@ -6,10 +6,7 @@ set(ONNX_PROTO_DIR ${CMAKE_BINARY_DIR}/onnx)
 set(ONNX_PROTO_FILE ${ONNX_PROTO_DIR}/onnx.proto)
 file(MAKE_DIRECTORY ${ONNX_PROTO_DIR})
 
-if (GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/onnx/onnx-1.6.0.tar.gz")
-    set(MD5 "512f2779d6215d4a36f366b6b9acdf1e")
-elseif (ENABLE_GITEE)
+if (ENABLE_GITEE)
     set(REQ_URL "https://gitee.com/mirrors/ONNX/repository/archive/v1.6.0.tar.gz")
     set(MD5 "1bdbcecdd68ea8392630467646776e02")
 else()
@@ -22,7 +19,6 @@ ExternalProject_Add(onnx
                     #URL /home/txd/workspace/cloud_code/pkg/onnx-1.6.0.tar.gz
                     #URL_HASH SHA256=3b88c3fe521151651a0403c4d131cb2e0311bd28b753ef692020a432a81ce345
                     #SOURCE_DIR ${ONNX_SRC_DIR}
-                    TLS_VERIFY OFF
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""
                     #INSTALL_COMMAND "" 

cmake/external_libs/protobuf_shared.cmake

@@ -10,33 +10,34 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
     set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE)
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
-if (GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/protobuf/v3.8.0.tar.gz")
+
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
+    set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
 else()
-    if (ENABLE_GITEE)
-        set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
-        set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
-    else()
-        set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
-        set(MD5 "3d9e32700639618a4d2d342c99d4507a")
-    endif ()
-endif()
+    set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
+    set(MD5 "3d9e32700639618a4d2d342c99d4507a")
+endif ()
 
-set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2 -Dgoogle=ascend_private")
+set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
 set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
 ExternalProject_Add(protobuf_build
                     URL ${REQ_URL}
-                    TLS_VERIFY OFF
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND}
-                    -Dprotobuf_WITH_ZLIB=OFF
-                    -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
-                    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                    -DCMAKE_LINKER=${CMAKE_LINKER}
-                    -DCMAKE_AR=${CMAKE_AR}
-                    -DCMAKE_RANLIB=${CMAKE_RANLIB}
-                    -DLIB_PREFIX=ascend_
-                    -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/protobuf <SOURCE_DIR>/cmake
+                    #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
+                    #SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0
+                    #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR>
+                    #CONFIGURE_COMMAND ${CMAKE_COMMAND}
+                    #-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
+                    #-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                    #-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                    #-DCMAKE_LINKER=${CMAKE_LINKER}
+                    #-DCMAKE_AR=${CMAKE_AR}
+                    #-DCMAKE_RANLIB=${CMAKE_RANLIB}
+                    #-Dprotobuf_WITH_ZLIB=OFF
+                    #-Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/protobuf <SOURCE_DIR>/cmake
+                    CONFIGURE_COMMAND cd <SOURCE_DIR>
+                            && ./autogen.sh && cd <BINARY_DIR> && <SOURCE_DIR>/configure --prefix=${CMAKE_INSTALL_PREFIX}/protobuf --with-zlib=no CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=${protobuf_CXXFLAGS} LDFLAGS=${protobuf_LDFLAGS}
+                            && bash -c "sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"\"|g' libtool && sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool"
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install
                     EXCLUDE_FROM_ALL TRUE
@@ -45,25 +46,23 @@ include(GNUInstallDirs)
 
 set(PROTOBUF_SHARED_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf)
 
-add_library(ascend_protobuf SHARED IMPORTED)
+add_library(protobuf SHARED IMPORTED)
 
 file(MAKE_DIRECTORY ${PROTOBUF_SHARED_PKG_DIR}/include)
 
-set_target_properties(ascend_protobuf PROPERTIES
-                      IMPORTED_LOCATION ${PROTOBUF_SHARED_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libascend_protobuf.so
+set_target_properties(protobuf PROPERTIES
+                      IMPORTED_LOCATION ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so
 )
 
-target_include_directories(ascend_protobuf INTERFACE ${PROTOBUF_SHARED_PKG_DIR}/include)
+target_include_directories(protobuf INTERFACE ${PROTOBUF_SHARED_PKG_DIR}/include)
 
 set(INSTALL_BASE_DIR "")
 set(INSTALL_LIBRARY_DIR lib)
 
-install(FILES ${PROTOBUF_SHARED_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/ascend_protobuf.so.3.8.0.0 OPTIONAL
-        DESTINATION ${INSTALL_LIBRARY_DIR})
-install(FILES ${PROTOBUF_SHARED_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/ascend_protobuf.so OPTIONAL
+install(FILES ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so.19.0.0 OPTIONAL
         DESTINATION ${INSTALL_LIBRARY_DIR})
 
-add_dependencies(ascend_protobuf protobuf_build)
+add_dependencies(protobuf protobuf_build)
 
 #set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add")
 set(HAVE_PROTOBUF TRUE)

cmake/external_libs/protobuf_static.cmake

@@ -1,7 +1,3 @@
-if (HAVE_PROTOBUF_STATIC)
-    return()
-endif()
-
 include(ExternalProject)
 include(GNUInstallDirs)
 #set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output)
@@ -12,26 +8,21 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
 
-if(GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/protobuf/v3.8.0.tar.gz")
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
+    set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
 else()
-    if (ENABLE_GITEE)
-        set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
-        set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
-    else()
-        set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
-        set(MD5 "3d9e32700639618a4d2d342c99d4507a")
-    endif ()
-endif()
+    set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
+    set(MD5 "3d9e32700639618a4d2d342c99d4507a")
+endif ()
 
-set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2 -Dgoogle=ascend_private")
+set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
 set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
 set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static)
 ExternalProject_Add(protobuf_static_build
                     URL ${REQ_URL}
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
-                    #SOURCE_DIR ${METADEF_DIR}/../../third_party/protobuf/src/protobuf-3.8.0
-                    TLS_VERIFY OFF
+                    #SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0
                     CONFIGURE_COMMAND ${CMAKE_COMMAND}
                     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -40,7 +31,6 @@ ExternalProject_Add(protobuf_static_build
                     -DCMAKE_AR=${CMAKE_AR}
                     -DCMAKE_RANLIB=${CMAKE_RANLIB}
                     -Dprotobuf_WITH_ZLIB=OFF
-                    -DLIB_PREFIX=ascend_
                     -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${PROTOBUF_STATIC_PKG_DIR} <SOURCE_DIR>/cmake
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install
@@ -48,19 +38,14 @@ ExternalProject_Add(protobuf_static_build
 )
 include(GNUInstallDirs)
 
-add_library(ascend_protobuf_static_lib STATIC IMPORTED)
+add_library(protobuf_static_lib STATIC IMPORTED)
 
-set_target_properties(ascend_protobuf_static_lib PROPERTIES
-                      IMPORTED_LOCATION ${PROTOBUF_STATIC_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libascend_protobuf.a
+set_target_properties(protobuf_static_lib PROPERTIES
+                      IMPORTED_LOCATION ${PROTOBUF_STATIC_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libprotobuf.a
 )
 
-add_library(ascend_protobuf_static INTERFACE)
-target_include_directories(ascend_protobuf_static INTERFACE ${PROTOBUF_STATIC_PKG_DIR}/include)
-target_link_libraries(ascend_protobuf_static INTERFACE ascend_protobuf_static_lib)
-if (ENABLE_D OR ENABLE_ACL OR ENABLE_MS_TESTCASES)
-include_directories(${PROTOBUF_STATIC_PKG_DIR}/include)
-endif ()
-
-add_dependencies(ascend_protobuf_static protobuf_static_build)
+add_library(protobuf_static INTERFACE)
+target_include_directories(protobuf_static INTERFACE ${PROTOBUF_STATIC_PKG_DIR}/include)
+target_link_libraries(protobuf_static INTERFACE protobuf_static_lib)
 
-set(HAVE_PROTOBUF_STATIC TRUE)
+add_dependencies(protobuf_static protobuf_static_build)

cmake/external_libs/protoc.cmake

@@ -12,17 +12,14 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
 
-if(GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/protobuf/v3.8.0.tar.gz")
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
+    set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
 else()
-    if (ENABLE_GITEE)
-        set(REQ_URL "https://gitee.com/mirrors/protobuf_source/repository/archive/v3.8.0.tar.gz")
-        set(MD5 "eba86ae9f07ba5cfbaf8af3bc4e84236")
-    else()
-        set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
-        set(MD5 "3d9e32700639618a4d2d342c99d4507a")
-    endif ()
-endif()
+    set(REQ_URL "https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz")
+    set(MD5 "3d9e32700639618a4d2d342c99d4507a")
+endif ()
+
 
 set(protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
 set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
@@ -30,7 +27,6 @@ ExternalProject_Add(protoc_build
                     URL ${REQ_URL}
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
                     #SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0
-                    TLS_VERIFY OFF
                     CONFIGURE_COMMAND ${CMAKE_COMMAND} -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/protoc <SOURCE_DIR>/cmake
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install

cmake/external_libs/securec.cmake

@@ -10,20 +10,11 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
 
-if (GE_PB_PKG)
-    set(REQ_URL "${GE_PB_PKG}/libs/securec/v1.1.10.tar.gz")
-    set(MD5 "")
-else()
-    set(REQ_URL "https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz")
-    set(MD5 "")
-endif ()
-
 ExternalProject_Add(c_sec_build
-                    URL ${REQ_URL}
-                    #URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz
+                    URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz
+                    #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
                     #SOURCE_DIR ${GE_CODE_DIR}/../libc_sec
                     PATCH_COMMAND patch -p1 < ${GE_CODE_DIR}/metadef/third_party/patch/securec/0001-add-securec-cmake-script.patch
-                    TLS_VERIFY OFF
                     CONFIGURE_COMMAND ${CMAKE_COMMAND}
                     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

cmake/intf_pub_linux.cmake

@@ -16,7 +16,6 @@ target_compile_definitions(intf_pub INTERFACE
     $<$<CONFIG:Debug>:CFG_BUILD_DEBUG>   
     WIN64=1
     LINUX=0
-    LOG_CPP
 )
 target_link_options(intf_pub INTERFACE
     -Wl,-z,relro

ge/analyzer/analyzer.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Huawei Technologies Co., Ltd
+ * Copyright 2019-2020 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,12 +33,12 @@
 namespace ge {
 namespace analyzer {
 enum AnalyzeType {
-  PARSER         = 0,
-  INFER_SHAPE    = 1,
-  CHECKSUPPORT   = 2,
+  PARSER = 0,
+  INFER_SHAPE = 1,
+  CHECKSUPPORT = 2,
   GRAPH_OPTIMIZE = 3,
-  GRAPH_PARTION  = 4,
-  GRAPH_BUILDER  = 5,
+  GRAPH_PARTION = 4,
+  GRAPH_BUILDER = 5,
 };
 
 struct TensorInfo {
@@ -66,8 +66,7 @@ struct DataInfo {
   DataInfo() = default;
   ~DataInfo() = default;
 
-  DataInfo(uint64_t sess, uint64_t graph, AnalyzeType type,
-           ge::NodePtr node, std::string error_info) {
+  DataInfo(uint64_t sess, uint64_t graph, AnalyzeType type, ge::NodePtr node, std::string error_info) {
     session_id = sess;
     graph_id = graph;
     analyze_type = type;
@@ -80,10 +79,10 @@ struct DataInfo {
   ge::NodePtr node_ptr{nullptr};
   std::string reason;
 };
-}
+}  // namespace analyzer
 
 class Analyzer {
-public:
+ public:
   /**
    * @ingroup ge
    * @brief: get analyzer instance.
@@ -157,39 +156,33 @@ public:
    */
   ge::Status DoAnalyze(analyzer::DataInfo &data_info);
 
-  /**
-   * @ingroup ge
-   * @brief: Buff analyzed data and output to json file
-   * @param [in]: session id , graph id
-   * @return: 0: SUCCESS other: FAILED
-   */
-  ge::Status SaveAnalyzerDataToFile(uint64_t session_id, uint64_t graph_id);
-
   Analyzer(const Analyzer &) = delete;
-  Analyzer& operator=(const Analyzer&) = delete;
+  Analyzer &operator=(const Analyzer &) = delete;
   Analyzer(Analyzer &&) = delete;
-  Analyzer& operator=(Analyzer &&) = delete;
-private:
-  void TensorInfoToJson(nlohmann::json& j, const analyzer::TensorInfo &tensor_info);
-  void OpInfoToJson(nlohmann::json& j, const analyzer::OpInfo &op_info);
-  void GraphInfoToJson(nlohmann::json& j, const analyzer::GraphInfo &graph_info);
+  Analyzer &operator=(Analyzer &&) = delete;
+
+ private:
+  void TensorInfoToJson(nlohmann::json &j, const analyzer::TensorInfo &tensor_info);
+  void OpInfoToJson(nlohmann::json &j, const analyzer::OpInfo &op_info);
+  void GraphInfoToJson(nlohmann::json &j, const analyzer::GraphInfo &graph_info);
 
+  ge::Status SaveAnalyzerDataToFile();
   ge::Status SaveOpInfo(ge::OpDescPtr desc, analyzer::DataInfo &data_info,
-                                  std::shared_ptr<analyzer::GraphInfo> graph_info);
+                        std::shared_ptr<analyzer::GraphInfo> graph_info);
 
   void ClearHistoryFile();
   ge::Status CreateAnalyzerFile();
 
-  explicit Analyzer() {};
+  explicit Analyzer(){};
   ~Analyzer() = default;
 
-private:
+ private:
   std::map<uint64_t, std::map<uint64_t, std::shared_ptr<analyzer::GraphInfo>>> graph_infos_;
-  std::recursive_mutex mutex_; // protect graph_infos_
-  std::mutex file_mutex_; // protect json_file_
+  std::recursive_mutex mutex_;  // protect graph_infos_
+  std::mutex file_mutex_;       // protect json_file_
   std::ofstream json_file_;
   std::string json_file_name_;
   std::atomic_bool is_json_file_create_{false};
 };
-} // namespace ge
-#endif // DOMI_ANALYZER_ANANLYZER_H_
+}  // namespace ge
+#endif  // DOMI_ANALYZER_ANANLYZER_H_

ge/client/module.mk

@@ -4,6 +4,7 @@ LOCAL_PATH := $(call my-dir)
 COMMON_LOCAL_SRC_FILES := \
     proto/ge_api.proto \
     ge_api.cc \
+    ge_prof.cc \
 
 
 COMMON_LOCAL_C_INCLUDES := \
@@ -51,7 +52,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_client
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1 -Dgoogle=ascend_private
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 endif
@@ -62,16 +63,17 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libascend_protobuf \
+    libprotobuf \
     libslog \
     libmmpa \
     libgraph \
     libregister \
     libge_compiler \
-    libge_common
-
-LOCAL_STATIC_LIBRARIES += libmsprofiler_fwk \
+    libge_common \
+    libmsprof \
+    stub/libascend_hal
 
+LOCAL_STATIC_LIBRARIES := libmsprofiler
 
 LOCAL_LDFLAGS := -lrt -ldl
 
@@ -87,7 +89,7 @@ LOCAL_MODULE := libge_client
 LOCAL_CFLAGS += -Werror
 LOCAL_CFLAGS += -DGOOGLE_PROTOBUF_NO_RTTI -DDEV_VISIBILITY
 LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0
-LOCAL_CFLAGS += -DOMG_DEVICE_VERSION  -DREUSE_MEMORY=1  -Dgoogle=ascend_private
+LOCAL_CFLAGS += -DOMG_DEVICE_VERSION  -DREUSE_MEMORY=1
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 LOCAL_C_INCLUDES := $(DEVICE_LOCAL_C_INCLUDES)
@@ -96,18 +98,17 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libascend_protobuf \
+    libprotobuf \
     libslog \
     libmmpa \
     libgraph \
     libregister \
     libruntime \
     libge_compiler \
-    libge_common
-
-
-LOCAL_STATIC_LIBRARIES += libmsprofiler_fwk \
+    libge_common \
+    libmsprof
 
+LOCAL_STATIC_LIBRARIES := libmsprofiler
 
 LOCAL_LDFLAGS := -lrt -ldl
 LOCAL_CFLAGS += \