portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-13 04:37:05 +01:00
Code Releases Activity

FFT improved and test_FFT passing under MPI 8 processes, 8^4 for LatticeComplexD and LatticeSpinMatrixD

Browse Source
This commit is contained in:
paboyle
2016-08-18 02:23:21 +01:00
parent 17097a93ec
commit e423a09974
3 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/FFT.h
View File

@ -93,23 +93,20 @@ namespace Grid {
Lattice<sobj> plresult(&pencil_l);
{
assert(sizeof(typename sobj::scalar_type)==sizeof(ComplexD));
assert(sizeof(fftw_complex)==sizeof(ComplexD));
assert(sizeof(fftw_complex)==sizeof(ComplexD));
int Ncomp = sizeof(sobj)/sizeof(fftw_complex);
std::cout << "Ncomp = "<<Ncomp<<std::endl;
int rank = 1; /* not 2: we are computing 1d transforms */
int rank = 1; /* not 2: we are computing 1d transforms */
int n[] = {G}; /* 1d transforms of length G */
int howmany = Ncomp;
int odist,idist,istride,ostride;
idist = odist = 1;
istride = ostride = Ncomp; /* distance between two elements in the same column */
int *inembed = n, *onembed = n;
fftw_complex *in = (fftw_complex *)&plsource._odata[0];
fftw_complex *out= (fftw_complex *)&plresult._odata[0];
@ -123,11 +120,9 @@ namespace Grid {
ostride, odist,
sign,FFTW_ESTIMATE);
// Barrel shift and collect global pencil
for(int p=0;p<processors[dim];p++) {
for(int idx=0;idx<sgrid->lSites();idx++) {
std::vector<int> lcoor(Nd);
@ -144,8 +139,6 @@ namespace Grid {
ssource = Cshift(ssource,dim,L);
}
std::cout << " pgsource pencil " << pgsource<<std::endl ;
// Loop over orthog coords
for(int idx=0;idx<sgrid->lSites();idx++) {
@ -165,11 +158,6 @@ namespace Grid {
pokeLocalSite(s,plsource,pcoor);
}
if ( idx==0) {
std::cout << " plsource pencil " << pgsource<<std::endl ;
}
// FFT the pencil
fftw_execute(p);

1
lib/tensors/Tensor_unary.h
View File

@ -36,7 +36,6 @@ template<class obj> inline auto func(const iScalar<obj> &z) -> iScalar<obj>\
{\
iScalar<obj> ret;\
ret._internal = func( (z._internal));\
std::cout << "Unary "<<#func<<" " << z._internal <<" -> "<< ret._internal <<" "<< typeid(obj).name() <<std::endl; \
return ret;\
}\
template<class obj,int N> inline auto func(const iVector<obj,N> &z) -> iVector<obj,N>\