Commit 9e2f26fc authored by Davis King's avatar Davis King

renamed these files again

--HG--
rename : dlib/dnn/cublas_api.cpp => dlib/dnn/cublas_dlibapi.cpp
rename : dlib/dnn/cublas_api.h => dlib/dnn/cublas_dlibapi.h
rename : dlib/dnn/cuda.cu => dlib/dnn/cuda_dlib.cu
rename : dlib/dnn/cuda.h => dlib/dnn/cuda_dlib.h
rename : dlib/dnn/cudnn_api.cpp => dlib/dnn/cudnn_dlibapi.cpp
rename : dlib/dnn/cudnn_api.h => dlib/dnn/cudnn_dlibapi.h
parent fa0e559f
...@@ -435,9 +435,9 @@ if (NOT TARGET dlib) ...@@ -435,9 +435,9 @@ if (NOT TARGET dlib)
if (CUDA_FOUND AND cudnn AND cudnn_include AND COMPILER_CAN_DO_CPP_11) if (CUDA_FOUND AND cudnn AND cudnn_include AND COMPILER_CAN_DO_CPP_11)
message(STATUS "Found cuDNN: " ${cudnn}) message(STATUS "Found cuDNN: " ${cudnn})
set(source_files ${source_files} set(source_files ${source_files}
dnn/cuda.cu dnn/cuda_dlib.cu
dnn/cudnn_api.cpp dnn/cudnn_dlibapi.cpp
dnn/cublas_api.cpp dnn/cublas_dlibapi.cpp
) )
set(dlib_needed_libraries ${dlib_needed_libraries} ${CUDA_CUBLAS_LIBRARIES} ${cudnn}) set(dlib_needed_libraries ${dlib_needed_libraries} ${CUDA_CUBLAS_LIBRARIES} ${cudnn})
include_directories(${cudnn_include}) include_directories(${cudnn_include})
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifdef DLIB_USE_CUDA #ifdef DLIB_USE_CUDA
#include "cublas_api.h" #include "cublas_dlibapi.h"
#include <cublas_v2.h> #include <cublas_v2.h>
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
//#include "cuda_dlib.h"
#define CHECK(call) \ #define CHECK(call) \
{ \ { \
const cudaError_t error = call; \ const cudaError_t error = call; \
......
...@@ -115,8 +115,8 @@ namespace dlib ...@@ -115,8 +115,8 @@ namespace dlib
dropout(const dropout&) = delete; dropout(const dropout&) = delete;
dropout& operator=(const dropout&) = delete; dropout& operator=(const dropout&) = delete;
// but is movable // but is movable
dropout(const dropout&&) = default; dropout(dropout&&) = default;
dropout& operator=(const dropout&&) = default; dropout& operator=(dropout&&) = default;
dropout(float drop_rate = 0.5); dropout(float drop_rate = 0.5);
dropout(float drop_rate, int seed); dropout(float drop_rate, int seed);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifdef DLIB_USE_CUDA #ifdef DLIB_USE_CUDA
#include "cudnn_api.h" #include "cudnn_dlibapi.h"
#include "tensor.h" #include "tensor.h"
#include <cudnn.h> #include <cudnn.h>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <memory> #include <memory>
#include <cstring> #include <cstring>
#include "../matrix.h" #include "../matrix.h"
#include "cudnn_api.h" #include "cudnn_dlibapi.h"
namespace dlib namespace dlib
{ {
......
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