wangwei
/
parser
Not watched
1
0
Fork 0
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

!22 update git submodule metadef 

Merge pull request !22 from taoxiangdong/master
pull/22/MERGE
王涛 Gitee 5 years ago
parent
6bcca102fd 262a06b8c1
commit
45e0e32b0e
8 changed files with 19 additions and 24 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -5
      CMakeLists.txt
  2. +3
    -3
      cmake/external_libs/protobuf_shared.cmake
  3. +1
    -1
      cmake/external_libs/protoc.cmake
  4. +1
    -1
      cmake/external_libs/securec.cmake
  5. +1
    -1
      metadef
  6. +4
    -4
      parser/CMakeLists.txt
  7. +4
    -4
      parser/common/CMakeLists.txt
  8. +4
    -5
      parser/onnx/CMakeLists.txt

+ 1
- 5
CMakeLists.txt View File

@@ -31,7 +31,6 @@ if (ENABLE_OPEN_SRC)
set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
find_module(slog libslog.so ${GE_LIB_PATH})
find_module(mmpa libmmpa.so ${GE_LIB_PATH})
find_module(ge_common libge_common.so ${GE_LIB_PATH})
find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
else()
if(DEFINED ENV{ASCEND_CUSTOM_PATH})
@@ -45,16 +44,13 @@ if (ENABLE_OPEN_SRC)

find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
find_module(ge_common libge_common.so ${ASCEND_RUNTIME_DIR})
find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
endif()

if (NOT DEFINED METADEF_DIR)
set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef)
add_subdirectory(metadef)
endif()

add_subdirectory(metadef)

else()

####工程tigong


+ 3
- 3
cmake/external_libs/protobuf_shared.cmake View File

@@ -14,10 +14,10 @@ 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(protobuf_build
#URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
#SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR>
#SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_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}


+ 1
- 1
cmake/external_libs/protoc.cmake View File

@@ -15,7 +15,7 @@ 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 https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0
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


+ 1
- 1
cmake/external_libs/securec.cmake View File

@@ -14,7 +14,7 @@ ExternalProject_Add(c_sec_build
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 ${PARSER_DIR}/../libc_sec
PATCH_COMMAND patch -p1 < ${PARSER_DIR}/metadef/third_party/patch/securec/0001-add-securec-cmake-script.patch
PATCH_COMMAND patch -p1 < ${PARSER_DIR}/metadef/third_party/patch/securec/0001-add-securec-cmake-script.patch
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit 693e892fa66c5da9b8976d93e5418ded2614fc4f
Subproject commit c599dfd701ad1f7a7ef149faedcf2b5dec93fafb

+ 4
- 4
parser/CMakeLists.txt View File

@@ -72,10 +72,10 @@ target_include_directories(fmk_parser PRIVATE
${METADEF_DIR}/inc/external/graph
${METADEF_DIR}/inc/external/register
#### independent compile #####
${METADEF_DIR}/third_party/ge
${METADEF_DIR}/third_party/ge/inc
${METADEF_DIR}/third_party/ge/inc/framework
${METADEF_DIR}/third_party/ge/inc/external
${METADEF_DIR}/third_party/graphengine/ge
${METADEF_DIR}/third_party/graphengine/inc
${METADEF_DIR}/third_party/graphengine/inc/framework
${METADEF_DIR}/third_party/graphengine/inc/external
${METADEF_DIR}/third_party/fwkacllib/inc
#### temp ####
${PARSER_DIR}/../graphengine/inc/common/util


+ 4
- 4
parser/common/CMakeLists.txt View File

@@ -54,10 +54,10 @@ target_include_directories(parser_common PRIVATE
${METADEF_DIR}/inc/external/graph
${METADEF_DIR}/inc/external/register
#### independent compile #####
${METADEF_DIR}/third_party/ge
${METADEF_DIR}/third_party/ge/inc
${METADEF_DIR}/third_party/ge/inc/framework
${METADEF_DIR}/third_party/ge/inc/external
${METADEF_DIR}/third_party/graphengine/ge
${METADEF_DIR}/third_party/graphengine/inc
${METADEF_DIR}/third_party/graphengine/inc/framework
${METADEF_DIR}/third_party/graphengine/inc/external
${METADEF_DIR}/third_party/fwkacllib/inc
#### temp ####
${PARSER_DIR}/../graphengine/inc/common/util


+ 4
- 5
parser/onnx/CMakeLists.txt View File

@@ -42,10 +42,10 @@ target_include_directories(fmk_onnx_parser PRIVATE
${METADEF_DIR}/inc/external/graph
${METADEF_DIR}/inc/external/register
#### independent compile #####
${METADEF_DIR}/third_party/ge
${METADEF_DIR}/third_party/ge/inc
${METADEF_DIR}/third_party/ge/inc/framework
${METADEF_DIR}/third_party/ge/inc/external
${METADEF_DIR}/third_party/graphengine/ge
${METADEF_DIR}/third_party/graphengine/inc
${METADEF_DIR}/third_party/graphengine/inc/framework
${METADEF_DIR}/third_party/graphengine/inc/external
${METADEF_DIR}/third_party/fwkacllib/inc
#### temp ####
${PARSER_DIR}/../graphengine/inc/common/util
@@ -61,7 +61,6 @@ target_link_libraries(fmk_onnx_parser PRIVATE
$<BUILD_INTERFACE:intf_pub>
-Wl,--no-as-needed
protobuf
ge_common
register
c_sec
parser_common


Write Preview
Loading…
Cancel
Save