From 1c543401741f1328b65d30a764f6273ddf9b60b6 Mon Sep 17 00:00:00 2001 From: Mark Borgerding Date: Sun, 31 May 2009 15:44:57 -0400 Subject: more work on ei_fftw_impl --- bench/benchFFT.cpp | 4 ++++ unsupported/Eigen/FFT | 3 ++- unsupported/test/FFT.cpp | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bench/benchFFT.cpp b/bench/benchFFT.cpp index 14f5063fb..4b6cabb55 100644 --- a/bench/benchFFT.cpp +++ b/bench/benchFFT.cpp @@ -26,6 +26,10 @@ #include #include #include +#ifdef USE_FFTW +#include +#endif + #include using namespace Eigen; diff --git a/unsupported/Eigen/FFT b/unsupported/Eigen/FFT index 03f8504a4..dc7e85908 100644 --- a/unsupported/Eigen/FFT +++ b/unsupported/Eigen/FFT @@ -32,7 +32,8 @@ // FFTW: faster, GPL -- incompatible with Eigen in LGPL form, bigger code size #ifdef FFTW_ESTIMATE // definition of FFTW_ESTIMATE indicates the caller has included fftw3.h, we can use FFTW routines #include "src/FFT/ei_fftw_impl.h" -// #define DEFAULT_FFT_IMPL ei_fftw_impl +#undef DEFAULT_FFT_IMPL +#define DEFAULT_FFT_IMPL ei_fftw_impl #endif // intel Math Kernel Library: fastest, commerical -- incompatible with Eigen in GPL form diff --git a/unsupported/test/FFT.cpp b/unsupported/test/FFT.cpp index 32d1393d0..28230e1c4 100644 --- a/unsupported/test/FFT.cpp +++ b/unsupported/test/FFT.cpp @@ -23,6 +23,11 @@ // Eigen. If not, see . #include "main.h" +//#define USE_FFTW +#ifdef USE_FFTW +#include +#endif + #include using namespace std; -- cgit v1.2.3