From 2c9fe4ea6f9cb6019be05ef890402670b35e9f90 Mon Sep 17 00:00:00 2001 From: Uldis Locans Date: Mon, 29 May 2017 13:18:37 +0200 Subject: [PATCH] fix for seperate FFT --- src/Algorithms/FFT.h | 4 ++-- src/CUDA/CudaFFT.cuh | 2 +- src/DKSFFT.h | 2 +- src/MIC/MICFFT.h | 2 +- src/OpenCL/OpenCLFFT.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Algorithms/FFT.h b/src/Algorithms/FFT.h index 2711a4d..6af8d35 100644 --- a/src/Algorithms/FFT.h +++ b/src/Algorithms/FFT.h @@ -6,7 +6,7 @@ #include "../DKSDefinitions.h" -class FFT { +class BaseFFT { protected: int defaultN[3]; @@ -22,7 +22,7 @@ protected: public: - virtual ~FFT() { } + virtual ~BaseFFT() { } virtual int setupFFT(int ndim, int N[3]) = 0; virtual int setupFFTRC(int ndim, int N[3], double scale = 1.0) = 0; diff --git a/src/CUDA/CudaFFT.cuh b/src/CUDA/CudaFFT.cuh index 88e8486..2fcbbec 100644 --- a/src/CUDA/CudaFFT.cuh +++ b/src/CUDA/CudaFFT.cuh @@ -10,7 +10,7 @@ #include "../Algorithms/FFT.h" #include "CudaBase.cuh" -class CudaFFT : public FFT { +class CudaFFT : public BaseFFT { private: diff --git a/src/DKSFFT.h b/src/DKSFFT.h index 4931e65..cd87523 100644 --- a/src/DKSFFT.h +++ b/src/DKSFFT.h @@ -28,7 +28,7 @@ class DKSFFT : public DKSBase { private: - FFT *dksfft; + BaseFFT *dksfft; int initFFT(); diff --git a/src/MIC/MICFFT.h b/src/MIC/MICFFT.h index fd585d6..491ea06 100644 --- a/src/MIC/MICFFT.h +++ b/src/MIC/MICFFT.h @@ -10,7 +10,7 @@ #include "../Algorithms/FFT.h" #include "MICBase.h" -class MICFFT : public FFT { +class MICFFT : public BaseFFT { private: diff --git a/src/OpenCL/OpenCLFFT.h b/src/OpenCL/OpenCLFFT.h index b73420e..6ab8c88 100644 --- a/src/OpenCL/OpenCLFFT.h +++ b/src/OpenCL/OpenCLFFT.h @@ -22,7 +22,7 @@ #include "clFFT.h" -class OpenCLFFT : public FFT { +class OpenCLFFT : public BaseFFT { private: