From 77892124fb7babd0b1651092958878555764bdbf Mon Sep 17 00:00:00 2001 From: peizhilin Date: Wed, 7 Nov 2018 14:22:07 +0800 Subject: [PATCH] online configuration --- cmake/external/eigen.cmake | 5 ++--- cmake/external/gflags.cmake | 5 ++--- cmake/external/glog.cmake | 1 - cmake/external/gtest.cmake | 5 ++--- cmake/external/openblas.cmake | 10 ++++------ cmake/external/protobuf.cmake | 5 ++--- cmake/external/zlib.cmake | 5 ++--- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index 2aa64a350..573ad5e5f 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -29,11 +29,10 @@ else() ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} -# GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror" - GIT_REPOSITORY "http://admin@localhost:8080/r/eigen3.git" + GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror" # 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 -# GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c + GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c PREFIX ${EIGEN_SOURCE_DIR} DOWNLOAD_NAME "eigen" UPDATE_COMMAND "" diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake index 9c6974b8f..7a0369b9d 100644 --- a/cmake/external/gflags.cmake +++ b/cmake/external/gflags.cmake @@ -28,9 +28,8 @@ INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR}) ExternalProject_Add( extern_gflags ${EXTERNAL_PROJECT_LOG_ARGS} -# GIT_REPOSITORY "https://github.com/gflags/gflags.git" - GIT_REPOSITORY "http://admin@localhost:8080/r/gflags.git" -# GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a + GIT_REPOSITORY "https://github.com/gflags/gflags.git" + GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a PREFIX ${GFLAGS_SOURCES_DIR} UPDATE_COMMAND "" CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake index 84f812776..ac2f2be83 100644 --- a/cmake/external/glog.cmake +++ b/cmake/external/glog.cmake @@ -34,7 +34,6 @@ ELSE() SET(GLOG_REPOSITORY "https://github.com/google/glog.git") SET(GLOG_TAG "v0.3.5") ENDIF() - SET(GLOG_REPOSITORY "http://admin@localhost:8080/r/glog.git") ExternalProject_Add( extern_glog diff --git a/cmake/external/gtest.cmake b/cmake/external/gtest.cmake index 4f5acc92f..d33529874 100644 --- a/cmake/external/gtest.cmake +++ b/cmake/external/gtest.cmake @@ -43,9 +43,8 @@ IF(WITH_TESTING) extern_gtest ${EXTERNAL_PROJECT_LOG_ARGS} DEPENDS ${GTEST_DEPENDS} - # GIT_REPOSITORY "https://github.com/google/googletest.git" - GIT_REPOSITORY "http://admin@localhost:8080/r/gtest.git" -# GIT_TAG "release-1.8.0" + GIT_REPOSITORY "https://github.com/google/googletest.git" + GIT_TAG "release-1.8.0" PREFIX ${GTEST_SOURCES_DIR} UPDATE_COMMAND "" CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 664422813..2b46936c1 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -76,9 +76,8 @@ IF(NOT ${CBLAS_FOUND}) ExternalProject_Add( extern_openblas ${EXTERNAL_PROJECT_LOG_ARGS} - # GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git - GIT_REPOSITORY http://admin@localhost:8080/r/openblas.git - # GIT_TAG ${OPENBLAS_COMMIT} + GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git + GIT_TAG ${OPENBLAS_COMMIT} PREFIX ${CBLAS_SOURCES_DIR} INSTALL_DIR ${CBLAS_INSTALL_DIR} BUILD_IN_SOURCE 1 @@ -104,9 +103,8 @@ IF(NOT ${CBLAS_FOUND}) ExternalProject_Add( extern_openblas ${EXTERNAL_PROJECT_LOG_ARGS} - # GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git - GIT_REPOSITORY http://admin@localhost:8080/r/openblas.git - # GIT_TAG ${OPENBLAS_COMMIT} + GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git + GIT_TAG ${OPENBLAS_COMMIT} PREFIX ${CBLAS_SOURCES_DIR} INSTALL_DIR ${CBLAS_INSTALL_DIR} BUILD_IN_SOURCE 1 diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index d4c6ea781..bb1fcf356 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -206,9 +206,8 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) SET(OPTIONAL_ARGS ${OPTIONAL_ARGS} "-DCMAKE_GENERATOR_PLATFORM=x64") ENDIF() - # SET(PROTOBUF_REPO "https://github.com/google/protobuf.git") - # SET(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546") - SET(PROTOBUF_REPO http://admin@localhost:8080/r/protobuf.git) + SET(PROTOBUF_REPO "https://github.com/google/protobuf.git") + SET(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546") IF(MOBILE_INFERENCE) # The reason why the official version is not used is described in # https://github.com/PaddlePaddle/Paddle/issues/6114 diff --git a/cmake/external/zlib.cmake b/cmake/external/zlib.cmake index b65f2afbc..c3d732354 100644 --- a/cmake/external/zlib.cmake +++ b/cmake/external/zlib.cmake @@ -31,9 +31,8 @@ INCLUDE_DIRECTORIES(${THIRD_PARTY_PATH}/install) # For Paddle code to include zl ExternalProject_Add( extern_zlib ${EXTERNAL_PROJECT_LOG_ARGS} - # GIT_REPOSITORY "https://github.com/madler/zlib.git" - GIT_REPOSITORY "http://admin@localhost:8080/r/zlib.git" -# GIT_TAG "v1.2.8" + GIT_REPOSITORY "https://github.com/madler/zlib.git" + GIT_TAG "v1.2.8" PREFIX ${ZLIB_SOURCES_DIR} UPDATE_COMMAND "" CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -- GitLab