portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Hadrons: multi-file support for eigenpacks

Browse Source
This commit is contained in:
Antonin Portelli 2018-05-07 17:25:36 +01:00
parent 661381e881
commit 3252059daf
4 changed files with 176 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
extras/Hadrons/EigenPack.hpp
View File

@ -74,42 +74,47 @@ public:
evec.resize(size, grid); evec.resize(size, grid);
} }
virtual void read(const std::string fileStem, const int traj = -1) virtual void read(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecFilename, evalFilename; if (multiFile)
{
makeFilenames(evecFilename, evalFilename, fileStem, traj); for(int k = 0; k < evec.size(); ++k)
XmlReader xmlReader(evalFilename); {
LOG(Message) << "Reading " << eval.size() << " eigenvalues from '" basicReadSingle(evec[k], eval[k], evecFilename(fileStem, k, traj), k);
<< evalFilename << "'" << std::endl; }
Grid::read(xmlReader, "evals", eval); }
basicRead(evec, evecFilename, evec.size()); else
{
basicRead(evec, eval, evecFilename(fileStem, -1, traj), evec.size());
}
} }
virtual void write(const std::string fileStem, const int traj = -1) virtual void write(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecFilename, evalFilename; if (multiFile)
{
makeFilenames(evecFilename, evalFilename, fileStem, traj); for(int k = 0; k < evec.size(); ++k)
XmlWriter xmlWriter(evalFilename); {
LOG(Message) << "Writing " << eval.size() << " eigenvalues to '" basicWriteSingle(evecFilename(fileStem, k, traj), evec[k], eval[k], k);
<< evalFilename << "'" << std::endl; }
Grid::write(xmlWriter, "evals", eval); }
basicWrite(evecFilename, evec, evec.size()); else
{
basicWrite(evecFilename(fileStem, -1, traj), evec, eval, evec.size());
}
} }
protected: protected:
void makeFilenames(std::string &evecFilename, std::string &evalFilename, std::string evecFilename(const std::string stem, const int vec, const int traj)
const std::string stem, const int traj = -1)
{ {
std::string t = (traj < 0) ? "" : ("." + std::to_string(traj)); std::string t = (traj < 0) ? "" : ("." + std::to_string(traj));
std::string v = (traj < 0) ? "" : (".v" + std::to_string(vec));
evecFilename = stem + "_evec" + t + ".bin"; return stem + "_evec" + t + v + ".bin";
evalFilename = stem + "_eval" + t + ".xml";
} }
template <typename T> template <typename T>
void basicRead(std::vector<T> &evec, const std::string filename, void basicRead(std::vector<T> &evec, std::vector<double> &eval,
const unsigned int size) const std::string filename, const unsigned int size)
{ {
ScidacReader binReader; ScidacReader binReader;
@ -124,16 +129,38 @@ protected:
if (vecRecord.index != k) if (vecRecord.index != k)
{ {
HADRONS_ERROR(Io, "Eigenvector " + std::to_string(k) + " has a" HADRONS_ERROR(Io, "Eigenvector " + std::to_string(k) + " has a"
+ " wrong index (expected " + std::to_string(vecRecord.index) + " wrong index (expected " + std::to_string(vecRecord.index)
+ ") in file '" + filename + "'"); + ") in file '" + filename + "'");
} }
eval[k] = vecRecord.eval;
} }
binReader.close(); binReader.close();
} }
template <typename T>
void basicReadSingle(T &evec, double &eval, const std::string filename,
const unsigned int index)
{
ScidacReader binReader;
VecRecord vecRecord;
binReader.open(filename);
binReader.skipPastObjectRecord(SCIDAC_FILE_XML);
LOG(Message) << "Reading eigenvector " << index << std::endl;
binReader.readScidacFieldRecord(evec, vecRecord);
if (vecRecord.index != index)
{
HADRONS_ERROR(Io, "Eigenvector " + std::to_string(index) + " has a"
+ " wrong index (expected " + std::to_string(vecRecord.index)
+ ") in file '" + filename + "'");
}
eval = vecRecord.eval;
binReader.close();
}
template <typename T> template <typename T>
void basicWrite(const std::string filename, std::vector<T> &evec, void basicWrite(const std::string filename, std::vector<T> &evec,
const unsigned int size) const std::vector<double> &eval, const unsigned int size)
{ {
ScidacWriter binWriter(evec[0]._grid->IsBoss()); ScidacWriter binWriter(evec[0]._grid->IsBoss());
XmlWriter xmlWriter("", "eigenPackPar"); XmlWriter xmlWriter("", "eigenPackPar");
@ -153,6 +180,25 @@ protected:
} }
binWriter.close(); binWriter.close();
} }
template <typename T>
void basicWriteSingle(const std::string filename, T &evec,
const double eval, const unsigned int index)
{
ScidacWriter binWriter(evec._grid->IsBoss());
XmlWriter xmlWriter("", "eigenPackPar");
VecRecord vecRecord;
xmlWriter.pushXmlString(record.operatorXml);
xmlWriter.pushXmlString(record.solverXml);
binWriter.open(filename);
binWriter.writeLimeObject(1, 1, xmlWriter, "parameters", SCIDAC_FILE_XML);
vecRecord.index = index;
vecRecord.eval = eval;
LOG(Message) << "Writing eigenvector " << index << std::endl;
binWriter.writeScidacFieldRecord(evec, vecRecord);
binWriter.close();
}
}; };
template <typename FineF, typename CoarseF> template <typename FineF, typename CoarseF>
@ -181,77 +227,121 @@ public:
evecCoarse.resize(sizeCoarse, gridCoarse); evecCoarse.resize(sizeCoarse, gridCoarse);
} }
void readFine(const std::string fileStem, const int traj = -1) void readFine(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecFineFilename, evalFineFilename; // std::string evecFineFilename, evalFineFilename;
std::string evecCoarseFilename, evalCoarseFilename; // std::string evecCoarseFilename, evalCoarseFilename;
this->makeFilenames(evecFineFilename, evalFineFilename, // this->makeFilenames(evecFineFilename, evalFineFilename,
fileStem + "_fine", traj); // fileStem + "_fine", traj);
XmlReader xmlFineReader(evalFineFilename); // XmlReader xmlFineReader(evalFineFilename);
LOG(Message) << "Reading " << this->eval.size() << " fine eigenvalues from '" // LOG(Message) << "Reading " << this->eval.size() << " fine eigenvalues from '"
<< evalFineFilename << "'" << std::endl; // << evalFineFilename << "'" << std::endl;
Grid::read(xmlFineReader, "evals", this->eval); // Grid::read(xmlFineReader, "evals", this->eval);
LOG(Message) << "Reading " << this->evec.size() << " fine eigenvectors from '" // LOG(Message) << "Reading " << this->evec.size() << " fine eigenvectors from '"
<< evecFineFilename << "'" << std::endl; // << evecFineFilename << "'" << std::endl;
this->basicRead(this->evec, evecFineFilename, this->evec.size()); // this->basicRead(this->evec, evecFineFilename, this->evec.size());
if (multiFile)
{
for(int k = 0; k < this->evec.size(); ++k)
{
this->basicReadSingle(this->evec[k], this->eval[k], this->evecFilename(fileStem + "_fine", k, traj), k);
}
}
else
{
this->basicRead(this->evec, this->eval, this->evecFilename(fileStem + "_fine", -1, traj), this->evec.size());
}
} }
void readCoarse(const std::string fileStem, const int traj = -1) void readCoarse(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecCoarseFilename, evalCoarseFilename; // std::string evecCoarseFilename, evalCoarseFilename;
this->makeFilenames(evecCoarseFilename, evalCoarseFilename, // this->makeFilenames(evecCoarseFilename, evalCoarseFilename,
fileStem + "_coarse", traj); // fileStem + "_coarse", traj);
XmlReader xmlCoarseReader(evalCoarseFilename); // XmlReader xmlCoarseReader(evalCoarseFilename);
LOG(Message) << "Reading " << evalCoarse.size() << " coarse eigenvalues from '" // LOG(Message) << "Reading " << evalCoarse.size() << " coarse eigenvalues from '"
<< evalCoarseFilename << "'" << std::endl; // << evalCoarseFilename << "'" << std::endl;
Grid::read(xmlCoarseReader, "evals", evalCoarse); // Grid::read(xmlCoarseReader, "evals", evalCoarse);
LOG(Message) << "Reading " << evecCoarse.size() << " coarse eigenvectors from '" // LOG(Message) << "Reading " << evecCoarse.size() << " coarse eigenvectors from '"
<< evecCoarseFilename << "'" << std::endl; // << evecCoarseFilename << "'" << std::endl;
this->basicRead(evecCoarse, evecCoarseFilename, evecCoarse.size()); // this->basicRead(evecCoarse, evecCoarseFilename, evecCoarse.size());
if (multiFile)
{
for(int k = 0; k < evecCoarse.size(); ++k)
{
this->basicReadSingle(evecCoarse[k], evalCoarse[k], this->evecFilename(fileStem + "_coarse", k, traj), k);
}
}
else
{
this->basicRead(evecCoarse, evalCoarse, this->evecFilename(fileStem + "_coarse", -1, traj), evecCoarse.size());
}
} }
virtual void read(const std::string fileStem, const int traj = -1) virtual void read(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
readFine(fileStem, traj); readFine(fileStem, multiFile, traj);
readCoarse(fileStem, traj); readCoarse(fileStem, multiFile, traj);
} }
void writeFine(const std::string fileStem, const int traj = -1) void writeFine(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecFineFilename, evalFineFilename; // std::string evecFineFilename, evalFineFilename;
this->makeFilenames(evecFineFilename, evalFineFilename, // this->makeFilenames(evecFineFilename, evalFineFilename,
fileStem + "_fine", traj); // fileStem + "_fine", traj);
XmlWriter xmlFineWriter(evalFineFilename); // XmlWriter xmlFineWriter(evalFineFilename);
LOG(Message) << "Writing " << this->eval.size() << " fine eigenvalues to '" // LOG(Message) << "Writing " << this->eval.size() << " fine eigenvalues to '"
<< evalFineFilename << "'" << std::endl; // << evalFineFilename << "'" << std::endl;
Grid::write(xmlFineWriter, "evals", this->eval); // Grid::write(xmlFineWriter, "evals", this->eval);
LOG(Message) << "Writing " << this->evec.size() << " fine eigenvectors to '" // LOG(Message) << "Writing " << this->evec.size() << " fine eigenvectors to '"
<< evecFineFilename << "'" << std::endl; // << evecFineFilename << "'" << std::endl;
this->basicWrite(evecFineFilename, this->evec, this->evec.size()); // this->basicWrite(evecFineFilename, this->evec, this->evec.size());
if (multiFile)
{
for(int k = 0; k < this->evec.size(); ++k)
{
this->basicWriteSingle(this->evecFilename(fileStem + "_fine", k, traj), this->evec[k], this->eval[k], k);
}
}
else
{
this->basicWrite(this->evecFilename(fileStem + "_fine", -1, traj), this->evec, this->eval, this->evec.size());
}
} }
void writeCoarse(const std::string fileStem, const int traj = -1) void writeCoarse(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
std::string evecCoarseFilename, evalCoarseFilename; // std::string evecCoarseFilename, evalCoarseFilename;
this->makeFilenames(evecCoarseFilename, evalCoarseFilename, // this->makeFilenames(evecCoarseFilename, evalCoarseFilename,
fileStem + "_coarse", traj); // fileStem + "_coarse", traj);
XmlWriter xmlCoarseWriter(evalCoarseFilename); // XmlWriter xmlCoarseWriter(evalCoarseFilename);
LOG(Message) << "Writing " << evalCoarse.size() << " coarse eigenvalues to '" // LOG(Message) << "Writing " << evalCoarse.size() << " coarse eigenvalues to '"
<< evalCoarseFilename << "'" << std::endl; // << evalCoarseFilename << "'" << std::endl;
Grid::write(xmlCoarseWriter, "evals", evalCoarse); // Grid::write(xmlCoarseWriter, "evals", evalCoarse);
LOG(Message) << "Writing " << evecCoarse.size() << " coarse eigenvectors to '" // LOG(Message) << "Writing " << evecCoarse.size() << " coarse eigenvectors to '"
<< evecCoarseFilename << "'" << std::endl; // << evecCoarseFilename << "'" << std::endl;
this->basicWrite(evecCoarseFilename, evecCoarse, evecCoarse.size()); // this->basicWrite(evecCoarseFilename, evecCoarse, evecCoarse.size());
if (multiFile)
{
for(int k = 0; k < evecCoarse.size(); ++k)
{
this->basicWriteSingle(this->evecFilename(fileStem + "_coarse", k, traj), evecCoarse[k], evalCoarse[k], k);
}
}
else
{
this->basicWrite(this->evecFilename(fileStem + "_coarse", -1, traj), evecCoarse, evalCoarse, evecCoarse.size());
}
} }
virtual void write(const std::string fileStem, const int traj = -1) virtual void write(const std::string fileStem, const bool multiFile, const int traj = -1)
{ {
writeFine(fileStem, traj); writeFine(fileStem, multiFile, traj);
writeCoarse(fileStem, traj); writeCoarse(fileStem, multiFile, traj);
} }
}; };

3
extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp
View File

@ -45,6 +45,7 @@ class LoadCoarseEigenPackPar: Serializable
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(LoadCoarseEigenPackPar, GRID_SERIALIZABLE_CLASS_MEMBERS(LoadCoarseEigenPackPar,
std::string, filestem, std::string, filestem,
bool, multiFile,
unsigned int, sizeFine, unsigned int, sizeFine,
unsigned int, sizeCoarse, unsigned int, sizeCoarse,
unsigned int, Ls, unsigned int, Ls,
@ -120,7 +121,7 @@ void TLoadCoarseEigenPack<Pack>::execute(void)
auto &epack = envGetDerived(BasePack, Pack, getName()); auto &epack = envGetDerived(BasePack, Pack, getName());
Lattice<SiteComplex> dummy(cg); Lattice<SiteComplex> dummy(cg);
epack.read(par().filestem, vm().getTrajectory()); epack.read(par().filestem, par().multiFile, vm().getTrajectory());
LOG(Message) << "Block Gramm-Schmidt pass 1"<< std::endl; LOG(Message) << "Block Gramm-Schmidt pass 1"<< std::endl;
blockOrthogonalise(dummy, epack.evec); blockOrthogonalise(dummy, epack.evec);
LOG(Message) << "Block Gramm-Schmidt pass 2"<< std::endl; LOG(Message) << "Block Gramm-Schmidt pass 2"<< std::endl;

3
extras/Hadrons/Modules/MIO/LoadEigenPack.hpp
View File

@ -45,6 +45,7 @@ class LoadEigenPackPar: Serializable
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(LoadEigenPackPar, GRID_SERIALIZABLE_CLASS_MEMBERS(LoadEigenPackPar,
std::string, filestem, std::string, filestem,
bool, multiFile,
unsigned int, size, unsigned int, size,
unsigned int, Ls); unsigned int, Ls);
}; };
@ -111,7 +112,7 @@ void TLoadEigenPack<Pack>::execute(void)
{ {
auto &epack = envGetDerived(BasePack, Pack, getName()); auto &epack = envGetDerived(BasePack, Pack, getName());
epack.read(par().filestem, vm().getTrajectory()); epack.read(par().filestem, par().multiFile, vm().getTrajectory());
epack.eval.resize(par().size); epack.eval.resize(par().size);
} }

7
extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp
View File

@ -51,7 +51,8 @@ public:
ChebyParams, smoother, ChebyParams, smoother,
RealD, coarseRelaxTol, RealD, coarseRelaxTol,
std::string, blockSize, std::string, blockSize,
std::string, output); std::string, output,
bool, multiFile);
}; };
template <typename FImpl, int nBasis> template <typename FImpl, int nBasis>
@ -156,7 +157,7 @@ void TLocalCoherenceLanczos<FImpl, nBasis>::execute(void)
solver.testFine(finePar.resid*100.0); solver.testFine(finePar.resid*100.0);
if (!par().output.empty()) if (!par().output.empty())
{ {
epack.writeFine(par().output, vm().getTrajectory()); epack.writeFine(par().output, par().multiFile, vm().getTrajectory());
} }
if (par().doCoarse) if (par().doCoarse)
{ {
@ -173,7 +174,7 @@ void TLocalCoherenceLanczos<FImpl, nBasis>::execute(void)
par().coarseRelaxTol); par().coarseRelaxTol);
if (!par().output.empty()) if (!par().output.empty())
{ {
epack.writeCoarse(par().output, vm().getTrajectory()); epack.writeCoarse(par().output, par().multiFile, vm().getTrajectory());
} }
} }
} }