Move and rename cuda_error_check

There is no need for this file to have .cu* extension. It's only host code.

diff --git a/src/complexmat.cuh b/src/complexmat.cuh
index 71a958ae7fe9b028aa4218681da89f7f7154fbc4..0385243c24167f5a098e47db788edfd198bb2472 100644 (file)
--- a/src/complexmat.cuh
+++ b/src/complexmat.cuh
@@ -7,7 +7,7 @@
 #include "cuda_runtime.h"
 #include "cufft.h"
 
-#include "cuda/cuda_error_check.cuh"
+#include "cuda_error_check.hpp"
 
 class ComplexMat {
   public:

diff --git a/src/cuda/CMakeLists.txt b/src/cuda/CMakeLists.txt
deleted file mode 100644 (file)
index 7441c91..0000000
--- a/src/cuda/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set(CUDA_ERROR_CHECK cuda_error_check.cuh)

diff --git a/src/cuda/cuda_error_check.cuh b/src/cuda_error_check.hpp
similarity index 100%
rename from src/cuda/cuda_error_check.cuh
rename to src/cuda_error_check.hpp

diff --git a/src/cuda_functions.cuh b/src/cuda_functions.cuh
index f6e15cdaed14fc1c404d07d15eca122fbc9dde35..99cf132e8aad72e4eaa45bab7ee50f899b248fff 100644 (file)
--- a/src/cuda_functions.cuh
+++ b/src/cuda_functions.cuh
@@ -2,7 +2,7 @@
 #define CUDA_FUNCTIONS_H
 
 #include "cuda_runtime.h"
-#include "cuda/cuda_error_check.cuh"
+#include "cuda_error_check.hpp"
 
 void cuda_gaussian_correlation(float *data_in, float *data_out, float *xf_sqr_norm, float *yf_sqr_norm, double sigma,
                                int n_channels, int n_scales, int rows, int cols);

diff --git a/src/dynmem.hpp b/src/dynmem.hpp
index 54de168dc638255d1826fff7912128ba5e35bac8..007665a6fb5a38609e39c927c9a82f2efbd96ba6 100644 (file)
--- a/src/dynmem.hpp
+++ b/src/dynmem.hpp
@@ -9,7 +9,7 @@
 #if defined(CUFFT) || defined(CUFFTW)
 #include "cuda_runtime.h"
 #ifdef CUFFT
-#include "cuda/cuda_error_check.cuh"
+#include "cuda_error_check.hpp"
 #endif
 #endif
 

diff --git a/src/fft_cufft.h b/src/fft_cufft.h
index dde9f39f0933e22a95c2b7ea762064e67953edc8..9a927aa3a40c204c8aa947a54012e182200d3f92 100644 (file)
--- a/src/fft_cufft.h
+++ b/src/fft_cufft.h
@@ -6,7 +6,7 @@
 #include <cublas_v2.h>
 
 #include "fft.h"
-#include "cuda/cuda_error_check.cuh"
+#include "cuda_error_check.hpp"
 #include "pragmas.h"
 
 struct ThreadCtx;

diff --git a/src/kcf.h b/src/kcf.h
index 390466ec386a4fa1b328b47658bef32c2983b7dd..71bcf0c0073f6b3bb272b0d576b6178e52b716c0 100644 (file)
--- a/src/kcf.h
+++ b/src/kcf.h
@@ -9,7 +9,7 @@
 #ifdef CUFFT
 #include "complexmat.cuh"
 #include "cuda_functions.cuh"
-#include "cuda/cuda_error_check.cuh"
+#include "cuda_error_check.hpp"
 #include <cuda_runtime.h>
 #else
 #include "complexmat.hpp"