Merge pull request !106 from yanghaoran/r1.0pull/106/MERGE
| @@ -1,10 +1,19 @@ | |||||
| set(Eigen3_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") | set(Eigen3_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") | ||||
| set(Eigen3_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") | set(Eigen3_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") | ||||
| set(Eigen3_NS "ge_") | 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 | graphengine_add_pkg(Eigen3 | ||||
| VER 3.3.7 | VER 3.3.7 | ||||
| URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz | |||||
| MD5 9e30f67e8531477de4117506fe44669b | |||||
| URL ${REQ_URL} | |||||
| MD5 ${MD5} | |||||
| CMAKE_OPTION -DBUILD_TESTING=OFF) | CMAKE_OPTION -DBUILD_TESTING=OFF) | ||||
| find_package(Eigen3 3.3.7 REQUIRED ${GE_FIND_NO_DEFAULT_PATH}) | find_package(Eigen3 3.3.7 REQUIRED ${GE_FIND_NO_DEFAULT_PATH}) | ||||
| @@ -1,11 +1,19 @@ | |||||
| set(ge_gtest_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack") | 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") | set(ge_gtest_CFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack") | ||||
| 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.0.tar.gz") | |||||
| set(MD5 "16877098823401d1bf2ed7891d7dce36") | |||||
| endif () | |||||
| graphengine_add_pkg(ge_gtest | graphengine_add_pkg(ge_gtest | ||||
| VER 1.8.0 | VER 1.8.0 | ||||
| LIBS gtest gtest_main | LIBS gtest gtest_main | ||||
| URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz | |||||
| MD5 16877098823401d1bf2ed7891d7dce36 | |||||
| URL ${REQ_URL} | |||||
| MD5 ${MD5} | |||||
| CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON | CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON | ||||
| -DCMAKE_MACOSX_RPATH=TRUE -Dgtest_disable_pthreads=ON) | -DCMAKE_MACOSX_RPATH=TRUE -Dgtest_disable_pthreads=ON) | ||||
| @@ -1,9 +1,20 @@ | |||||
| set(nlohmann_json_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") | set(nlohmann_json_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2") | ||||
| set(nlohmann_json_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") | set(nlohmann_json_CFLAGS "-D_FORTIFY_SOURCE=2 -O2") | ||||
| 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(INCLUDE "./") | |||||
| endif () | |||||
| graphengine_add_pkg(ge_nlohmann_json | graphengine_add_pkg(ge_nlohmann_json | ||||
| VER 3.6.1 | VER 3.6.1 | ||||
| HEAD_ONLY ./ | |||||
| URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip | |||||
| MD5 0dc903888211db3a0f170304cd9f3a89) | |||||
| HEAD_ONLY ${INCLUDE} | |||||
| URL ${REQ_URL} | |||||
| MD5 ${MD5}) | |||||
| include_directories(${ge_nlohmann_json_INC}) | include_directories(${ge_nlohmann_json_INC}) | ||||
| add_library(graphengine::json ALIAS ge_nlohmann_json) | add_library(graphengine::json ALIAS ge_nlohmann_json) | ||||
| @@ -1,5 +1,13 @@ | |||||
| if (ENABLE_GITEE) | |||||
| set(REQ_URL "https://gitee.com/mirrors/ONNX/repository/archive/v1.6.0.tar.gz") | |||||
| set(MD5 "1bdbcecdd68ea8392630467646776e02") | |||||
| else() | |||||
| set(REQ_URL "https://github.com/onnx/onnx/releases/download/v1.6.0/onnx-1.6.0.tar.gz") | |||||
| set(MD5 "512f2779d6215d4a36f366b6b9acdf1e") | |||||
| endif () | |||||
| graphengine_add_pkg(onnx | graphengine_add_pkg(onnx | ||||
| VER 1.6.0 | VER 1.6.0 | ||||
| HEAD_ONLY ./ | HEAD_ONLY ./ | ||||
| URL https://github.com/onnx/onnx/releases/download/v1.6.0/onnx-1.6.0.tar.gz | |||||
| MD5 512f2779d6215d4a36f366b6b9acdf1e) | |||||
| URL ${REQ_URL} | |||||
| MD5 ${MD5}) | |||||
| @@ -5,12 +5,21 @@ set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | |||||
| set(_ge_tmp_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) | set(_ge_tmp_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) | ||||
| string(REPLACE " -Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") | string(REPLACE " -Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") | ||||
| string(REPLACE " -Werror" "" 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(protobuf | graphengine_add_pkg(protobuf | ||||
| VER 3.8.0 | VER 3.8.0 | ||||
| LIBS protobuf | LIBS protobuf | ||||
| EXE protoc | EXE protoc | ||||
| URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | |||||
| MD5 3d9e32700639618a4d2d342c99d4507a | |||||
| URL ${REQ_URL} | |||||
| MD5 ${MD5} | |||||
| CMAKE_PATH ../cmake/ | CMAKE_PATH ../cmake/ | ||||
| CMAKE_OPTION -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF) | CMAKE_OPTION -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF) | ||||
| set(CMAKE_CXX_FLAGS ${_ge_tmp_CMAKE_CXX_FLAGS}) | set(CMAKE_CXX_FLAGS ${_ge_tmp_CMAKE_CXX_FLAGS}) | ||||