1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-27 22:25:56 +01:00

Namespace, formatting indent changes

This commit is contained in:
paboyle 2018-01-14 23:35:16 +00:00
parent 3ef7b2389e
commit a0f4687887

View File

@ -28,33 +28,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
See the full license in the file "LICENSE" in the top level distribution directory See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#include <Grid/qcd/action/fermion/FermionCore.h> #include <Grid/qcd/action/fermion/FermionCore.h>
#include <Grid/qcd/action/fermion/DomainWallEOFAFermion.h> #include <Grid/qcd/action/fermion/DomainWallEOFAFermion.h>
namespace Grid { NAMESPACE_BEGIN(Grid);
namespace QCD {
/*
/*
* Dense matrix versions of routines * Dense matrix versions of routines
*/ */
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::MooeeInvDag(const FermionField& psi, FermionField& chi) void DomainWallEOFAFermion<Impl>::MooeeInvDag(const FermionField& psi, FermionField& chi)
{ {
this->MooeeInternal(psi, chi, DaggerYes, InverseYes); this->MooeeInternal(psi, chi, DaggerYes, InverseYes);
} }
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::MooeeInv(const FermionField& psi, FermionField& chi) void DomainWallEOFAFermion<Impl>::MooeeInv(const FermionField& psi, FermionField& chi)
{ {
this->MooeeInternal(psi, chi, DaggerNo, InverseYes); this->MooeeInternal(psi, chi, DaggerNo, InverseYes);
} }
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::M5D(const FermionField& psi, const FermionField& phi, void DomainWallEOFAFermion<Impl>::M5D(const FermionField& psi, const FermionField& phi,
FermionField& chi, std::vector<Coeff_t>& lower, std::vector<Coeff_t>& diag, std::vector<Coeff_t>& upper) FermionField& chi, std::vector<Coeff_t>& lower, std::vector<Coeff_t>& diag, std::vector<Coeff_t>& upper)
{ {
GridBase* grid = psi._grid; GridBase* grid = psi._grid;
int Ls = this->Ls; int Ls = this->Ls;
int LLs = grid->_rdimensions[0]; int LLs = grid->_rdimensions[0];
@ -91,7 +91,7 @@ namespace QCD {
parallel_for(int ss=0; ss<grid->oSites(); ss+=LLs){ // adds LLs parallel_for(int ss=0; ss<grid->oSites(); ss+=LLs){ // adds LLs
#if 0 #if 0
alignas(64) SiteHalfSpinor hp; alignas(64) SiteHalfSpinor hp;
alignas(64) SiteHalfSpinor hm; alignas(64) SiteHalfSpinor hm;
@ -121,7 +121,7 @@ namespace QCD {
} }
#else #else
for(int v=0; v<LLs; v++){ for(int v=0; v<LLs; v++){
@ -190,16 +190,16 @@ namespace QCD {
vstream(chi[ss+v]()(3)(2), p_32); vstream(chi[ss+v]()(3)(2), p_32);
} }
#endif #endif
} }
this->M5Dtime += usecond(); this->M5Dtime += usecond();
} }
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::M5Ddag(const FermionField& psi, const FermionField& phi, void DomainWallEOFAFermion<Impl>::M5Ddag(const FermionField& psi, const FermionField& phi,
FermionField& chi, std::vector<Coeff_t>& lower, std::vector<Coeff_t>& diag, std::vector<Coeff_t>& upper) FermionField& chi, std::vector<Coeff_t>& lower, std::vector<Coeff_t>& diag, std::vector<Coeff_t>& upper)
{ {
GridBase* grid = psi._grid; GridBase* grid = psi._grid;
int Ls = this->Ls; int Ls = this->Ls;
int LLs = grid->_rdimensions[0]; int LLs = grid->_rdimensions[0];
@ -234,7 +234,7 @@ namespace QCD {
parallel_for(int ss=0; ss<grid->oSites(); ss+=LLs){ // adds LLs parallel_for(int ss=0; ss<grid->oSites(); ss+=LLs){ // adds LLs
#if 0 #if 0
alignas(64) SiteHalfSpinor hp; alignas(64) SiteHalfSpinor hp;
alignas(64) SiteHalfSpinor hm; alignas(64) SiteHalfSpinor hm;
@ -261,7 +261,7 @@ namespace QCD {
chi[ss+v] = chi[ss+v] +l[v]*fm; chi[ss+v] = chi[ss+v] +l[v]*fm;
} }
#else #else
for(int v=0; v<LLs; v++){ for(int v=0; v<LLs; v++){
@ -328,24 +328,24 @@ namespace QCD {
vstream(chi[ss+v]()(3)(1), p_31); vstream(chi[ss+v]()(3)(1), p_31);
vstream(chi[ss+v]()(3)(2), p_32); vstream(chi[ss+v]()(3)(2), p_32);
} }
#endif #endif
} }
this->M5Dtime += usecond(); this->M5Dtime += usecond();
} }
#ifdef AVX512 #ifdef AVX512
#include<simd/Intel512common.h> #include<simd/Intel512common.h>
#include<simd/Intel512avx.h> #include<simd/Intel512avx.h>
#include<simd/Intel512single.h> #include<simd/Intel512single.h>
#endif #endif
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::MooeeInternalAsm(const FermionField& psi, FermionField& chi, void DomainWallEOFAFermion<Impl>::MooeeInternalAsm(const FermionField& psi, FermionField& chi,
int LLs, int site, Vector<iSinglet<Simd> >& Matp, Vector<iSinglet<Simd> >& Matm) int LLs, int site, Vector<iSinglet<Simd> >& Matp, Vector<iSinglet<Simd> >& Matm)
{ {
#ifndef AVX512 #ifndef AVX512
{ {
SiteHalfSpinor BcastP; SiteHalfSpinor BcastP;
SiteHalfSpinor BcastM; SiteHalfSpinor BcastM;
@ -394,35 +394,35 @@ namespace QCD {
} }
} }
#else #else
{ {
// pointers // pointers
// MASK_REGS; // MASK_REGS;
#define Chi_00 %%zmm1 #define Chi_00 %%zmm1
#define Chi_01 %%zmm2 #define Chi_01 %%zmm2
#define Chi_02 %%zmm3 #define Chi_02 %%zmm3
#define Chi_10 %%zmm4 #define Chi_10 %%zmm4
#define Chi_11 %%zmm5 #define Chi_11 %%zmm5
#define Chi_12 %%zmm6 #define Chi_12 %%zmm6
#define Chi_20 %%zmm7 #define Chi_20 %%zmm7
#define Chi_21 %%zmm8 #define Chi_21 %%zmm8
#define Chi_22 %%zmm9 #define Chi_22 %%zmm9
#define Chi_30 %%zmm10 #define Chi_30 %%zmm10
#define Chi_31 %%zmm11 #define Chi_31 %%zmm11
#define Chi_32 %%zmm12 #define Chi_32 %%zmm12
#define BCAST0 %%zmm13 #define BCAST0 %%zmm13
#define BCAST1 %%zmm14 #define BCAST1 %%zmm14
#define BCAST2 %%zmm15 #define BCAST2 %%zmm15
#define BCAST3 %%zmm16 #define BCAST3 %%zmm16
#define BCAST4 %%zmm17 #define BCAST4 %%zmm17
#define BCAST5 %%zmm18 #define BCAST5 %%zmm18
#define BCAST6 %%zmm19 #define BCAST6 %%zmm19
#define BCAST7 %%zmm20 #define BCAST7 %%zmm20
#define BCAST8 %%zmm21 #define BCAST8 %%zmm21
#define BCAST9 %%zmm22 #define BCAST9 %%zmm22
#define BCAST10 %%zmm23 #define BCAST10 %%zmm23
#define BCAST11 %%zmm24 #define BCAST11 %%zmm24
int incr = LLs*LLs*sizeof(iSinglet<Simd>); int incr = LLs*LLs*sizeof(iSinglet<Simd>);
for(int s1=0; s1<LLs; s1++){ for(int s1=0; s1<LLs; s1++){
@ -492,46 +492,46 @@ namespace QCD {
} }
} }
#undef Chi_00 #undef Chi_00
#undef Chi_01 #undef Chi_01
#undef Chi_02 #undef Chi_02
#undef Chi_10 #undef Chi_10
#undef Chi_11 #undef Chi_11
#undef Chi_12 #undef Chi_12
#undef Chi_20 #undef Chi_20
#undef Chi_21 #undef Chi_21
#undef Chi_22 #undef Chi_22
#undef Chi_30 #undef Chi_30
#undef Chi_31 #undef Chi_31
#undef Chi_32 #undef Chi_32
#undef BCAST0 #undef BCAST0
#undef BCAST1 #undef BCAST1
#undef BCAST2 #undef BCAST2
#undef BCAST3 #undef BCAST3
#undef BCAST4 #undef BCAST4
#undef BCAST5 #undef BCAST5
#undef BCAST6 #undef BCAST6
#undef BCAST7 #undef BCAST7
#undef BCAST8 #undef BCAST8
#undef BCAST9 #undef BCAST9
#undef BCAST10 #undef BCAST10
#undef BCAST11 #undef BCAST11
#endif #endif
}; };
// Z-mobius version // Z-mobius version
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::MooeeInternalZAsm(const FermionField& psi, FermionField& chi, void DomainWallEOFAFermion<Impl>::MooeeInternalZAsm(const FermionField& psi, FermionField& chi,
int LLs, int site, Vector<iSinglet<Simd> >& Matp, Vector<iSinglet<Simd> >& Matm) int LLs, int site, Vector<iSinglet<Simd> >& Matp, Vector<iSinglet<Simd> >& Matm)
{ {
std::cout << "Error: zMobius not implemented for EOFA" << std::endl; std::cout << "Error: zMobius not implemented for EOFA" << std::endl;
exit(-1); exit(-1);
}; };
template<class Impl> template<class Impl>
void DomainWallEOFAFermion<Impl>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv) void DomainWallEOFAFermion<Impl>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv)
{ {
int Ls = this->Ls; int Ls = this->Ls;
int LLs = psi._grid->_rdimensions[0]; int LLs = psi._grid->_rdimensions[0];
int vol = psi._grid->oSites()/LLs; int vol = psi._grid->oSites()/LLs;
@ -576,30 +576,30 @@ namespace QCD {
} }
this->MooeeInvTime += usecond(); this->MooeeInvTime += usecond();
} }
#ifdef DOMAIN_WALL_EOFA_DPERP_VEC #ifdef DOMAIN_WALL_EOFA_DPERP_VEC
INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplD); INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplD);
INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplF); INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplF);
INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplD); INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplD);
INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplF); INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplF);
INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplDF); INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplDF);
INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplFH); INSTANTIATE_DPERP_DWF_EOFA(DomainWallVec5dImplFH);
INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplDF); INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplDF);
INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplFH); INSTANTIATE_DPERP_DWF_EOFA(ZDomainWallVec5dImplFH);
template void DomainWallEOFAFermion<DomainWallVec5dImplF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<DomainWallVec5dImplF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<DomainWallVec5dImplD>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<DomainWallVec5dImplD>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<ZDomainWallVec5dImplF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<ZDomainWallVec5dImplF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<ZDomainWallVec5dImplD>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<ZDomainWallVec5dImplD>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<DomainWallVec5dImplFH>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<DomainWallVec5dImplFH>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<DomainWallVec5dImplDF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<DomainWallVec5dImplDF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<ZDomainWallVec5dImplFH>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<ZDomainWallVec5dImplFH>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
template void DomainWallEOFAFermion<ZDomainWallVec5dImplDF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv); template void DomainWallEOFAFermion<ZDomainWallVec5dImplDF>::MooeeInternal(const FermionField& psi, FermionField& chi, int dag, int inv);
#endif #endif
}} NAMESPACE_END(Grid);