modified: cmake/external_libs/gflags.cmake

modified:   cmake/external_libs/protobuf_shared.cmake
	modified:   cmake/external_libs/protobuf_static.cmake
	modified:   ge/CMakeLists.txt
	modified:   ge/client/module.mk
	modified:   ge/common/CMakeLists.txt
	modified:   ge/common/ge_common.mk
	modified:   ge/executor/CMakeLists.txt
	modified:   ge/executor/module.mk
	modified:   ge/ge_inference.mk
	modified:   ge/ge_local_engine/CMakeLists.txt
	modified:   ge/ge_local_engine/module.mk
	modified:   ge/ge_runner.mk
	modified:   ge/graph/build/memory/CMakeLists.txt
	modified:   ge/graph/build/memory/module.mk
	modified:   ge/host_cpu_engine/CMakeLists.txt
	modified:   ge/host_cpu_engine/module.mk
	modified:   ge/offline/CMakeLists.txt
	modified:   ge/offline/module.mk
	modified:   metadef
	modified:   parser

cmake/external_libs/gflags.cmake

@@ -3,11 +3,10 @@ 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"))
-    set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE)
+    set(CMAKE_INSTALL_PREFIX ${METADEF_DIR}/output CACHE STRING "path for install()" FORCE)
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
 
@@ -19,11 +18,12 @@ 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 
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR>
+                    #SOURCE_DIR ${METADEF_DIR}/../../third_party/gflags/src/gflags-2.2.2 
+                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS=${gflags_CXXFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR>
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install
                     EXCLUDE_FROM_ALL TRUE 

cmake/external_libs/protobuf_shared.cmake

@@ -7,7 +7,7 @@ include(GNUInstallDirs)
 
 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)
+    set(CMAKE_INSTALL_PREFIX ${METADEF_DIR}/output CACHE STRING "path for install()" FORCE)
     message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.")
 endif()
 
@@ -19,25 +19,20 @@ else()
     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_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_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
 ExternalProject_Add(protobuf_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
-                    #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"
+                    URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
+                    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
                     BUILD_COMMAND $(MAKE)
                     INSTALL_COMMAND $(MAKE) install
                     EXCLUDE_FROM_ALL TRUE
@@ -46,23 +41,25 @@ include(GNUInstallDirs)
 
 set(PROTOBUF_SHARED_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf)
 
-add_library(protobuf SHARED IMPORTED)
+add_library(ascend_protobuf SHARED IMPORTED)
 
 file(MAKE_DIRECTORY ${PROTOBUF_SHARED_PKG_DIR}/include)
 
-set_target_properties(protobuf PROPERTIES
-                      IMPORTED_LOCATION ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so
+set_target_properties(ascend_protobuf PROPERTIES
+                      IMPORTED_LOCATION ${PROTOBUF_SHARED_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libascend_protobuf.so
 )
 
-target_include_directories(protobuf INTERFACE ${PROTOBUF_SHARED_PKG_DIR}/include)
+target_include_directories(ascend_protobuf INTERFACE ${PROTOBUF_SHARED_PKG_DIR}/include)
 
 set(INSTALL_BASE_DIR "")
 set(INSTALL_LIBRARY_DIR lib)
 
-install(FILES ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so.19.0.0 OPTIONAL
+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
         DESTINATION ${INSTALL_LIBRARY_DIR})
 
-add_dependencies(protobuf protobuf_build)
+add_dependencies(ascend_protobuf protobuf_build)
 
 #set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add")
 set(HAVE_PROTOBUF TRUE)

cmake/external_libs/protobuf_static.cmake

@@ -16,13 +16,13 @@ else()
     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_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_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 ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0
+                    #SOURCE_DIR ${METADEF_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}
@@ -38,14 +38,14 @@ ExternalProject_Add(protobuf_static_build
 )
 include(GNUInstallDirs)
 
-add_library(protobuf_static_lib STATIC IMPORTED)
+add_library(ascend_protobuf_static_lib STATIC IMPORTED)
 
-set_target_properties(protobuf_static_lib PROPERTIES
-                      IMPORTED_LOCATION ${PROTOBUF_STATIC_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libprotobuf.a
+set_target_properties(ascend_protobuf_static_lib PROPERTIES
+                      IMPORTED_LOCATION ${PROTOBUF_STATIC_PKG_DIR}/${CMAKE_INSTALL_LIBDIR}/libascend_protobuf.a
 )
 
-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)
+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)
 
-add_dependencies(protobuf_static protobuf_static_build)
+add_dependencies(ascend_protobuf_static protobuf_static_build)

ge/CMakeLists.txt

@@ -339,6 +339,7 @@ target_compile_definitions(ge_runner PRIVATE
     REUSE_MEMORY=1
     FMK_SUPPORT_DUMP
     DAVINCI_CLOUD
+    google=ascend_private
 )
 
 target_compile_options(ge_runner PRIVATE
@@ -379,7 +380,7 @@ target_link_libraries(ge_runner
     -Wl,--no-as-needed
     graph
     ge_common
-    protobuf
+    ascend_protobuf
     register
     c_sec
     slog
@@ -667,6 +668,7 @@ target_compile_definitions(ge_compiler PRIVATE
     FMK_SUPPORT_DUMP
     FMK_HOST_INFER
     COMPILE_OMG_PACKAGE
+    google=ascend_private
 )
 
 target_compile_options(ge_compiler PRIVATE
@@ -705,7 +707,7 @@ target_link_libraries(ge_compiler
     -Wl,--no-as-needed
     graph
     ge_common
-    protobuf
+    ascend_protobuf
     register
     c_sec
     error_manager
@@ -739,6 +741,11 @@ endif()
 add_library(opensrc_ascendcl SHARED
     ${OBJECT_LIST}
 )
+
+target_compile_definitions(opensrc_ascendcl PRIVATE
+    google=ascend_private
+)
+
 target_compile_options(opensrc_ascendcl PRIVATE
     -O2
     -fvisibility=hidden
@@ -755,7 +762,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE
                      ge_executor
                      ge_common_static
                      graph_static
-                     protobuf_static
+                     ascend_protobuf_static
                      register_static
                      error_manager_static
                      adump_server

ge/client/module.mk

@@ -52,7 +52,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_client
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1 -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 endif
@@ -63,7 +63,7 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libmmpa \
     libgraph \
@@ -88,7 +88,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
+LOCAL_CFLAGS += -DOMG_DEVICE_VERSION  -DREUSE_MEMORY=1  -Dgoogle=ascend_private
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 LOCAL_C_INCLUDES := $(DEVICE_LOCAL_C_INCLUDES)
@@ -97,7 +97,7 @@ LOCAL_SRC_FILES := $(COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libmmpa \
     libgraph \

ge/common/CMakeLists.txt

@@ -70,6 +70,7 @@ target_compile_definitions(ge_common PRIVATE
     HOST_VISIBILITY
     FMK_SUPPORT_DUMP
     OS_CENTOS
+    google=ascend_private
 )
 
 target_compile_options(ge_common PRIVATE
@@ -104,7 +105,7 @@ target_link_libraries(ge_common PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
     graph
-    protobuf
+    ascend_protobuf
     register
     c_sec
     error_manager
@@ -123,6 +124,7 @@ target_compile_definitions(ge_common_static PRIVATE
     HOST_VISIBILITY
     FMK_SUPPORT_DUMP
     OS_CENTOS
+    google=ascend_private
 )
 
 target_compile_options(ge_common_static PRIVATE
@@ -155,7 +157,7 @@ target_include_directories(ge_common_static PRIVATE
 
 target_link_libraries(ge_common_static PRIVATE
     $<BUILD_INTERFACE:intf_pub>
-    protobuf
+    ascend_protobuf
     json
     c_sec
     -lrt

ge/common/ge_common.mk

@@ -82,7 +82,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libge_common
 
 LOCAL_CFLAGS += -Werror -DFMK_SUPPORT_DUMP
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2 -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
     LOCAL_CFLAGS += -g -O0
 else
@@ -105,7 +105,7 @@ LOCAL_C_INCLUDES := $(GE_COMMON_LOCAL_C_INCLUDES)
 LOCAL_SRC_FILES := $(GE_COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
-    libprotobuf \
+    libascend_protobuf \
     libc_sec \
     libslog \
     libmmpa \
@@ -123,7 +123,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libge_common
 
 LOCAL_CFLAGS += -Werror -DFMK_SUPPORT_DUMP
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2  -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
     LOCAL_CFLAGS += -g -O0
 else
@@ -146,7 +146,7 @@ LOCAL_C_INCLUDES := $(GE_COMMON_LOCAL_C_INCLUDES)
 LOCAL_SRC_FILES := $(GE_COMMON_LOCAL_SRC_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
-    libprotobuf \
+    libascend_protobuf \
     libc_sec \
     libslog \
     libmmpa \
@@ -169,7 +169,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libge_common
 
 LOCAL_CFLAGS += -Werror -DFMK_SUPPORT_DUMP
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2  -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
     LOCAL_CFLAGS += -g -O0
 endif
@@ -192,7 +192,7 @@ LOCAL_SRC_FILES := $(GE_COMMON_LOCAL_SRC_FILES)
 
 LOCAL_STATIC_LIBRARIES := \
     libgraph     \
-    libprotobuf  \
+    libascend_protobuf  \
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
@@ -211,7 +211,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libge_common
 
 LOCAL_CFLAGS += -Werror -DFMK_SUPPORT_DUMP
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2  -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
     LOCAL_CFLAGS += -g -O0
 endif
@@ -233,7 +233,7 @@ LOCAL_SRC_FILES := $(GE_COMMON_LOCAL_SRC_FILES)
 
 LOCAL_STATIC_LIBRARIES := \
     libgraph     \
-    libprotobuf  \
+    libascend_protobuf  \
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \

ge/executor/CMakeLists.txt

@@ -85,6 +85,7 @@ target_compile_options(ge_executor PRIVATE
 target_compile_definitions(ge_executor PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     DAVINCI_SUPPORT_PROFILING
+    google=ascend_private
 )
 
 target_include_directories(ge_executor PRIVATE
@@ -108,7 +109,7 @@ target_include_directories(ge_executor PRIVATE
 target_link_libraries(ge_executor PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     json
-    protobuf
+    ascend_protobuf
     c_sec
     -lrt
     -ldl

ge/executor/module.mk

@@ -82,7 +82,7 @@ local_ge_executor_c_include :=             \
     third_party/json/include               \
 
 local_ge_executor_shared_library :=        \
-    libprotobuf                            \
+    libascend_protobuf                            \
     libc_sec                               \
     libge_common                           \
     libruntime                             \
@@ -101,7 +101,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_executor
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2 -DDAVINCI_SUPPORT_PROFILING
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -O2 -DDAVINCI_SUPPORT_PROFILING -Dgoogle=ascend_private
 
 LOCAL_SRC_FILES := $(local_ge_executor_src_files)
 LOCAL_C_INCLUDES := $(local_ge_executor_c_include)
@@ -127,7 +127,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_executor
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 else
@@ -139,7 +139,7 @@ LOCAL_SRC_FILES := $(local_ge_executor_src_files)
 LOCAL_C_INCLUDES := $(local_ge_executor_c_include)
 
 LOCAL_SHARED_LIBRARIES :=                  \
-    libprotobuf                            \
+    libascend_protobuf                            \
     libc_sec                               \
     libge_common                           \
     libruntime                             \
@@ -163,7 +163,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_executor
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 else
@@ -178,7 +178,7 @@ LOCAL_STATIC_LIBRARIES := \
     libge_common \
     libgraph     \
     libregister  \
-    libprotobuf  \
+    libascend_protobuf  \
 
 LOCAL_SHARED_LIBRARIES :=                  \
     libc_sec                               \
@@ -196,7 +196,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libge_executor
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DDAVINCI_SUPPORT_PROFILING -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 else
@@ -210,7 +210,7 @@ LOCAL_STATIC_LIBRARIES := \
     libge_common \
     libgraph     \
     libregister  \
-    libprotobuf  \
+    libascend_protobuf  \
 
 LOCAL_SHARED_LIBRARIES :=                  \
     libc_sec                               \

ge/ge_inference.mk

@@ -363,7 +363,7 @@ LOCAL_MODULE := libge_compiler
 
 LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1 -O2
 # from ome_inference.mk
-LOCAL_CFLAGS += -DFMK_HOST_INFER -DFMK_SUPPORT_DUMP -DCOMPILE_OMG_PACKAGE
+LOCAL_CFLAGS += -DFMK_HOST_INFER -DFMK_SUPPORT_DUMP -DCOMPILE_OMG_PACKAGE -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 endif
@@ -383,7 +383,7 @@ LOCAL_STATIC_LIBRARIES := libge_memory \
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libmmpa \
     libgraph \
@@ -428,7 +428,7 @@ LOCAL_CFLAGS += -DGOOGLE_PROTOBUF_NO_RTTI -DDEV_VISIBILITY -DNONSUPPORT_SAVE_TO_
 LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0
 LOCAL_CFLAGS += -DREUSE_MEMORY=1 -DFMK_SUPPORT_DUMP -DCOMPILE_OMG_PACKAGE
 LOCAL_CFLAGS += -DOMG_DEVICE_VERSION
-LOCAL_CFLAGS += -O2
+LOCAL_CFLAGS += -O2 -Dgoogle=ascend_private
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 
@@ -447,7 +447,7 @@ LOCAL_STATIC_LIBRARIES := libge_memory \
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libmmpa \
     libgraph \

ge/ge_local_engine/CMakeLists.txt

@@ -28,6 +28,10 @@ target_compile_options(ge_local_engine PRIVATE
     -Werror
 )
 
+target_compile_definitions(ge_local_engine PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(ge_local_engine PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -50,7 +54,7 @@ target_link_libraries(ge_local_engine PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
     graph
-    protobuf
+    ascend_protobuf
     register
     c_sec
     slog
@@ -67,6 +71,7 @@ target_compile_options(atc_ge_local_engine PRIVATE
 
 target_compile_definitions(atc_ge_local_engine PRIVATE
     COMPILE_OMG_PACKAGE
+    google=ascend_private
 )
 
 target_include_directories(atc_ge_local_engine PRIVATE
@@ -91,7 +96,7 @@ target_link_libraries(atc_ge_local_engine PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
     graph
-    protobuf
+    ascend_protobuf
     register
     c_sec
     slog
@@ -111,6 +116,10 @@ target_compile_options(ge_local_opskernel_builder PRIVATE
     -Werror
 )
 
+target_compile_definitions(ge_local_opskernel_builder PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(ge_local_opskernel_builder PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -132,7 +141,7 @@ target_include_directories(ge_local_opskernel_builder PRIVATE
 target_link_libraries(ge_local_opskernel_builder PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     slog
     register
@@ -147,6 +156,10 @@ target_compile_options(atc_ge_local_opskernel_builder PRIVATE
     -Werror
 )
 
+target_compile_definitions(atc_ge_local_opskernel_builder PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(atc_ge_local_opskernel_builder PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -168,7 +181,7 @@ target_include_directories(atc_ge_local_opskernel_builder PRIVATE
 target_link_libraries(atc_ge_local_opskernel_builder PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     slog
     register
@@ -188,6 +201,10 @@ target_compile_options(ge_local_opskernel_builder_static PRIVATE
     -Werror
 )
 
+target_compile_definitions(ge_local_opskernel_builder_static PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(ge_local_opskernel_builder_static PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -208,7 +225,7 @@ target_include_directories(ge_local_opskernel_builder_static PRIVATE
 
 target_link_libraries(ge_local_opskernel_builder_static PRIVATE
     $<BUILD_INTERFACE:intf_pub>
-    protobuf
+    ascend_protobuf
     c_sec
 )
 

ge/ge_local_engine/module.mk

@@ -29,11 +29,11 @@ local_lib_inc_path :=   proto/task.proto \
 include $(CLEAR_VARS)
 LOCAL_MODULE := libge_local_engine
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS := 
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -49,11 +49,11 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := atclib/libge_local_engine
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11 -DCOMPILE_OMG_PACKAGE
+LOCAL_CFLAGS += -std=c++11 -DCOMPILE_OMG_PACKAGE -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -69,11 +69,11 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libge_local_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libregister \
@@ -90,11 +90,11 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := atclib/libge_local_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libregister \
@@ -110,10 +110,10 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libge_local_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
-LOCAL_STATIC_LIBRARIES :=   libprotobuf \
+LOCAL_STATIC_LIBRARIES :=   libascend_protobuf \
                             libregister \
                             libgraph \
 
@@ -130,10 +130,10 @@ include ${BUILD_HOST_STATIC_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libge_local_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
-LOCAL_STATIC_LIBRARIES :=   libprotobuf \
+LOCAL_STATIC_LIBRARIES :=   libascend_protobuf \
                             libregister \
                             libgraph \
 

ge/ge_runner.mk

@@ -352,7 +352,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libge_runner
 
 LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DREUSE_MEMORY=1 -O2
-LOCAL_CFLAGS += -DFMK_SUPPORT_DUMP -DDAVINCI_SUPPORT_PROFILING -DDAVINCI_CLOUD
+LOCAL_CFLAGS += -DFMK_SUPPORT_DUMP -DDAVINCI_SUPPORT_PROFILING -DDAVINCI_CLOUD -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 endif
@@ -369,7 +369,7 @@ LOCAL_STATIC_LIBRARIES := libge_memory \
 
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libmmpa \
     libgraph \

ge/graph/build/memory/CMakeLists.txt

@@ -16,9 +16,13 @@ target_compile_options(ge_memory PRIVATE
     -O2
 )
 
+target_compile_definitions(ge_memory PRIVATE
+    google=ascend_private
+)
+
 target_link_libraries(ge_memory PRIVATE
     $<BUILD_INTERFACE:intf_pub>
-    protobuf
+    ascend_protobuf
     c_sec
 )
 

ge/graph/build/memory/module.mk

@@ -25,7 +25,7 @@ LOCAL_MODULE := libge_memory
 
 LOCAL_CFLAGS += -std=c++11
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -O2
+LOCAL_CFLAGS += -O2 -Dgoogle=ascend_private
 ifeq ($(DEBUG), 1)
 LOCAL_CFLAGS += -g -O0
 endif
@@ -33,7 +33,7 @@ endif
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -56,11 +56,11 @@ LOCAL_MODULE := libge_memory
 LOCAL_CFLAGS += -std=c++11
 LOCAL_CFLAGS += -Werror
 LOCAL_CFLAGS += -DGOOGLE_PROTOBUF_NO_RTTI -DDEV_VISIBILITY
-LOCAL_CFLAGS += -O2
+LOCAL_CFLAGS += -O2 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -79,11 +79,11 @@ include ${BUILD_STATIC_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libge_memory
 
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \

ge/host_cpu_engine/CMakeLists.txt

@@ -22,6 +22,10 @@ target_compile_options(host_cpu_engine PRIVATE
     -Werror
 )
 
+target_compile_definitions(host_cpu_engine PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(host_cpu_engine PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -42,7 +46,7 @@ target_include_directories(host_cpu_engine PRIVATE
 target_link_libraries(host_cpu_engine PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     graph
     register
@@ -60,6 +64,7 @@ target_compile_options(atc_host_cpu_engine PRIVATE
 
 target_compile_definitions(atc_host_cpu_engine PRIVATE
     COMPILE_OMG_PACKAGE
+    google=ascend_private
 )
 
 target_include_directories(atc_host_cpu_engine PRIVATE
@@ -82,7 +87,7 @@ target_include_directories(atc_host_cpu_engine PRIVATE
 target_link_libraries(atc_host_cpu_engine PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     graph
     register
@@ -103,6 +108,10 @@ target_compile_options(host_cpu_opskernel_builder PRIVATE
     -Werror
 )
 
+target_compile_definitions(host_cpu_opskernel_builder PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(host_cpu_opskernel_builder PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -123,7 +132,7 @@ target_include_directories(host_cpu_opskernel_builder PRIVATE
 target_link_libraries(host_cpu_opskernel_builder PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     slog
     graph
@@ -138,6 +147,10 @@ target_compile_options(atc_host_cpu_opskernel_builder PRIVATE
     -Werror
 )
 
+target_compile_definitions(atc_host_cpu_opskernel_builder PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(atc_host_cpu_opskernel_builder PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -158,7 +171,7 @@ target_include_directories(atc_host_cpu_opskernel_builder PRIVATE
 target_link_libraries(atc_host_cpu_opskernel_builder PRIVATE
     $<BUILD_INTERFACE:intf_pub>
     -Wl,--no-as-needed
-    protobuf
+    ascend_protobuf
     c_sec
     slog
     graph
@@ -178,6 +191,10 @@ target_compile_options(host_cpu_opskernel_builder_static PRIVATE
     -Werror
 )
 
+target_compile_definitions(host_cpu_opskernel_builder_static PRIVATE
+    google=ascend_private
+)
+
 target_include_directories(host_cpu_opskernel_builder_static PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${GE_CODE_DIR}/ge
@@ -197,7 +214,7 @@ target_include_directories(host_cpu_opskernel_builder_static PRIVATE
 
 target_link_libraries(host_cpu_opskernel_builder_static PRIVATE
     $<BUILD_INTERFACE:intf_pub>
-    protobuf
+    ascend_protobuf
     c_sec
 )
 

ge/host_cpu_engine/module.mk

@@ -21,11 +21,11 @@ local_lib_inc_path :=   proto/task.proto \
 include $(CLEAR_VARS)
 LOCAL_MODULE := libhost_cpu_engine
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -41,11 +41,11 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := atclib/libhost_cpu_engine
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11 -DCOMPILE_OMG_PACKAGE
+LOCAL_CFLAGS += -std=c++11 -DCOMPILE_OMG_PACKAGE -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -61,11 +61,11 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libhost_cpu_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \
@@ -81,10 +81,10 @@ include ${BUILD_HOST_SHARED_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libhost_cpu_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
-LOCAL_STATIC_LIBRARIES :=   libprotobuf \
+LOCAL_STATIC_LIBRARIES :=   libascend_protobuf \
                             libgraph \
                             libregister \
 
@@ -101,10 +101,10 @@ include ${BUILD_HOST_STATIC_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := libhost_cpu_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
-LOCAL_STATIC_LIBRARIES :=   libprotobuf \
+LOCAL_STATIC_LIBRARIES :=   libascend_protobuf \
                             libgraph \
                             libregister \
 
@@ -121,11 +121,11 @@ include ${BUILD_STATIC_LIBRARY}
 include $(CLEAR_VARS)
 LOCAL_MODULE := atclib/libhost_cpu_opskernel_builder
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -std=c++11 -Dgoogle=ascend_private
 LOCAL_LDFLAGS :=
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=   libprotobuf \
+LOCAL_SHARED_LIBRARIES :=   libascend_protobuf \
                             libc_sec \
                             libslog \
                             libgraph \

ge/offline/CMakeLists.txt

@@ -25,6 +25,7 @@ target_compile_options(atc PRIVATE
 target_compile_definitions(atc PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     COMPILE_OMG_PACKAGE
+    google=ascend_private
 )
 
 target_include_directories(atc PRIVATE
@@ -55,7 +56,7 @@ target_include_directories(atc PRIVATE
 
 target_link_libraries(atc PRIVATE
     $<BUILD_INTERFACE:intf_pub>
-    protobuf
+    ascend_protobuf
     ge_common
     register
     c_sec

ge/offline/module.mk

@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := atc
 
 LOCAL_CFLAGS += -Werror
-LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DCOMPILE_OMG_PACKAGE -O2
+LOCAL_CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DCOMPILE_OMG_PACKAGE -O2 -Dgoogle=ascend_private
 
 LOCAL_SRC_FILES := \
     main.cc \
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_SHARED_LIBRARIES := \
     libc_sec \
     libge_common \
-    libprotobuf \
+    libascend_protobuf \
     libslog \
     libgraph \
     libregister \

metadef

@@ -1 +1 @@
-Subproject commit d08620f627a7fb8087271c2dea0677f8a00b96d4
+Subproject commit 0d0d2fb016d44f9a575ad8f8c2cb8858bba3acec

parser

@@ -1 +1 @@
-Subproject commit 0d5193545fa26cc616c542f42d9580aeb12a7c4a
+Subproject commit 84ea76e94054fcfac5b80ded6e0ec4db1f37d3e0