portelli/Grid
1
0 Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2026-10-07 16:28:06 +01:00
Code Releases Activity

Merge branch 'develop' into release/v0.6.0

Browse Source 
# Conflicts:
#	tests/core/Test_fft_gfix.cc
This commit is contained in:
portelli committed 2016-11-08 16:53:42 +00:00
2 parents 50d277d8d9 65bcf281d0
commit 8a5e3a917c
5 files changed
+37 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/FFT.h
+5 -1
View File
@@ -29,9 +29,13 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
#ifndef _GRID_FFT_H_
#define _GRID_FFT_H_
#ifdef HAVE_FFTW
#ifdef HAVE_FFTW
#ifdef USE_MKL
#include <fftw/fftw3.h>
#else
#include <fftw3.h>
#endif
#endif
namespace Grid {