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

Moved the creation and resizing of the v and w high modes from the A2A class to the A2A module and made them an output of the module. This means that they have to be inputs of the contration modules and they will freed from memory if they are no longer needed.

Browse Source
This commit is contained in:
fionnoh 2018-07-22 14:40:31 +01:00
parent c995788259
commit 34e9d3f0ca
4 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extras/Hadrons/AllToAllVectors.hpp
View File

@ -19,37 +19,25 @@ class A2AModesSchurDiagTwo
const std::vector<RealD> *eval;
Matrix &action;
Solver &solver;
std::vector<Field> w_high_5d, v_high_5d, w_high_4d, v_high_4d;
const int Nl, Nh;
const bool return_5d;
std::vector<Field> w_high_5d, v_high_5d, w_high_4d, v_high_4d;
public:
A2AModesSchurDiagTwo(const std::vector<Field> *_evec, const std::vector<RealD> *_eval,
Matrix &_action,
Solver &_solver,
std::vector<Field> _w_high_5d, std::vector<Field> _v_high_5d,
std::vector<Field> _w_high_4d, std::vector<Field> _v_high_4d,
const int _Nl, const int _Nh,
const bool _return_5d)
: evec(_evec), eval(_eval),
action(_action),
solver(_solver),
w_high_5d(_w_high_5d), v_high_5d(_v_high_5d),
w_high_4d(_w_high_4d), v_high_4d(_v_high_4d),
Nl(_Nl), Nh(_Nh),
return_5d(_return_5d)
{
init_resize(1, Nh);
if (return_5d) init_resize(Nh, Nh);
};
void init_resize(const size_t size_5d, const size_t size_4d)
{
GridBase *grid_5d = action.Grid();
GridBase *grid_4d = action.GaugeGrid();
w_high_5d.resize(size_5d, grid_5d);
v_high_5d.resize(size_5d, grid_5d);
w_high_4d.resize(size_4d, grid_4d);
v_high_4d.resize(size_4d, grid_4d);
}
return_5d(_return_5d){};
void high_modes(Field &source_5d, Field &w_source_5d, Field &source_4d, int i)
{

6
extras/Hadrons/Modules/MContraction/A2AMeson.hpp
View File

@ -77,9 +77,9 @@ TA2AMeson<FImpl>::TA2AMeson(const std::string name)
template <typename FImpl>
std::vector<std::string> TA2AMeson<FImpl>::getInput(void)
{
std::vector<std::string> in = {par().A2A1, par().A2A2};
in.push_back(par().A2A1 + "_class");
in.push_back(par().A2A2 + "_class");
std::vector<std::string> in = {par().A2A1 + "_class", par().A2A2 + "_class"};
in.push_back(par().A2A1 + "_w_high_4d");
in.push_back(par().A2A2 + "_v_high_4d");
return in;
}

2
extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp
View File

@ -82,6 +82,8 @@ template <typename FImpl>
std::vector<std::string> TMesonFieldGamma<FImpl>::getInput(void)
{
std::vector<std::string> in = {par().A2A1 + "_class", par().A2A2 + "_class"};
in.push_back(par().A2A1 + "_w_high_4d");
in.push_back(par().A2A2 + "_v_high_4d");
return in;
}

29
extras/Hadrons/Modules/MSolver/A2AVectors.hpp
View File

@ -107,7 +107,9 @@ std::vector<std::string> TA2AVectors<FImpl, nBasis>::getReference(void)
template <typename FImpl, int nBasis>
std::vector<std::string> TA2AVectors<FImpl, nBasis>::getOutput(void)
{
std::vector<std::string> out = {getName(), className_};
std::vector<std::string> out = {getName(), className_,
getName() + "_w_high_5d", getName() + "_v_high_5d",
getName() + "_w_high_4d", getName() + "_v_high_4d"};
return out;
}
@ -120,17 +122,17 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
int Nl = par().Nl;
int Nh = N - Nl;
bool return_5d = par().return_5d;
int Ls, Ls_;
int Ls;
std::string sub_string = "";
if (Nl > 0) sub_string = "_subtract";
auto &solver = envGet(Solver, par().solver + sub_string);
Ls_ = env().getObjectLs(par().solver + sub_string);
Ls = env().getObjectLs(par().solver + sub_string);
auto &action = envGet(FMat, par().action);
envTmpLat(FermionField, "ferm_src", Ls_);
envTmpLat(FermionField, "unphys_ferm", Ls_);
envTmpLat(FermionField, "ferm_src", Ls);
envTmpLat(FermionField, "unphys_ferm", Ls);
envTmpLat(FermionField, "tmp");
envTmpLat(FermionField, "tmp2");
@ -154,10 +156,25 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
LOG(Message) << "Creating a2a vectors " << getName() <<
" using " << Nh << " high modes only." << std::endl;
}
envCreate(A2ABase, className_, Ls_,
int size_5d = 1;
if (return_5d) size_5d = Nh;
envCreate(std::vector<FermionField>, getName() + "_w_high_5d", Ls, size_5d, FermionField(env().getGrid(Ls)));
envCreate(std::vector<FermionField>, getName() + "_v_high_5d", Ls, size_5d, FermionField(env().getGrid(Ls)));
envCreate(std::vector<FermionField>, getName() + "_w_high_4d", 1, Nh, FermionField(env().getGrid(1)));
envCreate(std::vector<FermionField>, getName() + "_v_high_4d", 1, Nh, FermionField(env().getGrid(1)));
auto &w_high_5d = envGet(std::vector<FermionField>, getName() + "_w_high_5d");
auto &v_high_5d = envGet(std::vector<FermionField>, getName() + "_v_high_5d");
auto &w_high_4d = envGet(std::vector<FermionField>, getName() + "_w_high_4d");
auto &v_high_4d = envGet(std::vector<FermionField>, getName() + "_v_high_4d");
envCreate(A2ABase, className_, Ls,
evec, eval,
action,
solver,
w_high_5d, v_high_5d,
w_high_4d, v_high_4d,
Nl, Nh,
return_5d);
}