Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
592361ed
"git@developer.sourcefind.cn:change/sglang.git" did not exist on "efedbe6ca92028873b4e985df5533d31bd6dae59"
Commit
592361ed
authored
Apr 06, 2018
by
Davis King
Browse files
Moved the CUDA stuff into its own folder.
parent
49a5d39d
Changes
38
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
13 additions
and
13 deletions
+13
-13
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+9
-9
dlib/all/source.cpp
dlib/all/source.cpp
+2
-2
dlib/cmake_utils/test_for_cuda/CMakeLists.txt
dlib/cmake_utils/test_for_cuda/CMakeLists.txt
+1
-1
dlib/cmake_utils/test_for_cudnn/CMakeLists.txt
dlib/cmake_utils/test_for_cudnn/CMakeLists.txt
+1
-1
dlib/cuda/cpu_dlib.cpp
dlib/cuda/cpu_dlib.cpp
+0
-0
dlib/cuda/cpu_dlib.h
dlib/cuda/cpu_dlib.h
+0
-0
dlib/cuda/cublas_dlibapi.cpp
dlib/cuda/cublas_dlibapi.cpp
+0
-0
dlib/cuda/cublas_dlibapi.h
dlib/cuda/cublas_dlibapi.h
+0
-0
dlib/cuda/cuda_data_ptr.cpp
dlib/cuda/cuda_data_ptr.cpp
+0
-0
dlib/cuda/cuda_data_ptr.h
dlib/cuda/cuda_data_ptr.h
+0
-0
dlib/cuda/cuda_dlib.cu
dlib/cuda/cuda_dlib.cu
+0
-0
dlib/cuda/cuda_dlib.h
dlib/cuda/cuda_dlib.h
+0
-0
dlib/cuda/cuda_errors.h
dlib/cuda/cuda_errors.h
+0
-0
dlib/cuda/cuda_utils.h
dlib/cuda/cuda_utils.h
+0
-0
dlib/cuda/cudnn_dlibapi.cpp
dlib/cuda/cudnn_dlibapi.cpp
+0
-0
dlib/cuda/cudnn_dlibapi.h
dlib/cuda/cudnn_dlibapi.h
+0
-0
dlib/cuda/curand_dlibapi.cpp
dlib/cuda/curand_dlibapi.cpp
+0
-0
dlib/cuda/curand_dlibapi.h
dlib/cuda/curand_dlibapi.h
+0
-0
dlib/cuda/cusolver_dlibapi.cu
dlib/cuda/cusolver_dlibapi.cu
+0
-0
dlib/cuda/cusolver_dlibapi.h
dlib/cuda/cusolver_dlibapi.h
+0
-0
No files found.
dlib/CMakeLists.txt
View file @
592361ed
...
@@ -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
}
...
...
dlib/all/source.cpp
View file @
592361ed
...
@@ -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
...
...
dlib/cmake_utils/test_for_cuda/CMakeLists.txt
View file @
592361ed
...
@@ -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:
...
...
dlib/cmake_utils/test_for_cudnn/CMakeLists.txt
View file @
592361ed
...
@@ -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
()
dlib/
dnn
/cpu_dlib.cpp
→
dlib/
cuda
/cpu_dlib.cpp
View file @
592361ed
File moved
dlib/
dnn
/cpu_dlib.h
→
dlib/
cuda
/cpu_dlib.h
View file @
592361ed
File moved
dlib/
dnn
/cublas_dlibapi.cpp
→
dlib/
cuda
/cublas_dlibapi.cpp
View file @
592361ed
File moved
dlib/
dnn
/cublas_dlibapi.h
→
dlib/
cuda
/cublas_dlibapi.h
View file @
592361ed
File moved
dlib/
dnn
/cuda_data_ptr.cpp
→
dlib/
cuda
/cuda_data_ptr.cpp
View file @
592361ed
File moved
dlib/
dnn
/cuda_data_ptr.h
→
dlib/
cuda
/cuda_data_ptr.h
View file @
592361ed
File moved
dlib/
dnn
/cuda_dlib.cu
→
dlib/
cuda
/cuda_dlib.cu
View file @
592361ed
File moved
dlib/
dnn
/cuda_dlib.h
→
dlib/
cuda
/cuda_dlib.h
View file @
592361ed
File moved
dlib/
dnn
/cuda_errors.h
→
dlib/
cuda
/cuda_errors.h
View file @
592361ed
File moved
dlib/
dnn
/cuda_utils.h
→
dlib/
cuda
/cuda_utils.h
View file @
592361ed
File moved
dlib/
dnn
/cudnn_dlibapi.cpp
→
dlib/
cuda
/cudnn_dlibapi.cpp
View file @
592361ed
File moved
dlib/
dnn
/cudnn_dlibapi.h
→
dlib/
cuda
/cudnn_dlibapi.h
View file @
592361ed
File moved
dlib/
dnn
/curand_dlibapi.cpp
→
dlib/
cuda
/curand_dlibapi.cpp
View file @
592361ed
File moved
dlib/
dnn
/curand_dlibapi.h
→
dlib/
cuda
/curand_dlibapi.h
View file @
592361ed
File moved
dlib/
dnn
/cusolver_dlibapi.cu
→
dlib/
cuda
/cusolver_dlibapi.cu
View file @
592361ed
File moved
dlib/
dnn
/cusolver_dlibapi.h
→
dlib/
cuda
/cusolver_dlibapi.h
View file @
592361ed
File moved
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment