mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-10 06:00:45 +01:00
working on DistilVectors, initialisation done and compiles
This commit is contained in:
ferben
parent
b74492a805
commit
b8c106f320
@ -4,8 +4,96 @@
|
||||
#include <Hadrons/Global.hpp>
|
||||
#include <Hadrons/Module.hpp>
|
||||
#include <Hadrons/ModuleFactory.hpp>
|
||||
#include <Hadrons/Solver.hpp>
|
||||
#include <Hadrons/EigenPack.hpp>
|
||||
#include <Hadrons/A2AVectors.hpp>
|
||||
#include <Hadrons/DilutedNoise.hpp>
|
||||
|
||||
BEGIN_HADRONS_NAMESPACE
|
||||
/*
|
||||
template<typename LatticeObj>
|
||||
class Perambulator : Serializable{
|
||||
// TODO: The next line makes friends across all combinations
|
||||
// (not much of a problem given all public anyway ...)
|
||||
// FYI, the bug here was that I forgot that the friend is templated
|
||||
template<typename T> friend std::ostream & operator<<(std::ostream &os, const Perambulator<T>& p);
|
||||
protected:
|
||||
public:
|
||||
GRID_SERIALIZABLE_CLASS_MEMBERS( Perambulator,
|
||||
std::string, ID, // Allows owner to specialise
|
||||
std::string, Provenance, // For info only
|
||||
std::vector<int>, dimensions,
|
||||
std::vector<LatticeObj>, perambulator,
|
||||
// Following items are redundant, but useful
|
||||
int, nd, // Number of dimensions
|
||||
size_t, NumElements); // Number of elements
|
||||
protected:
|
||||
// Constructor common code
|
||||
inline void ConstructCommon(const int * Dimensions) {
|
||||
assert(nd > 0);
|
||||
dimensions.resize(nd);
|
||||
NumElements = 1;
|
||||
for(int i = 0 ; i < nd ; i++) {
|
||||
assert(Dimensions[i] > 0);
|
||||
NumElements *= (size_t) Dimensions[i];
|
||||
dimensions[i] = Dimensions[i];
|
||||
}
|
||||
//const LatticeObj perambulatorDefault;
|
||||
perambulator.resize(NumElements);//,perambulatorDefault);
|
||||
}
|
||||
public:
|
||||
// Constructor with dimensions passed as std::vector<int>
|
||||
inline Perambulator(const std::vector<int> & Dimensions)
|
||||
: nd {(int) Dimensions.size()} {
|
||||
ConstructCommon( &Dimensions[0] ); }
|
||||
|
||||
// Constructor with dimensions passed as std::vector<int>
|
||||
inline Perambulator(const std::vector<int> & Dimensions, const std::string sID)
|
||||
: nd {(int) Dimensions.size()}, ID(sID) {
|
||||
ConstructCommon( &Dimensions[0] ); }
|
||||
|
||||
// Constructor with dimensions passed as std::vector<int>
|
||||
inline Perambulator(const std::vector<int> & Dimensions, const std::string sID, const std::string sProvenance)
|
||||
: nd {(int) Dimensions.size()}, ID(sID), Provenance(sProvenance) {
|
||||
ConstructCommon( &Dimensions[0] ); }
|
||||
|
||||
// Constructor with dimensions passed as individual parameters
|
||||
// FYI: The caller is free to ignore the names and use the indices however they see fit
|
||||
inline Perambulator(int NumNoise, int NumEvec=1, int NumTime=1, int NumSpin=1, int I_k=1, int I_t=1, int I_s=1) {
|
||||
int Dimensions[]={NumNoise,NumEvec,NumTime,NumSpin,I_k,I_t,I_s};
|
||||
nd = sizeof(Dimensions)/sizeof(Dimensions[0]);
|
||||
while( nd > 1 && Dimensions[nd-1] == 1 )
|
||||
nd--;
|
||||
ConstructCommon( Dimensions );
|
||||
}
|
||||
|
||||
inline LatticeObj & operator()(size_t count, const int * Coord) {
|
||||
assert( count == nd );
|
||||
assert( Coord );
|
||||
size_t idx = 0;
|
||||
// C memory order (???)
|
||||
for( int d = 0 ; d < nd ; d++ ) {
|
||||
assert( Coord[d] < dimensions[d] );
|
||||
idx *= (size_t) dimensions[d];
|
||||
idx += (size_t) Coord[d];
|
||||
}
|
||||
return perambulator[idx];
|
||||
}
|
||||
|
||||
inline LatticeObj & operator()(const std::vector<int> Coord) {
|
||||
return operator()(Coord.size(), &Coord[0]);
|
||||
}
|
||||
|
||||
inline LatticeObj & operator()(int idxNoise, int idxEvec=0, int idxTime=0, int idxSpin=0, int I_k=0, int I_t=0, int I_s=0) {
|
||||
int MyIndex[]={idxNoise,idxEvec,idxTime,idxSpin,I_k,I_t,I_s};
|
||||
int i = sizeof(MyIndex)/sizeof(MyIndex[0]);
|
||||
assert( i >= nd );
|
||||
while( i > nd )
|
||||
assert(MyIndex[--i] == 0);
|
||||
return operator()(i, MyIndex);
|
||||
}
|
||||
};
|
||||
*/
|
||||
|
||||
/******************************************************************************
|
||||
* Class to generate Distillation $\varrho$ and $\varphi$ vectors *
|
||||
@ -36,8 +124,8 @@ BEGIN_HADRONS_NAMESPACE
|
||||
/******************************************************************************
|
||||
* DistilVectorsFromPerambulator template implementation *
|
||||
******************************************************************************/
|
||||
/*
|
||||
|
||||
/*
|
||||
template <typename FImpl>
|
||||
DistilVectorsFromPerambulator<FImpl>::DistilVectorsFromPerambulator(FMat &action)
|
||||
: action_(action)
|
||||
@ -55,7 +143,21 @@ DistilVectorsFromPerambulator<FImpl>::DistilVectorsFromPerambulator(FMat &action
|
||||
template <typename FImpl>
|
||||
void DistilVectorsFromPerambulator<FImpl>::makeRho(FermionField &rhoOut, const FermionField &evec, const Complex &noises)
|
||||
{
|
||||
// INPUT:::::::::
|
||||
Grid::Hadrons::EigenPack<LatticeColourVector> eig4d;
|
||||
std::vector<std::vector<std::vector<SpinVector> > > noises;
|
||||
|
||||
// OUTPUT::::::::
|
||||
std::vector <LatticeSpinColourVector> sources_tsrc;
|
||||
{
|
||||
LatticeSpinColourVector vecModel(grid4d);
|
||||
sources_tsrc.resize(nnoise*LI*Ns*Nt_inv,vecModel);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// TEMPORARY:::::::::
|
||||
LatticeSpinColourVector tmp2(grid4d);
|
||||
LatticeSpinColourVector tmp3d(grid3d);
|
||||
LatticeColourVector tmp3d_nospin(grid3d);
|
||||
@ -102,6 +204,21 @@ template <typename FImpl>
|
||||
void DistilVectorsFromPerambulator<FImpl>::makePhi(FermionField &rhoOut, const FermionField &evec, const SpinVector &perambulator)
|
||||
{
|
||||
|
||||
// INPUT:::::::::
|
||||
Perambulator<SpinVector> perambulator;
|
||||
Grid::Hadrons::EigenPack<LatticeColourVector> eig4d;
|
||||
|
||||
// OUTPUT::::::::
|
||||
std::vector <LatticeSpinColourVector> sinks_tsrc;
|
||||
{
|
||||
LatticeSpinColourVector vecModel(grid4d);
|
||||
sinks_tsrc.resize(nnoise*LI*Ns*Nt_inv,vecModel);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// TEMPORARY:::::::::
|
||||
LatticeSpinColourVector tmp2(grid4d);
|
||||
LatticeSpinColourVector tmp3d(grid3d);
|
||||
LatticeColourVector tmp3d_nospin(grid3d);
|
||||
@ -134,8 +251,8 @@ void DistilVectorsFromPerambulator<FImpl>::makePhi(FermionField &rhoOut, const F
|
||||
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
@ -147,12 +264,17 @@ class DistilVectorsPar: Serializable
|
||||
{
|
||||
public:
|
||||
GRID_SERIALIZABLE_CLASS_MEMBERS(DistilVectorsPar,
|
||||
unsigned int, i);
|
||||
std::string, noise,
|
||||
std::string, perambulator,
|
||||
std::string, eigenPack,
|
||||
bool, multiFile);
|
||||
};
|
||||
|
||||
template <typename FImpl>
|
||||
class TDistilVectors: public Module<DistilVectorsPar>
|
||||
{
|
||||
public:
|
||||
FERM_TYPE_ALIASES(FImpl,);
|
||||
public:
|
||||
// constructor
|
||||
TDistilVectors(const std::string name);
|
||||
@ -183,14 +305,18 @@ template <typename FImpl>
|
||||
std::vector<std::string> TDistilVectors<FImpl>::getInput(void)
|
||||
{
|
||||
std::vector<std::string> in;
|
||||
|
||||
|
||||
in.push_back(par().noise);
|
||||
in.push_back(par().perambulator);
|
||||
in.push_back(par().eigenPack);
|
||||
|
||||
return in;
|
||||
}
|
||||
|
||||
template <typename FImpl>
|
||||
std::vector<std::string> TDistilVectors<FImpl>::getOutput(void)
|
||||
{
|
||||
std::vector<std::string> out = {getName()};
|
||||
std::vector<std::string> out = {getName() + "_rho", getName() + "_phi"};
|
||||
|
||||
return out;
|
||||
}
|
||||
@ -199,14 +325,37 @@ std::vector<std::string> TDistilVectors<FImpl>::getOutput(void)
|
||||
template <typename FImpl>
|
||||
void TDistilVectors<FImpl>::setup(void)
|
||||
{
|
||||
|
||||
auto &noise = envGet(std::vector<std::vector<std::vector<SpinVector>>>, par().noise);
|
||||
|
||||
envCreate(std::vector<FermionField>, getName() + "_rho", 1,
|
||||
noise.size(), envGetGrid(FermionField));
|
||||
envCreate(std::vector<FermionField>, getName() + "_phi", 1,
|
||||
noise.size(), envGetGrid(FermionField));
|
||||
|
||||
|
||||
envTmp(LatticeSpinColourVector, "tmp2",1,LatticeSpinColourVector(env().getGrid()));
|
||||
envTmp(LatticeColourVector, "tmp_nospin",1,LatticeColourVector(env().getGrid()));
|
||||
//GridCartesian * const grid3d;
|
||||
//ExtractSlice(grid3d,env().getGrid(),0,3);
|
||||
//envTmp(LatticeSpinColourVector, "tmp3d",1,LatticeSpinColourVector(grid3d));
|
||||
/*LatticeSpinColourVector tmp3d(grid3d);
|
||||
LatticeColourVector tmp3d_nospin(grid3d);
|
||||
LatticeColourVector evec3d(grid3d);
|
||||
*/
|
||||
}
|
||||
|
||||
// execution ///////////////////////////////////////////////////////////////////
|
||||
template <typename FImpl>
|
||||
void TDistilVectors<FImpl>::execute(void)
|
||||
{
|
||||
|
||||
|
||||
auto &noise = envGet(std::vector<std::vector<std::vector<SpinVector>>>, par().noise);
|
||||
auto &perambulator = envGet(std::vector<SpinVector>, par().perambulator);
|
||||
//auto &perambulator = envGet(Perambulator<SpinVector>, par().noise);
|
||||
auto &epack = envGet(Grid::Hadrons::EigenPack<LatticeColourVector>, par().eigenPack);
|
||||
auto &rho = envGet(std::vector<FermionField>, getName() + "_rho");
|
||||
auto &phi = envGet(std::vector<FermionField>, getName() + "_phi");
|
||||
|
||||
}
|
||||
|
||||
END_MODULE_NAMESPACE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user