From 6cc544aa28a0a1416e33ef990cbc69f847f72eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Gallus?= Date: Mon, 11 Nov 2019 05:03:46 +0100 Subject: [PATCH] Add Shallow clone to ExternalProjects (#21060) test=develop --- cmake/external/brpc.cmake | 1 + cmake/external/cares.cmake | 1 + cmake/external/cub.cmake | 1 + cmake/external/dlpack.cmake | 1 + cmake/external/eigen.cmake | 2 ++ cmake/external/gflags.cmake | 1 + cmake/external/glog.cmake | 1 + cmake/external/gtest.cmake | 1 + cmake/external/leveldb.cmake | 1 + cmake/external/libxsmm.cmake | 1 + cmake/external/mkldnn.cmake | 1 + cmake/external/ngraph.cmake | 1 + cmake/external/openblas.cmake | 1 + cmake/external/protobuf.cmake | 1 + cmake/external/pybind11.cmake | 1 + cmake/external/rocprim.cmake | 1 + cmake/external/threadpool.cmake | 1 + cmake/external/warpctc.cmake | 1 + cmake/external/xbyak.cmake | 1 + cmake/external/xxhash.cmake | 1 + cmake/external/zlib.cmake | 1 + cmake/third_party.cmake | 4 ++++ 22 files changed, 26 insertions(+) diff --git a/cmake/external/brpc.cmake b/cmake/external/brpc.cmake index a5a86afa4a5..1b467d138b3 100644 --- a/cmake/external/brpc.cmake +++ b/cmake/external/brpc.cmake @@ -39,6 +39,7 @@ set(prefix_path "${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/ ExternalProject_Add( extern_brpc ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/apache/incubator-brpc" GIT_TAG "ad00fe940b4f05225b214131959293bbed8744a0" #rdma branch's head now. PREFIX ${BRPC_SOURCES_DIR} diff --git a/cmake/external/cares.cmake b/cmake/external/cares.cmake index 52b634a0757..a4e19cc469f 100644 --- a/cmake/external/cares.cmake +++ b/cmake/external/cares.cmake @@ -28,6 +28,7 @@ endif() ExternalProject_Add( extern_cares + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/c-ares/c-ares.git" GIT_TAG "cares-1_13_0" PREFIX ${CARES_SOURCES_DIR} diff --git a/cmake/external/cub.cmake b/cmake/external/cub.cmake index a4d63295d73..e8242ab417c 100644 --- a/cmake/external/cub.cmake +++ b/cmake/external/cub.cmake @@ -22,6 +22,7 @@ include_directories(${CUB_INCLUDE_DIR}) ExternalProject_Add( extern_cub ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/NVlabs/cub.git" GIT_TAG "v1.8.0" PREFIX ${CUB_SOURCE_DIR} diff --git a/cmake/external/dlpack.cmake b/cmake/external/dlpack.cmake index a7284a96ea4..679e91de4b8 100644 --- a/cmake/external/dlpack.cmake +++ b/cmake/external/dlpack.cmake @@ -22,6 +22,7 @@ include_directories(${DLPACK_INCLUDE_DIR}) ExternalProject_Add( extern_dlpack ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/dmlc/dlpack.git" GIT_TAG "v0.2" PREFIX ${DLPACK_SOURCE_DIR} diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index c186f6d4f43..43a23fa9d4f 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -29,6 +29,7 @@ if(WITH_AMD_GPU) ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/sabreshao/hipeigen.git" GIT_TAG 7cb2b6e5a4b4a1efe658abb215cd866c6fb2275e PREFIX ${EIGEN_SOURCE_DIR} @@ -42,6 +43,7 @@ else() ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "${EIGEN_GIT_REPOSITORY}" # eigen on cuda9.1 missing header of math_funtions.hpp # https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake index fae1e20d3be..1ceee9c168d 100644 --- a/cmake/external/gflags.cmake +++ b/cmake/external/gflags.cmake @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR}) ExternalProject_Add( extern_gflags ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/gflags/gflags.git" GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a PREFIX ${GFLAGS_SOURCES_DIR} diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake index ac6294048cf..7df895ec624 100644 --- a/cmake/external/glog.cmake +++ b/cmake/external/glog.cmake @@ -34,6 +34,7 @@ SET(GLOG_TAG "v0.3.5") ExternalProject_Add( extern_glog ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} DEPENDS gflags GIT_REPOSITORY ${GLOG_REPOSITORY} GIT_TAG ${GLOG_TAG} diff --git a/cmake/external/gtest.cmake b/cmake/external/gtest.cmake index 99cdca54550..1d5a6fad55d 100644 --- a/cmake/external/gtest.cmake +++ b/cmake/external/gtest.cmake @@ -47,6 +47,7 @@ ENDIF() ExternalProject_Add( extern_gtest ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} DEPENDS ${GTEST_DEPENDS} GIT_REPOSITORY "https://github.com/google/googletest.git" GIT_TAG "release-1.8.1" diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake index 3ba8a466c64..95d1c4b1f0e 100644 --- a/cmake/external/leveldb.cmake +++ b/cmake/external/leveldb.cmake @@ -23,6 +23,7 @@ INCLUDE_DIRECTORIES(${LEVELDB_INCLUDE_DIR}) ExternalProject_Add( extern_leveldb ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} PREFIX ${LEVELDB_SOURCES_DIR} GIT_REPOSITORY "https://github.com/google/leveldb" GIT_TAG v1.18 diff --git a/cmake/external/libxsmm.cmake b/cmake/external/libxsmm.cmake index 5a7ee046555..b6ab2d15284 100644 --- a/cmake/external/libxsmm.cmake +++ b/cmake/external/libxsmm.cmake @@ -23,6 +23,7 @@ SET(LIBXSMM_LIBS "${LIBXSMM_LIBRARY_DIR}/libxsmm.a" ExternalProject_Add( extern_libxsmm + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/hfp/libxsmm.git" GIT_TAG "7cc03b5b342fdbc6b6d990b190671c5dbb8489a2" PREFIX ${LIBXSMM_SOURCES_DIR} diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index acab8974584..25870d9afd4 100644 --- a/cmake/external/mkldnn.cmake +++ b/cmake/external/mkldnn.cmake @@ -52,6 +52,7 @@ ENDIF(NOT WIN32) ExternalProject_Add( ${MKLDNN_PROJECT} ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} DEPENDS ${MKLDNN_DEPENDS} GIT_REPOSITORY "https://github.com/intel/mkl-dnn.git" GIT_TAG "aef88b7c233f48f8b945da310f1b973da31ad033" diff --git a/cmake/external/ngraph.cmake b/cmake/external/ngraph.cmake index fb752a22b3f..0abc34be5cd 100644 --- a/cmake/external/ngraph.cmake +++ b/cmake/external/ngraph.cmake @@ -37,6 +37,7 @@ SET(NGRAPH_TBB_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_TBB_LIB_NAME}) ExternalProject_Add( ${NGRAPH_PROJECT} ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} DEPENDS ${MKLDNN_PROJECT} ${MKLML_PROJECT} GIT_REPOSITORY ${NGRAPH_GIT_REPO} GIT_TAG ${NGRAPH_GIT_TAG} diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 1d40ad108fb..5282c7dd822 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -47,6 +47,7 @@ IF(NOT ${CBLAS_FOUND}) ExternalProject_Add( extern_openblas ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git GIT_TAG ${OPENBLAS_COMMIT} PREFIX ${CBLAS_SOURCES_DIR} diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index b437e151c7f..f172ebb18e6 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -209,6 +209,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) ExternalProject_Add( ${TARGET_NAME} ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} PREFIX ${PROTOBUF_SOURCES_DIR} UPDATE_COMMAND "" DEPENDS zlib diff --git a/cmake/external/pybind11.cmake b/cmake/external/pybind11.cmake index a2dbf4cdb7c..a7bf580883f 100644 --- a/cmake/external/pybind11.cmake +++ b/cmake/external/pybind11.cmake @@ -21,6 +21,7 @@ include_directories(${PYBIND_SOURCE_DIR}/src/extern_pybind/include) ExternalProject_Add( extern_pybind ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/pybind/pybind11.git" GIT_TAG "v2.2.4" PREFIX ${PYBIND_SOURCE_DIR} diff --git a/cmake/external/rocprim.cmake b/cmake/external/rocprim.cmake index b7e13c529e0..df4c88cadc4 100644 --- a/cmake/external/rocprim.cmake +++ b/cmake/external/rocprim.cmake @@ -28,6 +28,7 @@ SET(ROCPRIM_INCLUDE_DIR ${ROCPRIM_INSTALL_DIR}/include) ExternalProject_Add( extern_rocprim + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/ROCmSoftwarePlatform/rocPRIM.git" GIT_TAG 5bd41b96ab8d8343330fb2c3e1b96775bde3b3fc PREFIX ${ROCPRIM_SOURCE_DIR} diff --git a/cmake/external/threadpool.cmake b/cmake/external/threadpool.cmake index d87a818ba8d..ebec736084d 100644 --- a/cmake/external/threadpool.cmake +++ b/cmake/external/threadpool.cmake @@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(${THREADPOOL_INCLUDE_DIR}) ExternalProject_Add( extern_threadpool ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/progschj/ThreadPool.git" GIT_TAG 9a42ec1329f259a5f4881a291db1dcb8f2ad9040 PREFIX ${THREADPOOL_SOURCE_DIR} diff --git a/cmake/external/warpctc.cmake b/cmake/external/warpctc.cmake index c7ca7ba56ba..7fa517d17f9 100644 --- a/cmake/external/warpctc.cmake +++ b/cmake/external/warpctc.cmake @@ -35,6 +35,7 @@ SET(WARPCTC_REPOSITORY "https://github.com/wopeizl/warp-ctc.git") ExternalProject_Add( extern_warpctc ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY ${WARPCTC_REPOSITORY} PREFIX ${WARPCTC_SOURCES_DIR} UPDATE_COMMAND "" diff --git a/cmake/external/xbyak.cmake b/cmake/external/xbyak.cmake index 245ecf8bb16..f60eb811399 100644 --- a/cmake/external/xbyak.cmake +++ b/cmake/external/xbyak.cmake @@ -31,6 +31,7 @@ add_definitions(-DXBYAK_NO_OP_NAMES) ExternalProject_Add( ${XBYAK_PROJECT} ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} DEPENDS "" GIT_REPOSITORY "https://github.com/herumi/xbyak.git" GIT_TAG "v5.661" # Jul 26th diff --git a/cmake/external/xxhash.cmake b/cmake/external/xxhash.cmake index 4b3f9726f2d..07b19f8eaa8 100644 --- a/cmake/external/xxhash.cmake +++ b/cmake/external/xxhash.cmake @@ -32,6 +32,7 @@ if(WIN32) ExternalProject_Add( extern_xxhash ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/Cyan4973/xxHash" GIT_TAG "v0.6.5" PREFIX ${XXHASH_SOURCE_DIR} diff --git a/cmake/external/zlib.cmake b/cmake/external/zlib.cmake index 58881ac2206..52d481705de 100644 --- a/cmake/external/zlib.cmake +++ b/cmake/external/zlib.cmake @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(${THIRD_PARTY_PATH}/install) # For Paddle code to include zl ExternalProject_Add( extern_zlib ${EXTERNAL_PROJECT_LOG_ARGS} + ${SHALLOW_CLONE} GIT_REPOSITORY "https://github.com/madler/zlib.git" GIT_TAG "v1.2.8" PREFIX ${ZLIB_SOURCES_DIR} diff --git a/cmake/third_party.cmake b/cmake/third_party.cmake index a7c8661bba3..5229f4bd942 100644 --- a/cmake/third_party.cmake +++ b/cmake/third_party.cmake @@ -89,6 +89,10 @@ if(WIN32 OR APPLE OR NOT WITH_GPU OR ON_INFER) set(WITH_DGC OFF) endif() +if(${CMAKE_VERSION} VERSION_GREATER "3.5.2") + set(SHALLOW_CLONE "GIT_SHALLOW TRUE") # adds --depth=1 arg to git clone of External_Projects +endif() + ########################### include third_party accoring to flags ############################### include(external/zlib) # download, build, install zlib include(external/gflags) # download, build, install gflags -- GitLab