Removed (most of the) warnings

Author: krzysg

src/misc/CudaMemory.cuh

@@ -9,23 +9,8 @@
 #include <cuda_runtime.h>
 #include <device_launch_parameters.h>
 
-#include <cassert>
-
-
-// TODO: this method is duplicated in CudaTools.cuh
-//       Somehow including it here break compilation - fix it please.
-#define checkCuda(ans) { cudaAssert2((ans), __FILE__, __LINE__); }
-inline void cudaAssert2(cudaError_t code, const char *file, int line, bool abort=true)
-{
-#if defined(DEBUG) || defined(_DEBUG) || !defined(NDEBUG)
-    if (code != cudaSuccess)
-    {
-        fprintf(stderr,"GPUassert: (%d) %s %s %d\n", code, cudaGetErrorString(code), file, line);
-        assert(code == cudaSuccess); // If debugging it helps to see call tree somehow
-        if (abort) exit(code);
-    }
-#endif
-}
+#include "misc/CudaTools.cuh"
+
 
 inline void* getPinnedMemory(size_t aNumOfBytes) {
     void *memory = nullptr;

src/misc/CudaTools.cuh

@@ -5,15 +5,12 @@
 #ifndef LIBAPR_CUDATOOLS_HPP
 #define LIBAPR_CUDATOOLS_HPP
 
-
 #include <cuda_runtime.h>
 #include <device_launch_parameters.h>
 #include <cuda_runtime_api.h>
 #include <iostream>
 #include <chrono>
-
-#include "data_structures/Mesh/PixelData.hpp"
-
+#include <cassert>
 
 #define checkCuda(ans) { cudaAssert((ans), __FILE__, __LINE__); }
 inline void cudaAssert(cudaError_t code, const char *file, int line, bool abort=true)
@@ -112,6 +109,8 @@ enum CopyDir : CopyDirType {
     INVALID = 4     // Just wrong/last value keeper for validating settings
 };
 
+template <typename T>
+class PixelData;
 
 /**
  * Checks if provided type is a PixelData container

test/PullingSchemeCudaTest.cpp

@@ -147,9 +147,6 @@ TEST(PullingSchemeTest, OVPCCUDA_Ydir) {
     const PixelDataDim dim = levels.getDimension();
     gi.init(2 * dim.y, dim.x, dim.z); // <-- Y-dir
 
-    int levelMax = gi.l_max - 1;
-    int levelMin = gi.l_min;
-
     // Initialize all needed objects
     APRTimer t(false);
 
@@ -185,9 +182,6 @@ TEST(PullingSchemeTest, OVPCCUDA_Xdir) {
     const PixelDataDim dim = levels.getDimension();
     gi.init(dim.y, 2 * dim.x, dim.z); // <-- X-dir
 
-    int levelMax = gi.l_max - 1;
-    int levelMin = gi.l_min;
-
     // Initialize all needed objects
     APRTimer t(false);
 
@@ -223,9 +217,6 @@ TEST(PullingSchemeTest, OVPCCUDA_Zdir) {
     const PixelDataDim dim = levels.getDimension();
     gi.init(dim.y, dim.x, 2 * dim.z); // <-- Z-dir
 
-    int levelMax = gi.l_max - 1;
-    int levelMin = gi.l_min;
-
     // Initialize all needed objects
     APRTimer t(false);