Added sanity check for cuFFT version, which prevents unsupported combinations.

diff --git a/Makefile b/Makefile
index 2a6c4f24e8ee108bc3a30f92e95dab9ed0aa30b7..310d162ae2e10467bf01b8d52890085142dba602 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ CMAKE_OPTS += -G Ninja
 
 CMAKE_OTPS_opencvfft-st      = -DFFT=OpenCV
 CMAKE_OTPS_opencvfft-async   = -DFFT=OpenCV -DASYNC=ON
-#CMAKE_OTPS_opencv-cufft    = -DFFT=OpenCV_cuFFT
 CMAKE_OTPS_fftw              = -DFFT=fftw
 CMAKE_OTPS_fftw_openmp       = -DFFT=fftw -DOPENMP=ON
 CMAKE_OTPS_fftw_async        = -DFFT=fftw -DASYNC=ON

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c358b710bb025832e3b5755e67d87a713a566e2d..d3b932c7969ba58abd3dc563a78cc519822448ea 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,6 +48,10 @@ ELSE()
   MESSAGE(FATAL_ERROR "Invalid FFT implementation selected")
 ENDIF()
 
+IF((FFT STREQUAL "cuFFT") AND (ASYNC OR (OPENMP AND NOT BIG_BATCH)))
+  message(SEND_ERROR "cuFFT version does not support ASYNC and OpenMP only if used with big batch mode.")
+ENDIF()
+
 IF(ASYNC AND NOT OPENMP)
   add_definitions(-DASYNC)
   MESSAGE(STATUS "ASYNC")