Fixed gpu build, took fix from #426

jolibrain · May 29, 2018 · 91c6adc · 91c6adc
1 parent a3f94a7
commit 91c6adc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,8 +109,8 @@ if (USE_DLIB)
           INSTALL_COMMAND ""
           BUILD_IN_SOURCE 1
         )
-        set(DLIB_INC_DIR ${CMAKE_BINARY_DIR}/dlib/build/include ${CUDA_INCLUDE_DIRS})
-        set(DLIB_LIB_DIR ${CMAKE_BINARY_DIR}/dlib/build/lib ${CUDA_CUBLAS_LIBRARIES} ${CUDA_curand_LIBRARY} ${CUDA_CUDART_LIBRARY} ${CUDNN_LIBRARY} ${CUDA_cusolver_LIBRARY} ${CUDA_LIBRARY})
+        set(DLIB_INC_DIR ${CMAKE_BINARY_DIR}/dlib/build/include)
+        set(DLIB_LIB_DIR ${CMAKE_BINARY_DIR}/dlib/build/lib)
     else()
         ExternalProject_Add(
                 dlib
@@ -128,7 +128,6 @@ if (USE_DLIB)
 
     include_directories("${DLIB_INC_DIR}")
     message(STATUS "Dlib will be built")
-    message(STATUS "DLIB_LIB_DIR: " ${DLIB_LIB_DIR})
 endif()
 
 if (USE_TF)
@@ -283,7 +282,7 @@ else()
   endif()
   if (CUDA_FOUND)
     set(CAFFE_INC_DIR ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/include ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/src ${CUDA_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIR})
-    set(CAFFE_LIB_DIR ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/lib ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/src ${HDF5_LIB} ${PROTOBUF_LIB_DIR} ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_curand_LIBRARY})
+    set(CAFFE_LIB_DIR ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/lib ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/src ${HDF5_LIB} ${PROTOBUF_LIB_DIR})
   else()
     set(CAFFE_INC_DIR ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/include ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/src /usr/include/hdf5/serial ${PROTOBUF_INCLUDE_DIR})
     set(CAFFE_LIB_DIR $ENV{HOME}/lib ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/lib ${CMAKE_BINARY_DIR}/caffe_dd/src/caffe_dd/build/src ${HDF5_LIB} ${PROTOBUF_LIB_DIR})

diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake
@@ -233,8 +233,6 @@ if(USE_CUDNN)
   endif()
 endif()
 
-message(STATUS "CUDA linker libs: " ${deepdetect_LINKER_LIBS})
-
 # setting nvcc arch flags
 deepdetect_select_nvcc_arch_flags(NVCC_FLAGS_EXTRA)
 list(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_EXTRA})

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -2,7 +2,10 @@ include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${CAFFE_LIB_DIR} ${XGBOOST_LIB_DIR} ${TF_LIB_DIR} ${TSNE_LIB_DIR} ${DLIB_LIB_DIR})
 
 if (CUDA_FOUND)
-  set(CUDA_LIB_DEPS ${CUDA_LIBRARIES})
+  set(CUDA_LIB_DEPS ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_curand_LIBRARY} ${CUDA_CUDART_LIBRARY} ${CUDA_cusolver_LIBRARY})
+    if (USE_CUDNN)
+      set(CUDA_LIB_DEPS ${CUDA_LIB_DEPS} ${CUDNN_LIBRARY})
+    endif()
 else()
   set(CUDA_LIB_DEPS "")
   add_definitions(-DCPU_ONLY)
@@ -31,4 +34,4 @@ if (USE_DLIB)
 endif()
 
 add_executable (dede dede.cc)
-target_link_libraries (dede ddetect ${CUDA_LIB_DEPS} glog gflags ${OpenCV_LIBS} cppnetlib-uri curlpp curl crypto ssl hdf5_cpp ${Boost_LIBRARIES} ${CAFFE_LIB_DEPS} ${XGBOOST_LIB_DEPS} ${TF_LIB_DEPS} ${TSNE_LIB_DEPS} ${DLIB_LIB_DEPS})
+target_link_libraries (dede ddetect ${DLIB_LIB_DEPS} ${CUDA_LIB_DEPS} glog gflags ${OpenCV_LIBS} cppnetlib-uri curlpp curl crypto ssl hdf5_cpp ${Boost_LIBRARIES} ${CAFFE_LIB_DEPS} ${XGBOOST_LIB_DEPS} ${TF_LIB_DEPS} ${TSNE_LIB_DEPS})