Commit 592361ed authored by Davis King's avatar Davis King
Browse files

Moved the CUDA stuff into its own folder.

parent 49a5d39d
...@@ -254,8 +254,8 @@ if (NOT TARGET dlib) ...@@ -254,8 +254,8 @@ if (NOT TARGET dlib)
threads/async.cpp threads/async.cpp
timer/timer.cpp timer/timer.cpp
stack_trace.cpp stack_trace.cpp
dnn/cpu_dlib.cpp cuda/cpu_dlib.cpp
dnn/tensor_tools.cpp cuda/tensor_tools.cpp
) )
if(UNIX) if(UNIX)
...@@ -657,13 +657,13 @@ if (NOT TARGET dlib) ...@@ -657,13 +657,13 @@ if (NOT TARGET dlib)
if (CUDA_FOUND AND cudnn AND (NOT USING_OLD_VISUAL_STUDIO_COMPILER) AND cuda_test_compile_worked AND cudnn_test_compile_worked AND cudnn_include) if (CUDA_FOUND AND cudnn AND (NOT USING_OLD_VISUAL_STUDIO_COMPILER) AND cuda_test_compile_worked AND cudnn_test_compile_worked AND cudnn_include)
set(source_files ${source_files} set(source_files ${source_files}
dnn/cuda_dlib.cu cuda/cuda_dlib.cu
dnn/cudnn_dlibapi.cpp cuda/cudnn_dlibapi.cpp
dnn/cublas_dlibapi.cpp cuda/cublas_dlibapi.cpp
dnn/cusolver_dlibapi.cu cuda/cusolver_dlibapi.cu
dnn/curand_dlibapi.cpp cuda/curand_dlibapi.cpp
dnn/cuda_data_ptr.cpp cuda/cuda_data_ptr.cpp
dnn/gpu_data.cpp cuda/gpu_data.cpp
) )
set(dlib_needed_libraries ${dlib_needed_libraries} set(dlib_needed_libraries ${dlib_needed_libraries}
${CUDA_CUBLAS_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES}
......
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
#include "../gui_core/gui_core_kernel_2.cpp" #include "../gui_core/gui_core_kernel_2.cpp"
#endif // DLIB_NO_GUI_SUPPORT #endif // DLIB_NO_GUI_SUPPORT
#include "../dnn/cpu_dlib.cpp" #include "../cuda/cpu_dlib.cpp"
#include "../dnn/tensor_tools.cpp" #include "../cuda/tensor_tools.cpp"
#endif // DLIB_ISO_CPP_ONLY #endif // DLIB_ISO_CPP_ONLY
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(cuda_test) project(cuda_test)
include_directories(../../dnn) include_directories(../../cuda)
add_definitions(-DDLIB_USE_CUDA) add_definitions(-DDLIB_USE_CUDA)
# Override the FindCUDA.cmake setting to avoid duplication of host flags if using a toolchain: # Override the FindCUDA.cmake setting to avoid duplication of host flags if using a toolchain:
......
...@@ -14,6 +14,6 @@ include(find_cudnn.txt) ...@@ -14,6 +14,6 @@ include(find_cudnn.txt)
if (cudnn_include AND cudnn) if (cudnn_include AND cudnn)
include_directories(${cudnn_include}) include_directories(${cudnn_include})
cuda_add_library(cudnn_test STATIC ../../dnn/cudnn_dlibapi.cpp ${cudnn} ) cuda_add_library(cudnn_test STATIC ../../cuda/cudnn_dlibapi.cpp ${cudnn} )
enable_cpp11_for_target(cudnn_test) enable_cpp11_for_target(cudnn_test)
endif() endif()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment