From 4ae35000a91e90203344795126daaab24011e4fd Mon Sep 17 00:00:00 2001 From: ferben Date: Wed, 20 Mar 2019 13:36:57 +0000 Subject: [PATCH] removed module which we do not need --- Hadrons/Modules.hpp | 1 - .../Modules/MDistil/PerambMultipleSolves.cc | 7 - .../Modules/MDistil/PerambMultipleSolves.hpp | 288 ------------------ Hadrons/modules.inc | 1 - 4 files changed, 297 deletions(-) delete mode 100644 Hadrons/Modules/MDistil/PerambMultipleSolves.cc delete mode 100644 Hadrons/Modules/MDistil/PerambMultipleSolves.hpp diff --git a/Hadrons/Modules.hpp b/Hadrons/Modules.hpp index 0ca8d61b..b0e50bed 100644 --- a/Hadrons/Modules.hpp +++ b/Hadrons/Modules.hpp @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/Hadrons/Modules/MDistil/PerambMultipleSolves.cc b/Hadrons/Modules/MDistil/PerambMultipleSolves.cc deleted file mode 100644 index b5b92315..00000000 --- a/Hadrons/Modules/MDistil/PerambMultipleSolves.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MDistil; - -template class Grid::Hadrons::MDistil::TPerambMultipleSolves; diff --git a/Hadrons/Modules/MDistil/PerambMultipleSolves.hpp b/Hadrons/Modules/MDistil/PerambMultipleSolves.hpp deleted file mode 100644 index 845dca46..00000000 --- a/Hadrons/Modules/MDistil/PerambMultipleSolves.hpp +++ /dev/null @@ -1,288 +0,0 @@ -#ifndef Hadrons_MDistil_PerambMultipleSolves_hpp_ -#define Hadrons_MDistil_PerambMultipleSolves_hpp_ - -#include -#include -#include -#include -#include -#include -#include - -// These are members of Distillation -#include - -BEGIN_HADRONS_NAMESPACE - - -/****************************************************************************** - * PerambMultipleSolves * - ******************************************************************************/ -BEGIN_MODULE_NAMESPACE(MDistil) - -class PerambMultipleSolvesPar: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(PerambMultipleSolvesPar, - std::string, eigenPack, - std::string, UniqueIdentifier, - int, nsolves, - std::vector, nvecs, - int, nvec, - bool, multiFile, - DistilParameters, Distil, - std::string, solver); -}; - -template -class TPerambMultipleSolves: public Module -{ -public: - FERM_TYPE_ALIASES(FImpl,); - SOLVER_TYPE_ALIASES(FImpl,); - // constructor - TPerambMultipleSolves(const std::string name); - // destructor - virtual ~TPerambMultipleSolves(void); - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -protected: - // These variables are created in setup() and freed in Cleanup() - GridCartesian * grid3d; // Owned by me, so I must delete it - GridCartesian * grid4d; // Owned by environment (so I won't delete it) -protected: - virtual void Cleanup(void); -private: - unsigned int Ls_; -}; - -MODULE_REGISTER_TMP(PerambMultipleSolves, TPerambMultipleSolves, MDistil); - -// constructor ///////////////////////////////////////////////////////////////// -template -TPerambMultipleSolves::TPerambMultipleSolves(const std::string name) -: grid3d{nullptr}, grid4d{nullptr}, Module(name) -{} - -// destructor -template -TPerambMultipleSolves::~TPerambMultipleSolves(void) -{ - Cleanup(); -}; - -// dependencies/products /////////////////////////////////////////////////////// -template -std::vector TPerambMultipleSolves::getInput(void) -{ - std::vector in; - - in.push_back(par().eigenPack); - in.push_back(par().solver); - - return in; -} - -template -std::vector TPerambMultipleSolves::getOutput(void) -{ - std::vector out; - const int nsolves{par().nsolves}; - std::vector nvecs{par().nvecs}; - - for(int i=0;i -void TPerambMultipleSolves::setup(void) -{ - Cleanup(); - - const int nvec{par().nvec}; - const int nsolves{par().nsolves}; - std::vector nvecs{par().nvecs}; - const DistilParameters & Distil{par().Distil}; - const int LI{Distil.LI}; - const int nnoise{Distil.nnoise}; - const int Nt_inv{Distil.Nt_inv}; // TODO: PROBABLY BETTER: if (full_tdil) Nt_inv=1; else Nt_inv = TI; - const int Ns{Distil.Ns}; - std::array sIndexNames{"Nt", "nvec", "LI", "nnoise", "Nt_inv", "SI"}; - - envCreate(std::vector, getName() + "_noise", 1, - nvec*Distil.Ns*Distil.Nt*Distil.nnoise); - for(int i=0;i, getName() + "_solve_"+std::to_string(nvecs[i]), 1, - nnoise*nvecs[i]*Ns*Nt_inv, envGetGrid(FermionField)); - } - grid4d = env().getGrid(); - grid3d = MakeLowerDimGrid(grid4d);//new GridCartesian(latt_size,simd_layout_3,mpi_layout,*grid4d); - - envTmpLat(GaugeField, "Umu"); - envTmpLat(LatticeSpinColourVector, "dist_source"); - //envTmp(std::vector, "sources", 1, - // std::vector( nsolves, grid4d )); - envTmpLat(LatticeSpinColourVector, "tmp2"); - envTmpLat(LatticeSpinColourVector, "result"); - envTmpLat(LatticeColourVector, "result_nospin"); - envTmp(LatticeSpinColourVector, "tmp3d",1,LatticeSpinColourVector(grid3d)); - envTmp(LatticeColourVector, "tmp3d_nospin",1,LatticeColourVector(grid3d)); - envTmp(LatticeColourVector, "result_3d",1,LatticeColourVector(grid3d)); - envTmp(LatticeColourVector, "evec3d",1,LatticeColourVector(grid3d)); - - Ls_ = env().getObjectLs(par().solver); - envTmpLat(FermionField, "v4dtmp"); - envTmpLat(FermionField, "v5dtmp", Ls_); - envTmpLat(FermionField, "v5dtmp_sol", Ls_); -} - -// clean up any temporaries created by setup (that aren't stored in the environment) -template -void TPerambMultipleSolves::Cleanup(void) -{ - if( grid3d != nullptr ) { - delete grid3d; - grid3d = nullptr; - } - grid4d = nullptr; -} - -// execution /////////////////////////////////////////////////////////////////// -template -void TPerambMultipleSolves::execute(void) -{ - const int nsolves{par().nsolves}; - const int nvec{par().nvec}; - std::vector nvecs{par().nvecs}; - const DistilParameters & Distil{par().Distil}; - const int LI{Distil.LI}; - //const int SI{Distil.SI}; - const int TI{Distil.TI}; - const int nnoise{Distil.nnoise}; - const int Nt{Distil.Nt}; - const int Nt_inv{Distil.Nt_inv}; // TODO: PROBABLY BETTER: if (full_tdil) Nt_inv=1; else Nt_inv = TI; - const int tsrc{Distil.tsrc}; - const int Ns{Distil.Ns}; - - auto &solver=envGet(Solver, par().solver); - auto &mat = solver.getFMat(); - envGetTmp(FermionField, v4dtmp); - envGetTmp(FermionField, v5dtmp); - envGetTmp(FermionField, v5dtmp_sol); - - const bool full_tdil{TI==Nt}; - const bool exact_distillation{full_tdil && LI==nvec}; - - const std::string &UniqueIdentifier{par().UniqueIdentifier}; - - auto &noise = envGet(std::vector, getName() + "_noise"); - auto &epack = envGet(Grid::Hadrons::EigenPack, par().eigenPack); - std::vector> solves(nsolves); - for(int i=0;i, getName() +"_solve_"+std::to_string(nvecs[i])); - solves[i].resize(nnoise*nvecs[i]*Ns*Nt_inv, grid4d); - solves[i]=unsmeared_sink; - } - - GridSerialRNG sRNG; - sRNG.SeedUniqueString(UniqueIdentifier + std::to_string(vm().getTrajectory())); - Real rn; - - for (int inoise=0;inoise 0.5) ? -1 : 1; - } - } - } - } - } - - - envGetTmp(LatticeSpinColourVector, dist_source); - envGetTmp(LatticeSpinColourVector, tmp2); - envGetTmp(LatticeSpinColourVector, result); - envGetTmp(LatticeColourVector, result_nospin); - envGetTmp(LatticeSpinColourVector, tmp3d); - envGetTmp(LatticeColourVector, tmp3d_nospin); - envGetTmp(LatticeColourVector, result_3d); - envGetTmp(LatticeColourVector, evec3d); - //envGetTmp(std::vector, sources); - - const int Ntlocal{grid4d->LocalDimensions()[3]}; - const int Ntfirst{grid4d->LocalStarts()[3]}; - - { - - int t_inv; - for (int inoise = 0; inoise < nnoise; inoise++) { - for (int dk = 0; dk < LI; dk++) { - for (int dt = 0; dt < Nt_inv; dt++) { - for (int ds = 0; ds < Ns; ds++) { - std::cout << "LapH source vector from noise " << inoise << " and dilution component (d_k,d_t,d_alpha) : (" << dk << ","<< dt << "," << ds << ")" << std::endl; - dist_source = zero; - tmp3d_nospin = zero; - evec3d = zero; - for (int it = dt; it < Nt; it += TI){ - if (full_tdil) t_inv = tsrc; else t_inv = it; - if( t_inv >= Ntfirst && t_inv < Ntfirst + Ntlocal ) { - for (int ik = dk; ik < nvec; ik += LI){ - for (int is = ds; is < Ns; is += Ns){ // TODO: Also allow non-full spin dilution (re-define exact_distillation?) - ExtractSliceLocal(evec3d,epack.evec[ik],0,t_inv,3); - tmp3d_nospin = evec3d * noise[inoise + nnoise*(t_inv + Nt*(ik+nvec*is))]; - tmp3d=zero; - pokeSpin(tmp3d,tmp3d_nospin,is); - tmp2=zero; - InsertSliceLocal(tmp3d,tmp2,0,t_inv-Ntfirst,Grid::QCD::Tdir); - dist_source += tmp2; - } - } - } - } - std::cout << "Inversion for noise " << inoise << " and dilution component (d_k,d_t,d_alpha) : (" << dk << ","<< dt << "," << ds << ")" << std::endl; - result=zero; - v4dtmp = dist_source; - if (Ls_ == 1){ - solver(result, v4dtmp); - } else { - mat.ImportPhysicalFermionSource(v4dtmp, v5dtmp); - solver(v5dtmp_sol, v5dtmp); - mat.ExportPhysicalFermionSolution(v5dtmp_sol, v4dtmp); - result = v4dtmp; - } - for (int isource = 0; isource < nsolves; isource ++){ - if(dk < nvecs[isource]){ - solves[isource][inoise+nnoise*(dk+nvecs[isource]*(dt+Nt_inv*ds))] = result; - } - } - } - } - } - } - } -} - - - -END_MODULE_NAMESPACE - -END_HADRONS_NAMESPACE - -#endif // Hadrons_MDistil_PerambMultipleSolves_hpp_ diff --git a/Hadrons/modules.inc b/Hadrons/modules.inc index 9768c830..9a839f1d 100644 --- a/Hadrons/modules.inc +++ b/Hadrons/modules.inc @@ -42,7 +42,6 @@ modules_cc =\ Modules/MDistil/BC2.cc \ Modules/MDistil/BContraction.cc \ Modules/MDistil/LapEvec.cc \ - Modules/MDistil/PerambMultipleSolves.cc \ Modules/MDistil/DistilSink.cc \ Modules/MDistil/Baryon2pt.cc \ Modules/MDistil/PerambFromSolve.cc \