From 00cc66979365aafb5b9c31e672eff661fd12bfa6 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Wed, 26 Sep 2018 00:01:20 +0200
Subject: [PATCH] Move and rename cuda_error_check

There is no need for this file to have .cu* extension. It's only host code.
---
 src/complexmat.cuh                                      | 2 +-
 src/cuda/CMakeLists.txt                                 | 3 ---
 src/{cuda/cuda_error_check.cuh => cuda_error_check.hpp} | 0
 src/cuda_functions.cuh                                  | 2 +-
 src/dynmem.hpp                                          | 2 +-
 src/fft_cufft.h                                         | 2 +-
 src/kcf.h                                               | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 src/cuda/CMakeLists.txt
 rename src/{cuda/cuda_error_check.cuh => cuda_error_check.hpp} (100%)

diff --git a/src/complexmat.cuh b/src/complexmat.cuh
index 71a958a..0385243 100644
--- 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
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 f6e15cd..99cf132 100644
--- 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 54de168..007665a 100644
--- 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 dde9f39..9a927aa 100644
--- 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 390466e..71bcf0c 100644
--- 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"
-- 
2.39.2