!503 code update

From: @zhupuxu
Reviewed-by: 
Signed-off-by:

.gitignore

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

.gitmodules

@@ -1,8 +0,0 @@
-[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

Third_Party_Open_Source_Software_Notice

@@ -458,76 +458,3 @@ Copyright (c) Facebook Inc. and Microsoft Corporation.
 
 License: MIT License
 Please see above.
-
-
-
-Software: caffe 1.0
-
-License: BSD 2-Clause License
-
-Open Source Software Licensed Under the BSD 2-Clause License
-
-GraphEngine uses source code files from caffe so as to support model format conversion from caffe model to GraphEngine model.
-Please see below for the full list of source code files from caffe that are used by GraphEngine.
-The below software in this distribution may have been modified by Huawei Technologies Co., Ltd ("Huawei Modifications"). All Huawei Modifications are Copyright 2019-2020 Huawei Technologies Co., Ltd.
-----------------------------------------------------------------------------------------
-1. caffe.proto  master
-All contributions by the University of California:
-Copyright (c) 2014-2017 The Regents of the University of California (Regents)
-All rights reserved.
-
-
-Terms of the BSD 2-Clause License:
---------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-Software: tensorflow 1.15.0
-
-License: Apache-2.0 License
-
-Open Source Software Licensed Under the Apache-2.0 License
-
-
-GraphEngine uses source code files from tensorflow so as to support model format conversion from tensorflow model to GraphEngine model.
-Please see below for the full list of source code files from tensorflow that are used by GraphEngine.
-The below software in this distribution may have been modified by Huawei Technologies Co., Ltd ("Huawei Modifications"). All Huawei Modifications are Copyright 2019-2020 Huawei Technologies Co., Ltd.
-----------------------------------------------------------------------------------------
-1. attr_value.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-2. function.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-3. graph.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-4. node_def.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-5. op_def.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-6. resource_handle.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-7. tensor.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-8. tensor_shape.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-9. types.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-10. versions.proto  master
-Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Terms of the Apache-2.0 License:
-Please see above.

classify_rule.txt

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

cmake/FindModule.cmake

@@ -1,29 +0,0 @@
-#[[
-  module - the name of export imported target
-  name   - find the library name
-  path   - find the library path
-#]]
-function(find_module module name)
-    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
-    )
-
-    message(STATUS "find ${name} location ${${module}_LIBRARY_DIR}")
-    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}
-    )
-endfunction()

cmake/external_libs/eigen.cmake

@@ -0,0 +1,22 @@
+set(Eigen3_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2")
+set(Eigen3_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
+set(Eigen3_NS "ge_")
+
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/eigen-git-mirrorsource/repository/archive/3.3.7.tar.gz")
+    set(MD5 "cf6552a5d90c1aca4b5e0b011f65ea93")
+else()
+    set(REQ_URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz")
+    set(MD5 "9e30f67e8531477de4117506fe44669b")
+endif ()
+
+graphengine_add_pkg(Eigen3
+        VER 3.3.7
+        URL ${REQ_URL}
+        MD5 ${MD5}
+        CMAKE_OPTION -DBUILD_TESTING=OFF)
+
+find_package(Eigen3 3.3.7 REQUIRED ${GE_FIND_NO_DEFAULT_PATH})
+set_property(TARGET Eigen3::Eigen PROPERTY IMPORTED_GLOBAL TRUE)
+add_library(graphengine::eigen ALIAS Eigen3::Eigen)
+include_directories(${EIGEN3_INCLUDE_DIRS})

cmake/external_libs/gflags.cmake

@@ -1,48 +0,0 @@
-if (HAVE_GFLAGS)
-    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 (ENABLE_GITEE)
-    set(REQ_URL "https://gitee.com/mirrors/gflags/repository/archive/v2.2.2.tar.gz")
-    set(MD5 "")
-else()
-    set(REQ_URL "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz")
-    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>
-                    BUILD_COMMAND $(MAKE)
-                    INSTALL_COMMAND $(MAKE) install
-                    EXCLUDE_FROM_ALL TRUE 
-)
-
-set(GFLAGS_PKG_DIR ${CMAKE_INSTALL_PREFIX}/gflags)
-
-add_library(gflags_static STATIC IMPORTED)
-
-set_target_properties(gflags_static PROPERTIES
-                      IMPORTED_LOCATION ${GFLAGS_PKG_DIR}/lib/libgflags.a
-)
-
-add_library(gflags INTERFACE)
-target_include_directories(gflags INTERFACE ${GFLAGS_PKG_DIR}/include)
-target_link_libraries(gflags INTERFACE gflags_static)
-
-add_dependencies(gflags gflags_build)
-
-#set(HAVE_GFLAGS TRUE CACHE BOOL "gflags build add")
-set(HAVE_GFLAGS TRUE)

cmake/external_libs/gtest.cmake

@@ -1,81 +1,24 @@
-if (HAVE_GTEST)
-    return()
-endif()
+set(ge_gtest_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
+set(ge_gtest_CFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
 
-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 "")
+if (ENABLE_GITEE)
+    set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.0.tar.gz")
+    set(MD5 "89e13ca1aa48d370719d58010b83f62c")
 else()
-    set(REQ_URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz")
-    set(MD5 "")
+    set(REQ_URL "https://github.com/google/googletest/archive/release-1.8.0.tar.gz")
+    set(MD5 "16877098823401d1bf2ed7891d7dce36")
 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)
+graphengine_add_pkg(ge_gtest
+        VER 1.8.0
+        LIBS gtest gtest_main
+        URL ${REQ_URL}
+        MD5 ${MD5}
+        CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON
+        -DCMAKE_MACOSX_RPATH=TRUE -Dgtest_disable_pthreads=ON)
+
+add_library(graphengine::gtest ALIAS ge_gtest::gtest)
+add_library(graphengine::gtest_main ALIAS ge_gtest::gtest_main)
+include_directories(${ge_gtest_INC})
+file(COPY ${ge_gtest_INC}/../lib/libgtest.so DESTINATION ${CMAKE_SOURCE_DIR}/build/graphengine)
+file(COPY ${ge_gtest_INC}/../lib/libgtest_main.so DESTINATION ${CMAKE_SOURCE_DIR}/build/graphengine)

cmake/external_libs/json.cmake

@@ -1,38 +1,20 @@
-if (HAVE_JSON)
-    return()
-endif()
+set(nlohmann_json_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2")
+set(nlohmann_json_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
 
-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(INCLUDE "./include")
 else()
     set(REQ_URL "https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip")
     set(MD5 "0dc903888211db3a0f170304cd9f3a89")
-    set(JSON_INCLUDE_DIR ${JSON_SRC_DIR})
+    set(INCLUDE "./")
 endif ()
-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 ""
-                    EXCLUDE_FROM_ALL TRUE 
-)
-
-
-add_library(json INTERFACE)
-target_include_directories(json INTERFACE ${JSON_INCLUDE_DIR})
-add_dependencies(json json_build)
 
-#set(HAVE_JSON TRUE CACHE BOOL "json build add")
-set(HAVE_JSON TRUE)
+graphengine_add_pkg(ge_nlohmann_json
+        VER 3.6.1
+        HEAD_ONLY ${INCLUDE}
+        URL ${REQ_URL}
+        MD5 ${MD5})
+include_directories(${ge_nlohmann_json_INC})
+add_library(graphengine::json ALIAS ge_nlohmann_json)

cmake/external_libs/onnx.cmake

@@ -1,15 +1,4 @@
-include(ExternalProject)
-
-#set(ONNX_SRC_DIR /home/txd/workspace/cloud_code/graphengine/build/graphengine/open_source/onnx)
-#set(ONNX_PROTO ${ONNX_SRC_DIR}/onnx/onnx.proto)
-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()
@@ -17,25 +6,8 @@ else()
     set(MD5 "512f2779d6215d4a36f366b6b9acdf1e")
 endif ()
 
-ExternalProject_Add(onnx
-                    URL ${REQ_URL}
-                    #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 "" 
-                    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/onnx/onnx.proto ${ONNX_PROTO_FILE}
-                    #BUILD_ALWAYS TRUE
-                    EXCLUDE_FROM_ALL TRUE
-)
-
-macro(onnx_protobuf_generate comp c_var h_var)
-    add_custom_command(OUTPUT ${ONNX_PROTO_FILE}
-        DEPENDS onnx
-    )
-    ge_protobuf_generate(${comp} ${c_var} ${h_var} ${ONNX_PROTO_FILE})
-endmacro()
-
-
+graphengine_add_pkg(onnx
+        VER 1.6.0
+        HEAD_ONLY ./
+        URL ${REQ_URL}
+        MD5 ${MD5})

cmake/external_libs/protobuf.cmake

@@ -0,0 +1,70 @@
+if (NOT TARGET ge_protobuf::ascend_protobuf)
+if (AS_MS_COMP)
+    set(protobuf_USE_STATIC_LIBS OFF)
+    set(protobuf_CMAKE_OPTION -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DLIB_PREFIX=ascend_
+        -DCMAKE_C_FLAGS=\"-Dgoogle=ascend_private\" -DCMAKE_CXX_FLAGS=\"-Dgoogle=ascend_private\")
+else ()
+    set(protobuf_USE_STATIC_LIBS ON)
+    set(protobuf_CMAKE_OPTION -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -DLIB_PREFIX=ascend_)
+endif ()
+set(ge_protobuf_CXXFLAGS "-Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -D_GLIBCXX_USE_CXX11_ABI=0")
+set(ge_protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
+set(_ge_tmp_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+string(REPLACE " -Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+string(REPLACE " -Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+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 ()
+
+graphengine_add_pkg(ge_protobuf
+        VER 3.8.0
+        LIBS ascend_protobuf
+        EXE protoc
+        URL ${REQ_URL}
+        MD5 ${MD5}
+        CMAKE_PATH ../cmake/
+        CMAKE_OPTION ${protobuf_CMAKE_OPTION})
+set(CMAKE_CXX_FLAGS ${_ge_tmp_CMAKE_CXX_FLAGS})
+endif()
+add_library(graphengine::protobuf ALIAS ge_protobuf::ascend_protobuf)
+set(PROTOBUF_LIBRARY ge_protobuf::ascend_protobuf)
+include_directories(${ge_protobuf_INC})
+include_directories(${ge_protobuf_DIRPATH}/src)
+
+function(ge_protobuf_generate comp c_var h_var)
+    if(NOT ARGN)
+        message(SEND_ERROR "Error: ge_protobuf_generate() called without any proto files")
+        return()
+    endif()
+
+    set(${c_var})
+    set(${h_var})
+
+    foreach(file ${ARGN})
+        get_filename_component(abs_file ${file} ABSOLUTE)
+        get_filename_component(file_name ${file} NAME_WE)
+        get_filename_component(file_dir ${abs_file} PATH)
+
+        list(APPEND ${c_var} "${CMAKE_BINARY_DIR}/proto/${comp}/proto/${file_name}.pb.cc")
+        list(APPEND ${h_var} "${CMAKE_BINARY_DIR}/proto/${comp}/proto/${file_name}.pb.h")
+
+        add_custom_command(
+                OUTPUT "${CMAKE_BINARY_DIR}/proto/${comp}/proto/${file_name}.pb.cc"
+                "${CMAKE_BINARY_DIR}/proto/${comp}/proto/${file_name}.pb.h"
+                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+                COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/proto/${comp}/proto"
+                COMMAND ge_protobuf::protoc -I${file_dir} --cpp_out=${CMAKE_BINARY_DIR}/proto/${comp}/proto ${abs_file}
+                DEPENDS ge_protobuf::protoc ${abs_file}
+                COMMENT "Running C++ protocol buffer compiler on ${file}" VERBATIM )
+    endforeach()
+
+    set_source_files_properties(${${c_var}} ${${h_var}} PROPERTIES GENERATED TRUE)
+    set(${c_var} ${${c_var}} PARENT_SCOPE)
+    set(${h_var} ${${h_var}} PARENT_SCOPE)
+
+endfunction()

cmake/external_libs/protobuf_shared.cmake

@@ -1,69 +0,0 @@
-if (HAVE_PROTOBUF)
-    return()
-endif()
-
-include(ExternalProject)
-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)
-    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")
-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(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}
-                    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
-                    BUILD_COMMAND $(MAKE)
-                    INSTALL_COMMAND $(MAKE) install
-                    EXCLUDE_FROM_ALL TRUE
-)
-include(GNUInstallDirs)
-
-set(PROTOBUF_SHARED_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf)
-
-add_library(ascend_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
-)
-
-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}/${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(ascend_protobuf protobuf_build)
-
-#set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add")
-set(HAVE_PROTOBUF TRUE)

cmake/external_libs/protobuf_static.cmake

@@ -1,66 +0,0 @@
-if (HAVE_PROTOBUF_STATIC)
-    return()
-endif()
-
-include(ExternalProject)
-include(GNUInstallDirs)
-#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)
-    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")
-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(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 ${METADEF_DIR}/../../third_party/protobuf/src/protobuf-3.8.0
-                    TLS_VERIFY OFF
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND}
-                    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                    -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
-                    -DCMAKE_LINKER=${CMAKE_LINKER}
-                    -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
-                    EXCLUDE_FROM_ALL TRUE
-)
-include(GNUInstallDirs)
-
-add_library(ascend_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
-)
-
-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)
-
-set(HAVE_PROTOBUF_STATIC TRUE)

cmake/external_libs/protoc.cmake

@@ -1,116 +0,0 @@
-if (HAVE_PROTOC)
-    return()
-endif()
-
-include(ExternalProject)
-include(GNUInstallDirs)
-#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)
-    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")
-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(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(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
-                    EXCLUDE_FROM_ALL TRUE
-)
-
-set(PROTOC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protoc)
-
-set(protoc_EXECUTABLE ${PROTOC_PKG_DIR}/${CMAKE_INSTALL_BINDIR}/protoc)
-
-function(protobuf_generate comp c_var h_var)
-    if(NOT ARGN)
-        message(SEND_ERROR "Error: protobuf_generate() called without any proto files")
-        return()
-    endif()
-    set(${c_var})
-    set(${h_var})
-
-    foreach(file ${ARGN})
-        get_filename_component(abs_file ${file} ABSOLUTE)
-        get_filename_component(file_name ${file} NAME_WE)
-        get_filename_component(file_dir ${abs_file} PATH)
-        get_filename_component(parent_subdir ${file_dir} NAME)
-
-        if("${parent_subdir}" STREQUAL "proto")
-            set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto)
-        else()
-            set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto/${parent_subdir})
-        endif()
-        list(APPEND ${c_var} "${proto_output_path}/${file_name}.pb.cc")
-        list(APPEND ${h_var} "${proto_output_path}/${file_name}.pb.h")
-
-        add_custom_command(
-                OUTPUT "${proto_output_path}/${file_name}.pb.cc" "${proto_output_path}/${file_name}.pb.h"
-                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${proto_output_path}"
-                COMMAND ${protoc_EXECUTABLE} -I${file_dir} --cpp_out=${proto_output_path} ${abs_file}
-                DEPENDS protoc_build ${abs_file}
-                COMMENT "Running C++ protocol buffer compiler on ${file}" VERBATIM )
-    endforeach()
-
-    set_source_files_properties(${${c_var}} ${${h_var}} PROPERTIES GENERATED TRUE)
-    set(${c_var} ${${c_var}} PARENT_SCOPE)
-    set(${h_var} ${${h_var}} PARENT_SCOPE)
-
-endfunction()
-
-function(protobuf_generate_py comp py_var)
-    if(NOT ARGN)
-        message(SEND_ERROR "Error: protobuf_generate_py() called without any proto files")
-        return()
-    endif()
-    set(${py_var})
-
-    foreach(file ${ARGN})
-        get_filename_component(abs_file ${file} ABSOLUTE)
-        get_filename_component(file_name ${file} NAME_WE)
-        get_filename_component(file_dir ${abs_file} PATH)
-        get_filename_component(parent_subdir ${file_dir} NAME)
-
-        if("${parent_subdir}" STREQUAL "proto")
-            set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto)
-        else()
-            set(proto_output_path ${CMAKE_BINARY_DIR}/proto/${comp}/proto/${parent_subdir})
-        endif()
-        list(APPEND ${py_var} "${proto_output_path}/${file_name}_pb2.py")
-
-        add_custom_command(
-                OUTPUT "${proto_output_path}/${file_name}_pb2.py"
-                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${proto_output_path}"
-                COMMAND ${protoc_EXECUTABLE} -I${file_dir} --python_out=${proto_output_path} ${abs_file}
-                DEPENDS protoc_build ${abs_file}
-                COMMENT "Running PYTHON protocol buffer compiler on ${file}" VERBATIM )
-    endforeach()
-
-    set_source_files_properties(${${py_var}} PROPERTIES GENERATED TRUE)
-    set(${py_var} ${${py_var}} PARENT_SCOPE)
-
-endfunction()
-
-#set(HAVE_PROTOC TRUE CACHE BOOL "protoc build add")
-set(HAVE_PROTOC TRUE)

cmake/external_libs/securec.cmake

@@ -1,71 +1,11 @@
-if (HAVE_C_SEC)
-    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/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
-                    #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}
-                    -DCMAKE_LINKER=${CMAKE_LINKER}
-                    -DCMAKE_AR=${CMAKE_AR}
-                    -DCMAKE_RANLIB=${CMAKE_RANLIB}
-                    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/c_sec <SOURCE_DIR>
-                    BUILD_COMMAND $(MAKE)
-                    INSTALL_COMMAND $(MAKE) install
-                    EXCLUDE_FROM_ALL TRUE
-)
-
-set(C_SEC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/c_sec)
-
-add_library(c_sec SHARED IMPORTED)
-
-file(MAKE_DIRECTORY ${C_SEC_PKG_DIR}/include)
-
-set_target_properties(c_sec PROPERTIES
-                      IMPORTED_LOCATION ${C_SEC_PKG_DIR}/lib/libc_sec.so
-)
-
-target_include_directories(c_sec INTERFACE ${C_SEC_PKG_DIR}/include)
-
-add_dependencies(c_sec c_sec_build)
-
-set(INSTALL_BASE_DIR "")
-set(INSTALL_LIBRARY_DIR lib)
-
-install(FILES ${C_SEC_PKG_DIR}/lib/libc_sec.so OPTIONAL
-        DESTINATION ${INSTALL_LIBRARY_DIR})
-
-add_library(c_sec_static_lib STATIC IMPORTED)
-set_target_properties(c_sec_static_lib PROPERTIES
-                      IMPORTED_LOCATION ${C_SEC_PKG_DIR}/lib/libc_sec.a
-)
-
-add_library(c_sec_static INTERFACE)
-target_include_directories(c_sec_static INTERFACE ${C_SEC_PKG_DIR}/include)
-target_link_libraries(c_sec_static INTERFACE c_sec_static_lib)
-
-add_dependencies(c_sec_static c_sec_build)
-
-#set(HAVE_C_SEC TRUE CACHE BOOL "c_sec build add")
-set(HAVE_C_SEC TRUE)
+graphengine_add_pkg(securec
+        VER 1.1.10
+        URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz
+        MD5 193f0ca5246c1dd84920db34d2d8249f
+        LIBS c_sec
+        PATCHES ${GE_SOURCE_DIR}/third_party/patch/securec/securec.patch001
+        CMAKE_OPTION "-DCMAKE_BUILD_TYPE=Release"
+        )
+include_directories(${securec_INC})
+file(COPY ${securec_INC}/../lib/libc_sec.so DESTINATION ${CMAKE_SOURCE_DIR}/build/graphengine)
+add_library(graphengine::securec ALIAS securec::c_sec)

cmake/intf_pub_android.cmake

@@ -1,52 +0,0 @@
-
-add_library(intf_pub INTERFACE)
-
-target_compile_options(intf_pub INTERFACE 	
-	-Wall 
-    -fPIC 
-    -fstack-protector-strong
-)
-target_compile_definitions(intf_pub INTERFACE
-    $<$<STREQUAL:${PRODUCT_SIDE},host>:_GLIBCXX_USE_CXX11_ABI=0> 
-	$<$<CONFIG:Release>:CFG_BUILD_NDEBUG>
-    $<$<CONFIG:Debug>:CFG_BUILD_DEBUG>
-    WIN64=1
-    LINUX=0
-)
-target_link_options(intf_pub INTERFACE
-	-Wl,-z,relro
-	-Wl,-z,now
-	-Wl,-z,noexecstack
-    $<$<CONFIG:Release>:-Wl,--build-id=none>    
-)
-target_link_directories(intf_pub INTERFACE
-)
-
-add_library(intf_ccec INTERFACE)
-target_compile_options(intf_ccec INTERFACE 	
-    -mcpu=cortex-a73
-    --target=aarch64-linux-android29
-    --sysroot=${HCC_PATH}/../sysroot
-    -L${HCC_PATH}/../lib/gcc/aarch64-linux-android/4.9.x
-	-Wall 
-    -fPIC 
-    -fstack-protector-strong
-)
-target_compile_definitions(intf_ccec INTERFACE
-    $<$<STREQUAL:${PRODUCT_SIDE},host>:_GLIBCXX_USE_CXX11_ABI=0> 
-	$<$<CONFIG:Release>:CFG_BUILD_NDEBUG>
-	$<$<CONFIG:Debug>:CFG_BUILD_DEBUG>
-)
-
-target_link_options(intf_ccec INTERFACE
-    -mcpu=cortex-a73
-    --target=aarch64-linux-android29
-    --sysroot=${HCC_PATH}/../sysroot
-    -L${HCC_PATH}/../lib/gcc/aarch64-linux-android/4.9.x
-    -Wl,-cce-host-android
-	-Wl,-z,relro
-	-Wl,-z,now
-	-Wl,-z,noexecstack
-    $<$<CONFIG:Release>:-Wl,--build-id=none> 
-)
-

cmake/intf_pub_linux.cmake

@@ -1,34 +0,0 @@
-if (HAVE_PUB)
-    return()
-endif()
-
-add_library(intf_pub INTERFACE)
-
-target_compile_options(intf_pub INTERFACE 	
-    -Wall 
-    -fPIC 
-    $<IF:$<STREQUAL:${CMAKE_SYSTEM_NAME},centos>,-fstack-protector-all,-fstack-protector-strong>
-    $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>    
-)
-target_compile_definitions(intf_pub INTERFACE
-    _GLIBCXX_USE_CXX11_ABI=0
-    $<$<CONFIG:Release>:CFG_BUILD_NDEBUG>
-    $<$<CONFIG:Debug>:CFG_BUILD_DEBUG>   
-    WIN64=1
-    LINUX=0
-    LOG_CPP
-)
-target_link_options(intf_pub INTERFACE
-    -Wl,-z,relro
-    -Wl,-z,now
-    -Wl,-z,noexecstack
-    $<$<CONFIG:Release>:-Wl,--build-id=none>    
-)
-target_link_directories(intf_pub INTERFACE
-)
-target_link_libraries(intf_pub INTERFACE 
-    -lpthread
-)
-
-#set(HAVE_PUB TRUE CACHE BOOL "pub add")
-set(HAVE_PUB TRUE)

cmake/intf_pub_windows.cmake

@@ -1,24 +0,0 @@
-
-add_library(intf_pub INTERFACE)
-
-target_compile_options(intf_pub INTERFACE
-	-Wall
-    -fPIC
-    $<IF:$<STREQUAL:${OS_TYPE},centos>,-fstack-protector-all,-fstack-protector-strong>
-    $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>
-)
-target_compile_definitions(intf_pub INTERFACE
-    $<$<STREQUAL:${PRODUCT_SIDE},host>:_GLIBCXX_USE_CXX11_ABI=0>
-    OS_TYPE=WIN64
-    WIN64=1
-    LINUX=0
-	$<$<CONFIG:Release>:CFG_BUILD_NDEBUG>
-	$<$<CONFIG:Debug>:CFG_BUILD_DEBUG>
-)
-target_link_options(intf_pub INTERFACE
-    $<$<CONFIG:Release>:-Wl,--build-id=none>
-)
-target_link_directories(intf_pub INTERFACE
-)
-target_link_libraries(intf_pub INTERFACE
-)

ge/client/proto/ge_api.proto

@@ -1 +0,0 @@
-../../proto/ge_api.proto

ge/client/proto/ge_ir.proto

@@ -1,191 +0,0 @@
-syntax = "proto3";
-
-package ge.proto;
-
-enum DataType
-{
-    DT_UNDEFINED = 0;  // Used to indicate a DataType field has not been set.
-    DT_FLOAT     = 1;  // float type
-    DT_FLOAT16   = 2;  // fp16 type
-    DT_INT8      = 3;  // int8 type
-    DT_UINT8     = 4;  // uint8 type
-    DT_INT16     = 5;  // int16 type
-    DT_UINT16    = 6;  // uint16 type
-    DT_INT32     = 7;  //
-    DT_INT64     = 8;  // int64 type
-    DT_UINT32    = 9;  // unsigned int32
-    DT_UINT64    = 10;  // unsigned int64
-    DT_BOOL      = 11;  // bool type
-    DT_DOUBLE    = 12; // double type
-    DT_STRING = 13;            // string type
-    DT_DUAL_SUB_INT8 = 14;    /**< dual output int8 type */
-    DT_DUAL_SUB_UINT8 = 15;    /**< dual output uint8 type */
-    DT_COMPLEX64 = 16;         // complex64 type
-    DT_COMPLEX128 = 17;        // complex128 type
-    DT_QINT8 = 18;             // qint8 type
-    DT_QINT16 = 19;            // qint16 type
-    DT_QINT32 = 20;            // qint32 type
-    DT_QUINT8 = 21;            // quint8 type
-    DT_QUINT16 = 22;           // quint16 type
-    DT_RESOURCE  = 23;         // resource type
-    DT_STRING_REF = 24;        // string_ref type
-    DT_DUAL      = 25;              /**< dual output type */
-    DT_VARIANT = 26;           // variant type
-}
-
-message AttrDef
-{
-    message ListValue
-    {
-        enum ListValueType{
-          VT_LIST_NONE = 0;
-          VT_LIST_STRING = 1;
-          VT_LIST_INT = 2;
-          VT_LIST_FLOAT = 3;
-          VT_LIST_BOOL = 4;
-          VT_LIST_BYTES = 5;
-          VT_LIST_TENSOR_DESC = 6;
-          VT_LIST_TENSOR = 7;
-          VT_LIST_GRAPH = 8;
-          VT_LIST_NAMED_ATTRS = 9;
-          VT_LIST_DATA_TYPE = 10;
-        }
-        repeated bytes s             = 2;                    // "list(string)"
-        repeated int64 i             = 3;  // "list(int)"
-        repeated float f             = 4;   // "list(float)"
-        repeated bool  b             = 5;  // "list(bool)"
-        repeated bytes bt            = 7;
-        repeated TensorDescriptor td = 8;
-        repeated TensorDef t         = 9;
-        repeated GraphDef g          = 10;
-	    repeated NamedAttrs na       = 11;
-	    repeated int64 dt            = 12; // list ge::DataType
-
-	    ListValueType val_type       = 20;
-    }
-
-    message ListListInt{
-        message ListInt{
-            repeated int64 list_i             = 1; // list int
-        }
-        repeated ListInt list_list_i             = 1; // list list int
-    }
-
-    oneof value
-    {
-        bytes            s    = 2;  // "string"
-        int64            i    = 3;  // "int"
-        float            f    = 4;  // "float"
-        bool             b    = 5;  // "bool"
-        bytes            bt   = 7;
-        ListValue        list = 1;   // any "list(...)"
-        NamedAttrs       func = 10;  // Used to support attr nesting
-        TensorDescriptor td   = 11;  // GeTensorDesc type
-        TensorDef        t    = 12;  // GeTensor type
-        GraphDef         g    = 13;  // Graph type
-        ListListInt      list_list_int  = 14;  // List List Int type
-        int64            dt   = 15; // ge::DataType
-    }
-}
-
-// A list of attr names and their values. The whole list is attached
-// with a string name.  E.g., MatMul[T=float].
-message NamedAttrs
-{
-    string               name = 1;
-    map<string, AttrDef> attr = 2;
-}
-
-// Shape / dimension description, using row-major order
-message ShapeDef
-{
-    repeated int64 dim = 1;  // Size of each dimension
-}
-
-// Multidimensional data description
-message TensorDescriptor
-{
-    string   name   = 1;  // Optional parameter, tensor name
-
-    DataType dtype  = 2;  // tensor datatype
-    ShapeDef shape  = 3;  // Shape / dimension
-    string   layout = 4;  // Tensor format, eg: "NCHW", "NHWC", "CHW", "ND"
-
-    bool has_out_attr = 9;
-    int64 size = 10;
-    int64 weight_size = 11;
-    bool reuse_input = 12;
-    bool output_tensor = 13;
-    string device_type = 14;
-    bool input_tensor =15;
-    int64 real_dim_cnt = 16;
-    int64 reuse_input_index = 17;
-    int64 data_offset = 18;
-    int64 cmps_size = 19;
-    string cmps_tab = 20;
-    int64 cmps_tab_offset = 21;
-
-	map<string, AttrDef> attr = 5;  // Set of extra parameter fields
-}
-
-// GeTensor definition
-message TensorDef
-{
-    TensorDescriptor desc = 1;  // Tensor description
-    bytes            data = 2;  // Tensor data
-}
-
-
-// Operator description
-message OpDef
-{
-    string name = 1;  // name
-    string type = 2;  // type
-
-    repeated string input = 5;  // input original op name + outgoing index. op_name：index
-
-    map<string, AttrDef> attr = 10;  // Set of operator parameter fields
-
-    bool has_out_attr = 20;
-    int64 id = 21;
-    int64 stream_id =22;
-    repeated string input_name = 23;
-    repeated string src_name = 24;
-    repeated int64 src_index = 25;
-    repeated string dst_name = 26;
-    repeated int64 dst_index = 27;
-    repeated int64 input_i = 28;
-    repeated int64 output_i = 29;
-    repeated int64 workspace = 30;
-    repeated int64 workspace_bytes = 31;
-    repeated bool is_input_const = 32;
-    repeated TensorDescriptor input_desc = 33;
-    repeated TensorDescriptor output_desc = 34;
-    repeated string subgraph_name = 35;
-}
-
-// Graph definition
-message GraphDef
-{
-    string name   = 1;   //  name
-
-    repeated string input  = 4;  // Graph input
-    repeated string output = 5;  // Graph output
-
-    repeated OpDef op      = 6;  // List of operators
-
-	map<string, AttrDef> attr = 11;  // Extended field
-}
-
-// model definition
-message ModelDef
-{
-	string name         = 1;  // name
-	uint32 version      = 2;  // IR Proto verion
-	string custom_version = 3;  // User model version number, passed in by user
-
-    repeated GraphDef graph = 7;  // Graph definition，graph[0] represents the main diagram in modeldef
-
-    map<string, AttrDef> attr = 11;  // Extended field
-}
-