From fa5dee76b10b5d3f9096e4c83f49f3973f1e2ebf Mon Sep 17 00:00:00 2001 From: fionnoh Date: Fri, 3 Aug 2018 15:15:54 +0100 Subject: [PATCH] Included Peter's A2AMeson field and Eigen changes --- extras/Hadrons/Makefile.am | 1 - .../Hadrons/Modules/MContraction/A2AMeson.cc | 8 - .../Hadrons/Modules/MContraction/A2AMeson.hpp | 207 -------------- .../Modules/MContraction/MesonFieldGamma.cc | 8 - .../Modules/MContraction/MesonFieldGamma.hpp | 269 ------------------ 5 files changed, 493 deletions(-) delete mode 100644 extras/Hadrons/Modules/MContraction/A2AMeson.cc delete mode 100644 extras/Hadrons/Modules/MContraction/A2AMeson.hpp delete mode 100644 extras/Hadrons/Modules/MContraction/MesonFieldGamma.cc delete mode 100644 extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am index abfcf9a8..7240be82 100644 --- a/extras/Hadrons/Makefile.am +++ b/extras/Hadrons/Makefile.am @@ -15,7 +15,6 @@ libHadrons_adir = $(pkgincludedir)/Hadrons nobase_libHadrons_a_HEADERS = \ $(modules_hpp) \ AllToAllVectors.hpp \ - AllToAllReduction.hpp \ Application.hpp \ EigenPack.hpp \ Environment.hpp \ diff --git a/extras/Hadrons/Modules/MContraction/A2AMeson.cc b/extras/Hadrons/Modules/MContraction/A2AMeson.cc deleted file mode 100644 index 5e5c122b..00000000 --- a/extras/Hadrons/Modules/MContraction/A2AMeson.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MContraction; - -template class Grid::Hadrons::MContraction::TA2AMeson; -template class Grid::Hadrons::MContraction::TA2AMeson; \ No newline at end of file diff --git a/extras/Hadrons/Modules/MContraction/A2AMeson.hpp b/extras/Hadrons/Modules/MContraction/A2AMeson.hpp deleted file mode 100644 index 2cfd6dcb..00000000 --- a/extras/Hadrons/Modules/MContraction/A2AMeson.hpp +++ /dev/null @@ -1,207 +0,0 @@ -#ifndef Hadrons_MContraction_A2AMeson_hpp_ -#define Hadrons_MContraction_A2AMeson_hpp_ - -#include -#include -#include -#include - -BEGIN_HADRONS_NAMESPACE - -/****************************************************************************** - * A2AMeson * - ******************************************************************************/ -BEGIN_MODULE_NAMESPACE(MContraction) - -typedef std::pair GammaPair; - -class A2AMesonPar : Serializable -{ - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(A2AMesonPar, - int, Nl, - int, N, - std::string, A2A1, - std::string, A2A2, - std::string, gammas, - std::string, output); -}; - -template -class TA2AMeson : public Module -{ - public: - FERM_TYPE_ALIASES(FImpl, ); - SOLVER_TYPE_ALIASES(FImpl, ); - - typedef A2AModesSchurDiagTwo A2ABase; - - class Result : Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Result, - Gamma::Algebra, gamma_snk, - Gamma::Algebra, gamma_src, - std::vector, corr); - }; - - public: - // constructor - TA2AMeson(const std::string name); - // destructor - virtual ~TA2AMeson(void){}; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - virtual void parseGammaString(std::vector &gammaList); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; - -MODULE_REGISTER(A2AMeson, ARG(TA2AMeson), MContraction); -MODULE_REGISTER(ZA2AMeson, ARG(TA2AMeson), MContraction); - -/****************************************************************************** -* TA2AMeson implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -template -TA2AMeson::TA2AMeson(const std::string name) - : Module(name) -{ -} - -// dependencies/products /////////////////////////////////////////////////////// -template -std::vector TA2AMeson::getInput(void) -{ - std::vector 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; -} - -template -std::vector TA2AMeson::getOutput(void) -{ - std::vector out = {}; - - return out; -} - -template -void TA2AMeson::parseGammaString(std::vector &gammaList) -{ - gammaList.clear(); - // Parse individual contractions from input string. - gammaList = strToVec(par().gammas); -} - -// setup /////////////////////////////////////////////////////////////////////// -template -void TA2AMeson::setup(void) -{ - int nt = env().getDim(Tp); - int N = par().N; - - int Ls_ = env().getObjectLs(par().A2A1 + "_class"); - - envTmp(std::vector, "w1", 1, N, FermionField(env().getGrid(1))); - envTmp(std::vector, "v1", 1, N, FermionField(env().getGrid(1))); - envTmpLat(FermionField, "tmpv_5d", Ls_); - envTmpLat(FermionField, "tmpw_5d", Ls_); - - envTmp(std::vector, "MF_x", 1, nt); - envTmp(std::vector, "MF_y", 1, nt); - envTmp(std::vector, "tmp", 1, nt); -} - -// execution /////////////////////////////////////////////////////////////////// -template -void TA2AMeson::execute(void) -{ - LOG(Message) << "Computing A2A meson contractions" << std::endl; - - Result result; - Gamma g5(Gamma::Algebra::Gamma5); - std::vector gammaList; - int nt = env().getDim(Tp); - - parseGammaString(gammaList); - - result.gamma_snk = gammaList[0].first; - result.gamma_src = gammaList[0].second; - result.corr.resize(nt); - - int Nl = par().Nl; - int N = par().N; - LOG(Message) << "N for A2A cont: " << N << std::endl; - - envGetTmp(std::vector, MF_x); - envGetTmp(std::vector, MF_y); - envGetTmp(std::vector, tmp); - - for (unsigned int t = 0; t < nt; ++t) - { - tmp[t] = TensorRemove(MF_x[t] * MF_y[t] * 0.0); - } - - Gamma gSnk(gammaList[0].first); - Gamma gSrc(gammaList[0].second); - - auto &a2a1_fn = envGet(A2ABase, par().A2A1 + "_class"); - - envGetTmp(std::vector, w1); - envGetTmp(std::vector, v1); - envGetTmp(FermionField, tmpv_5d); - envGetTmp(FermionField, tmpw_5d); - - LOG(Message) << "Finding v and w vectors for N = " << N << std::endl; - for (int i = 0; i < N; i++) - { - a2a1_fn.return_v(i, tmpv_5d, v1[i]); - a2a1_fn.return_w(i, tmpw_5d, w1[i]); - } - LOG(Message) << "Found v and w vectors for N = " << N << std::endl; - for (unsigned int i = 0; i < N; i++) - { - v1[i] = gSnk * v1[i]; - } - int ty; - for (unsigned int i = 0; i < N; i++) - { - for (unsigned int j = 0; j < N; j++) - { - mySliceInnerProductVector(MF_x, w1[i], v1[j], Tp); - mySliceInnerProductVector(MF_y, w1[j], v1[i], Tp); - for (unsigned int t = 0; t < nt; ++t) - { - for (unsigned int tx = 0; tx < nt; tx++) - { - ty = (tx + t) % nt; - tmp[t] += TensorRemove((MF_x[tx]) * (MF_y[ty])); - } - } - } - if (i % 10 == 0) - { - LOG(Message) << "MF for i = " << i << " of " << N << std::endl; - } - } - double NTinv = 1.0 / static_cast(nt); - for (unsigned int t = 0; t < nt; ++t) - { - result.corr[t] = NTinv * tmp[t]; - } - - saveResult(par().output, "meson", result); -} - -END_MODULE_NAMESPACE - -END_HADRONS_NAMESPACE - -#endif // Hadrons_MContraction_A2AMeson_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.cc b/extras/Hadrons/Modules/MContraction/MesonFieldGamma.cc deleted file mode 100644 index 9218d587..00000000 --- a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MContraction; - -template class Grid::Hadrons::MContraction::TMesonFieldGamma; -template class Grid::Hadrons::MContraction::TMesonFieldGamma; \ No newline at end of file diff --git a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp b/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp deleted file mode 100644 index 6128534c..00000000 --- a/extras/Hadrons/Modules/MContraction/MesonFieldGamma.hpp +++ /dev/null @@ -1,269 +0,0 @@ -#ifndef Hadrons_MContraction_MesonFieldGamma_hpp_ -#define Hadrons_MContraction_MesonFieldGamma_hpp_ - -#include -#include -#include -#include -#include -#include -#include - -BEGIN_HADRONS_NAMESPACE - -/****************************************************************************** - * MesonFieldGamma * - ******************************************************************************/ -BEGIN_MODULE_NAMESPACE(MContraction) - -class MesonFieldPar : Serializable -{ - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(MesonFieldPar, - int, Nl, - int, N, - int, Nblock, - std::string, A2A1, - std::string, A2A2, - std::string, gammas, - std::string, output); -}; - -template -class TMesonFieldGamma : public Module -{ - public: - FERM_TYPE_ALIASES(FImpl, ); - SOLVER_TYPE_ALIASES(FImpl, ); - - typedef A2AModesSchurDiagTwo A2ABase; - - class Result : Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Result, - Gamma::Algebra, gamma, - std::vector>>, MesonField); - }; - - public: - // constructor - TMesonFieldGamma(const std::string name); - // destructor - virtual ~TMesonFieldGamma(void){}; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - virtual void parseGammaString(std::vector &gammaList); - virtual void vectorOfWs(std::vector &w, int i, int Nblock, FermionField &tmpw_5d, std::vector &vec_w); - virtual void vectorOfVs(std::vector &v, int j, int Nblock, FermionField &tmpv_5d, std::vector &vec_v); - virtual void gammaMult(std::vector &v, Gamma gamma); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; - -MODULE_REGISTER(MesonFieldGamma, ARG(TMesonFieldGamma), MContraction); -MODULE_REGISTER(ZMesonFieldGamma, ARG(TMesonFieldGamma), MContraction); - -/****************************************************************************** -* TMesonFieldGamma implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -template -TMesonFieldGamma::TMesonFieldGamma(const std::string name) - : Module(name) -{ -} - -// dependencies/products /////////////////////////////////////////////////////// -template -std::vector TMesonFieldGamma::getInput(void) -{ - std::vector 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; -} - -template -std::vector TMesonFieldGamma::getOutput(void) -{ - std::vector out = {}; - - return out; -} - -template -void TMesonFieldGamma::parseGammaString(std::vector &gammaList) -{ - gammaList.clear(); - // Determine gamma matrices to insert at source/sink. - if (par().gammas.compare("all") == 0) - { - // Do all contractions. - for (unsigned int i = 1; i < Gamma::nGamma; i += 2) - { - gammaList.push_back(((Gamma::Algebra)i)); - } - } - else - { - // Parse individual contractions from input string. - gammaList = strToVec(par().gammas); - } -} - -template -void TMesonFieldGamma::vectorOfWs(std::vector &w, int i, int Nblock, FermionField &tmpw_5d, std::vector &vec_w) -{ - for (unsigned int ni = 0; ni < Nblock; ni++) - { - vec_w[ni] = w[i + ni]; - } -} - -template -void TMesonFieldGamma::vectorOfVs(std::vector &v, int j, int Nblock, FermionField &tmpv_5d, std::vector &vec_v) -{ - for (unsigned int nj = 0; nj < Nblock; nj++) - { - vec_v[nj] = v[j+nj]; - } -} - -template -void TMesonFieldGamma::gammaMult(std::vector &v, Gamma gamma) -{ - int Nblock = v.size(); - for (unsigned int nj = 0; nj < Nblock; nj++) - { - v[nj] = gamma * v[nj]; - } -} - -// setup /////////////////////////////////////////////////////////////////////// -template -void TMesonFieldGamma::setup(void) -{ - int nt = env().getDim(Tp); - int N = par().N; - int Nblock = par().Nblock; - - int Ls_ = env().getObjectLs(par().A2A1 + "_class"); - - envTmpLat(FermionField, "tmpv_5d", Ls_); - envTmpLat(FermionField, "tmpw_5d", Ls_); - - envTmp(std::vector, "w", 1, N, FermionField(env().getGrid(1))); - envTmp(std::vector, "v", 1, N, FermionField(env().getGrid(1))); - - envTmp(Eigen::MatrixXcd, "MF", 1, Eigen::MatrixXcd::Zero(nt, N * N)); - - envTmp(std::vector, "w_block", 1, Nblock, FermionField(env().getGrid(1))); - envTmp(std::vector, "v_block", 1, Nblock, FermionField(env().getGrid(1))); -} - -// execution /////////////////////////////////////////////////////////////////// -template -void TMesonFieldGamma::execute(void) -{ - LOG(Message) << "Computing A2A meson field for gamma = " << par().gammas << ", taking w from " << par().A2A1 << " and v from " << par().A2A2 << std::endl; - - int N = par().N; - int nt = env().getDim(Tp); - int Nblock = par().Nblock; - - std::vector result; - std::vector gammaResultList; - std::vector gammaList; - - parseGammaString(gammaResultList); - result.resize(gammaResultList.size()); - - Gamma g5(Gamma::Algebra::Gamma5); - gammaList.resize(gammaResultList.size(), g5); - - for (unsigned int i = 0; i < result.size(); ++i) - { - result[i].gamma = gammaResultList[i]; - result[i].MesonField.resize(N, std::vector>(N, std::vector(nt))); - - Gamma gamma(gammaResultList[i]); - gammaList[i] = gamma; - } - - auto &a2a1 = envGet(A2ABase, par().A2A1 + "_class"); - auto &a2a2 = envGet(A2ABase, par().A2A2 + "_class"); - - envGetTmp(FermionField, tmpv_5d); - envGetTmp(FermionField, tmpw_5d); - - envGetTmp(std::vector, v); - envGetTmp(std::vector, w); - LOG(Message) << "Finding v and w vectors for N = " << N << std::endl; - for (int i = 0; i < N; i++) - { - a2a2.return_v(i, tmpv_5d, v[i]); - a2a1.return_w(i, tmpw_5d, w[i]); - } - LOG(Message) << "Found v and w vectors for N = " << N << std::endl; - - std::vector> MesonField_ij; - LOG(Message) << "Before blocked MFs, Nblock = " << Nblock << std::endl; - envGetTmp(std::vector, v_block); - envGetTmp(std::vector, w_block); - MesonField_ij.resize(Nblock * Nblock, std::vector(nt)); - - envGetTmp(Eigen::MatrixXcd, MF); - - LOG(Message) << "Before blocked MFs, Nblock = " << Nblock << std::endl; - for (unsigned int i = 0; i < N; i += Nblock) - { - vectorOfWs(w, i, Nblock, tmpw_5d, w_block); - for (unsigned int j = 0; j < N; j += Nblock) - { - vectorOfVs(v, j, Nblock, tmpv_5d, v_block); - for (unsigned int k = 0; k < result.size(); k++) - { - gammaMult(v_block, gammaList[k]); - sliceInnerProductMesonField(MesonField_ij, w_block, v_block, Tp); - for (unsigned int nj = 0; nj < Nblock; nj++) - { - for (unsigned int ni = 0; ni < Nblock; ni++) - { - MF.col((i + ni) + (j + nj) * N) = Eigen::VectorXcd::Map(&MesonField_ij[nj * Nblock + ni][0], MesonField_ij[nj * Nblock + ni].size()); - } - } - } - } - if (i % 10 == 0) - { - LOG(Message) << "MF for i = " << i << " of " << N << std::endl; - } - } - LOG(Message) << "Before Global sum, Nblock = " << Nblock << std::endl; - v_block[0]._grid->GlobalSumVector(MF.data(), MF.size()); - LOG(Message) << "After Global sum, Nblock = " << Nblock << std::endl; - for (unsigned int i = 0; i < N; i++) - { - for (unsigned int j = 0; j < N; j++) - { - for (unsigned int k = 0; k < result.size(); k++) - { - for (unsigned int t = 0; t < nt; t++) - { - result[k].MesonField[i][j][t] = MF.col(i + N * j)[t]; - } - } - } - } - saveResult(par().output, "meson", result); -} - -END_MODULE_NAMESPACE - -END_HADRONS_NAMESPACE - -#endif // Hadrons_MContraction_MesonFieldGm_hpp_