From 130cdda65b1b148c5f11a4dac1ee8848658a8587 Mon Sep 17 00:00:00 2001 From: peizhilin Date: Wed, 7 Nov 2018 19:14:25 +0800 Subject: [PATCH] add gpu debug mode --- cmake/cuda.cmake | 8 ++++++-- cmake/cudnn.cmake | 7 ++++++- cmake/external/eigen.cmake | 7 ++++--- cmake/external/gflags.cmake | 2 +- cmake/external/glog.cmake | 2 +- cmake/external/gtest.cmake | 2 +- cmake/external/openblas.cmake | 4 ++-- cmake/external/protobuf.cmake | 2 +- cmake/external/zlib.cmake | 2 +- 9 files changed, 23 insertions(+), 13 deletions(-) diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake index 1cc882cce..45a4b1328 100644 --- a/cmake/cuda.cmake +++ b/cmake/cuda.cmake @@ -167,8 +167,12 @@ select_nvcc_arch_flags(NVCC_FLAGS_EXTRA) list(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_EXTRA}) message(STATUS "Added CUDA NVCC flags for: ${NVCC_FLAGS_EXTRA_readable}") -# Set C++11 support -set(CUDA_PROPAGATE_HOST_FLAGS OFF) +if (WIN32) + set(CUDA_PROPAGATE_HOST_FLAGS ON) +else (WIN32) + # Set C++11 support + set(CUDA_PROPAGATE_HOST_FLAGS OFF) +endif (WIN32) # Release/Debug flags set by cmake. Such as -O3 -g -DNDEBUG etc. # So, don't set these flags here. diff --git a/cmake/cudnn.cmake b/cmake/cudnn.cmake index cd5153392..09bec347d 100644 --- a/cmake/cudnn.cmake +++ b/cmake/cudnn.cmake @@ -2,7 +2,12 @@ if(NOT WITH_GPU) return() endif() -set(CUDNN_ROOT "/usr" CACHE PATH "CUDNN ROOT") +if(WIN32) + set(CUDNN_ROOT ${CUDA_TOOLKIT_ROOT_DIR}) +else(WIN32) + set(CUDNN_ROOT "/usr" CACHE PATH "CUDNN ROOT") +endif(WIN32) + find_path(CUDNN_INCLUDE_DIR cudnn.h PATHS ${CUDNN_ROOT} ${CUDNN_ROOT}/include $ENV{CUDNN_ROOT} $ENV{CUDNN_ROOT}/include ${CUDA_TOOLKIT_INCLUDE} diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index 2aa64a350..98079678a 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -16,8 +16,9 @@ if(WITH_AMD_GPU) ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} - GIT_REPOSITORY "https://github.com/sabreshao/hipeigen.git" - GIT_TAG 0cba03ff9f8f9f70bbd92ac5857b031aa8fed6f9 +# GIT_REPOSITORY "https://github.com/sabreshao/hipeigen.git" +# GIT_TAG 0cba03ff9f8f9f70bbd92ac5857b031aa8fed6f9 + GIT_REPOSITORY "http://admin@172.20.90.14:8080/r/eigen3.git" PREFIX ${EIGEN_SOURCE_DIR} UPDATE_COMMAND "" CONFIGURE_COMMAND "" @@ -30,7 +31,7 @@ else() 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 "http://admin@172.20.90.14:8080/r/eigen3.git" # 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 diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake index 9c6974b8f..73ea80ea4 100644 --- a/cmake/external/gflags.cmake +++ b/cmake/external/gflags.cmake @@ -29,7 +29,7 @@ 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_REPOSITORY "http://admin@172.20.90.14:8080/r/gflags.git" # GIT_TAG 77592648e3f3be87d6c7123eb81cbad75f9aef5a PREFIX ${GFLAGS_SOURCES_DIR} UPDATE_COMMAND "" diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake index 84f812776..5184a83bd 100644 --- a/cmake/external/glog.cmake +++ b/cmake/external/glog.cmake @@ -34,7 +34,7 @@ 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") + SET(GLOG_REPOSITORY "http://admin@172.20.90.14:8080/r/glog.git") ExternalProject_Add( extern_glog diff --git a/cmake/external/gtest.cmake b/cmake/external/gtest.cmake index 4f5acc92f..da539d52b 100644 --- a/cmake/external/gtest.cmake +++ b/cmake/external/gtest.cmake @@ -44,7 +44,7 @@ IF(WITH_TESTING) ${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_REPOSITORY "http://admin@172.20.90.14:8080/r/gtest.git" # GIT_TAG "release-1.8.0" PREFIX ${GTEST_SOURCES_DIR} UPDATE_COMMAND "" diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 664422813..c6dace512 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -77,7 +77,7 @@ IF(NOT ${CBLAS_FOUND}) extern_openblas ${EXTERNAL_PROJECT_LOG_ARGS} # GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git - GIT_REPOSITORY http://admin@localhost:8080/r/openblas.git + GIT_REPOSITORY http://admin@172.20.90.14:8080/r/openblas.git # GIT_TAG ${OPENBLAS_COMMIT} PREFIX ${CBLAS_SOURCES_DIR} INSTALL_DIR ${CBLAS_INSTALL_DIR} @@ -105,7 +105,7 @@ IF(NOT ${CBLAS_FOUND}) extern_openblas ${EXTERNAL_PROJECT_LOG_ARGS} # GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git - GIT_REPOSITORY http://admin@localhost:8080/r/openblas.git + GIT_REPOSITORY http://admin@172.20.90.14:8080/r/openblas.git # GIT_TAG ${OPENBLAS_COMMIT} PREFIX ${CBLAS_SOURCES_DIR} INSTALL_DIR ${CBLAS_INSTALL_DIR} diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index d4c6ea781..43b69e72d 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -208,7 +208,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) # 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 http://admin@172.20.90.14:8080/r/protobuf.git) 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..456f26385 100644 --- a/cmake/external/zlib.cmake +++ b/cmake/external/zlib.cmake @@ -32,7 +32,7 @@ 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_REPOSITORY "http://admin@172.20.90.14:8080/r/zlib.git" # GIT_TAG "v1.2.8" PREFIX ${ZLIB_SOURCES_DIR} UPDATE_COMMAND "" -- GitLab