Made FFTW used by default

masonng-astro · Nov 19, 2019 · 7c54f46 · 7c54f46
1 parent d828bc0
commit 7c54f46
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 965 deletions.
diff --git a/include/ransomfft.h b/include/ransomfft.h
@@ -32,19 +32,11 @@ typedef fcomplex rawtype;
 
 /* Figure out which FFTs we are using */
 
+#include "fftw3.h"
+void fftwcall(fcomplex *indata, long nn, int isign);
+void read_wisdom(void);
 #ifndef COMPLEXFFT
-#if defined USEFFTW
-  #define COMPLEXFFT    fftwcall
-  #include "fftw3.h"
-  void fftwcall(fcomplex *indata, long nn, int isign);
-  void read_wisdom(void);
-#elif defined USESGIFFT
-  #define COMPLEXFFT    sgifftcall
-  #include "fft.h"
-  void sgifftcall(fcomplex *indata, long nn, int isign);
-#else
-  #define COMPLEXFFT    tablesixstepfft
-#endif
+#define COMPLEXFFT    fftwcall
 #endif
 
 #ifndef TWOPI

diff --git a/src/Makefile b/src/Makefile
@@ -55,7 +55,7 @@ USEPROFILE = false
 
 # Very recent Intel CPUs might see a few percent speedup using -mavx
 CFLAGS = -I$(PRESTO)/include $(GLIBINC) $(CFITSIOINC) $(PGPLOTINC) $(FFTINC) \
-	-DUSEFFTW -DUSEMMAP -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+	-DUSEMMAP -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 	-g -Wall -W -fPIC -O3 -ffast-math
 CLINKFLAGS = $(CFLAGS)