Merge pull request !199 from taoxiangdong/developmenttags/v1.1.0
@@ -23,7 +23,7 @@ export BUILD_PATH="${BASEPATH}/build/" | |||||
usage() | usage() | ||||
{ | { | ||||
echo "Usage:" | echo "Usage:" | ||||
echo "sh build.sh [-j[n]] [-h] [-v] [-s] [-t] [-u] [-c] [-p]" | |||||
echo "sh build.sh [-j[n]] [-h] [-v] [-s] [-t] [-u] [-c] [-S on|off]" | |||||
echo "" | echo "" | ||||
echo "Options:" | echo "Options:" | ||||
echo " -h Print usage" | echo " -h Print usage" | ||||
@@ -34,9 +34,21 @@ usage() | |||||
echo " -c Build ut with coverage tag" | echo " -c Build ut with coverage tag" | ||||
echo " -p Build inference or train" | echo " -p Build inference or train" | ||||
echo " -v Display build command" | echo " -v Display build command" | ||||
echo " -S Enable enable download cmake compile dependency from gitee , default off" | |||||
echo "to be continued ..." | echo "to be continued ..." | ||||
} | } | ||||
# check value of input is 'on' or 'off' | |||||
# usage: check_on_off arg_value arg_name | |||||
check_on_off() | |||||
{ | |||||
if [[ "X$1" != "Xon" && "X$1" != "Xoff" ]]; then | |||||
echo "Invalid value $1 for option -$2" | |||||
usage | |||||
exit 1 | |||||
fi | |||||
} | |||||
# parse and set options | # parse and set options | ||||
checkopts() | checkopts() | ||||
{ | { | ||||
@@ -49,8 +61,9 @@ checkopts() | |||||
GE_ONLY="on" | GE_ONLY="on" | ||||
PLATFORM="inference" | PLATFORM="inference" | ||||
PRODUCT="normal" | PRODUCT="normal" | ||||
ENABLE_GITEE="off" | |||||
# Process the options | # Process the options | ||||
while getopts 'ustchj:p:g:v' opt | |||||
while getopts 'ustchj:p:g:vS:' opt | |||||
do | do | ||||
OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]') | OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]') | ||||
case "${opt}" in | case "${opt}" in | ||||
@@ -86,6 +99,11 @@ checkopts() | |||||
g) | g) | ||||
PRODUCT=$OPTARG | PRODUCT=$OPTARG | ||||
;; | ;; | ||||
S) | |||||
check_on_off $OPTARG S | |||||
ENABLE_GITEE="$OPTARG" | |||||
echo "enable download from gitee" | |||||
;; | |||||
*) | *) | ||||
echo "Undefined option: ${opt}" | echo "Undefined option: ${opt}" | ||||
usage | usage | ||||
@@ -129,6 +147,9 @@ build_graphengine() | |||||
CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GE_ST=ON" | CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GE_ST=ON" | ||||
fi | fi | ||||
if [[ "X$ENABLE_GITEE" = "Xon" ]]; then | |||||
CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GITEE=ON" | |||||
fi | |||||
CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True -DCMAKE_INSTALL_PREFIX=${OUTPUT_PATH} -DPLATFORM=${PLATFORM} -DPRODUCT=${PRODUCT}" | CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPEN_SRC=True -DCMAKE_INSTALL_PREFIX=${OUTPUT_PATH} -DPLATFORM=${PLATFORM} -DPRODUCT=${PRODUCT}" | ||||
echo "${CMAKE_ARGS}" | echo "${CMAKE_ARGS}" | ||||
cmake ${CMAKE_ARGS} .. | cmake ${CMAKE_ARGS} .. | ||||
@@ -11,8 +11,16 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | |||||
message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
endif() | 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 () | |||||
ExternalProject_Add(gflags_build | ExternalProject_Add(gflags_build | ||||
URL https://github.com/gflags/gflags/archive/v2.2.2.tar.gz | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | #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 | #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> | CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR> | ||||
@@ -5,8 +5,17 @@ endif() | |||||
include(ExternalProject) | include(ExternalProject) | ||||
set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/include) | set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/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") | |||||
set(JSON_INCLUDE_DIR ${JSON_SRC_DIR}) | |||||
endif () | |||||
ExternalProject_Add(json_build | ExternalProject_Add(json_build | ||||
URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/cloud_code/pkg/include.zip | #URL /home/txd/workspace/cloud_code/pkg/include.zip | ||||
SOURCE_DIR ${JSON_SRC_DIR} | SOURCE_DIR ${JSON_SRC_DIR} | ||||
CONFIGURE_COMMAND "" | CONFIGURE_COMMAND "" | ||||
@@ -17,7 +26,7 @@ ExternalProject_Add(json_build | |||||
add_library(json INTERFACE) | add_library(json INTERFACE) | ||||
target_include_directories(json INTERFACE ${JSON_SRC_DIR}) | |||||
target_include_directories(json INTERFACE ${JSON_INCLUDE_DIR}) | |||||
add_dependencies(json json_build) | add_dependencies(json json_build) | ||||
#set(HAVE_JSON TRUE CACHE BOOL "json build add") | #set(HAVE_JSON TRUE CACHE BOOL "json build add") | ||||
@@ -6,8 +6,16 @@ set(ONNX_PROTO_DIR ${CMAKE_BINARY_DIR}/onnx) | |||||
set(ONNX_PROTO_FILE ${ONNX_PROTO_DIR}/onnx.proto) | set(ONNX_PROTO_FILE ${ONNX_PROTO_DIR}/onnx.proto) | ||||
file(MAKE_DIRECTORY ${ONNX_PROTO_DIR}) | file(MAKE_DIRECTORY ${ONNX_PROTO_DIR}) | ||||
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 () | |||||
ExternalProject_Add(onnx | ExternalProject_Add(onnx | ||||
URL https://github.com/onnx/onnx/releases/download/v1.6.0/onnx-1.6.0.tar.gz | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/cloud_code/pkg/onnx-1.6.0.tar.gz | #URL /home/txd/workspace/cloud_code/pkg/onnx-1.6.0.tar.gz | ||||
#URL_HASH SHA256=3b88c3fe521151651a0403c4d131cb2e0311bd28b753ef692020a432a81ce345 | #URL_HASH SHA256=3b88c3fe521151651a0403c4d131cb2e0311bd28b753ef692020a432a81ce345 | ||||
#SOURCE_DIR ${ONNX_SRC_DIR} | #SOURCE_DIR ${ONNX_SRC_DIR} | ||||
@@ -10,10 +10,19 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | |||||
set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE) | 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}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
endif() | endif() | ||||
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 () | |||||
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") | ||||
set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | ||||
ExternalProject_Add(protobuf_build | ExternalProject_Add(protobuf_build | ||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | #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 ${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> | #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR> | ||||
@@ -8,11 +8,19 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | |||||
message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
endif() | endif() | ||||
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 () | |||||
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") | ||||
set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | ||||
set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static) | set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static) | ||||
ExternalProject_Add(protobuf_static_build | ExternalProject_Add(protobuf_static_build | ||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | #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 ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | ||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} | CONFIGURE_COMMAND ${CMAKE_COMMAND} | ||||
@@ -12,10 +12,19 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | |||||
message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
endif() | endif() | ||||
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 () | |||||
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") | ||||
set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | ||||
ExternalProject_Add(protoc_build | ExternalProject_Add(protoc_build | ||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | |||||
URL ${REQ_URL} | |||||
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | #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 ${GE_CODE_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 | 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 @@ | |||||
Subproject commit 384dab951f40b90788cc755e13754ed386ccb9c6 | |||||
Subproject commit 5ced68f6e3eff84a28a4d708e9f38a503b20f24d |
@@ -1 +1 @@ | |||||
Subproject commit f9e30cdc643926d91f7b650b6903a7b3bf6f597b | |||||
Subproject commit 2e47f0ccc3981a3002ac12e3ff6a36fb689968ae |