added module to load perambulators from disk

2025-11-04 05:54:32 +00:00 · 2019-03-22 13:50:47 +00:00
parent fbf286b0e3
commit 4fc045b563
4 changed files with 312 additions and 186 deletions
--- a/Hadrons/Modules.hpp
+++ b/Hadrons/Modules.hpp
@@ -1,76 +1,77 @@
-#include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
-#include <Hadrons/Modules/MContraction/Baryon.hpp>
-#include <Hadrons/Modules/MContraction/A2AAslashField.hpp>
-#include <Hadrons/Modules/MContraction/A2ALoop.hpp>
-#include <Hadrons/Modules/MContraction/A2AMesonField.hpp>
-#include <Hadrons/Modules/MContraction/Meson.hpp>
-#include <Hadrons/Modules/MContraction/DiscLoop.hpp>
-#include <Hadrons/Modules/MContraction/Gamma3pt.hpp>
-#include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
-#include <Hadrons/Modules/MFermion/FreeProp.hpp>
-#include <Hadrons/Modules/MFermion/GaugeProp.hpp>
-#include <Hadrons/Modules/MSource/SeqGamma.hpp>
-#include <Hadrons/Modules/MSource/Point.hpp>
-#include <Hadrons/Modules/MSource/Wall.hpp>
-#include <Hadrons/Modules/MSource/Z2.hpp>
-#include <Hadrons/Modules/MSource/SeqConserved.hpp>
-#include <Hadrons/Modules/MSource/Momentum.hpp>
-#include <Hadrons/Modules/MSink/Smear.hpp>
-#include <Hadrons/Modules/MSink/Point.hpp>
+#include <Hadrons/Modules/MUtilities/RandomVectors.hpp>
+#include <Hadrons/Modules/MUtilities/PrecisionCast.hpp>
 #include <Hadrons/Modules/MSolver/MixedPrecisionRBPrecCG.hpp>
-#include <Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp>
 #include <Hadrons/Modules/MSolver/A2AAslashVectors.hpp>
 #include <Hadrons/Modules/MSolver/Guesser.hpp>
+#include <Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp>
 #include <Hadrons/Modules/MSolver/RBPrecCG.hpp>
 #include <Hadrons/Modules/MSolver/A2AVectors.hpp>
-#include <Hadrons/Modules/MGauge/UnitEm.hpp>
-#include <Hadrons/Modules/MGauge/StoutSmearing.hpp>
-#include <Hadrons/Modules/MGauge/Unit.hpp>
-#include <Hadrons/Modules/MGauge/Random.hpp>
-#include <Hadrons/Modules/MGauge/GaugeFix.hpp>
-#include <Hadrons/Modules/MGauge/FundtoHirep.hpp>
-#include <Hadrons/Modules/MGauge/StochEm.hpp>
-#include <Hadrons/Modules/MGauge/Electrify.hpp>
-#include <Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp>
-#include <Hadrons/Modules/MNoise/FullVolumeSpinColorDiagonal.hpp>
-#include <Hadrons/Modules/MUtilities/PrecisionCast.hpp>
-#include <Hadrons/Modules/MUtilities/RandomVectors.hpp>
-#include <Hadrons/Modules/MScalar/FreeProp.hpp>
-#include <Hadrons/Modules/MScalar/Scalar.hpp>
-#include <Hadrons/Modules/MScalar/ChargedProp.hpp>
-#include <Hadrons/Modules/MDistil/Distil.hpp>
 #include <Hadrons/Modules/MDistil/LapEvec.hpp>
-#include <Hadrons/Modules/MDistil/DistilVectors.hpp>
-#include <Hadrons/Modules/MDistil/DistilSink.hpp>
-#include <Hadrons/Modules/MDistil/BC2.hpp>
-#include <Hadrons/Modules/MDistil/PerambLight.hpp>
-#include <Hadrons/Modules/MDistil/PerambFromSolve.hpp>
-#include <Hadrons/Modules/MDistil/BContraction.hpp>
-#include <Hadrons/Modules/MDistil/Baryon2pt.hpp>
+#include <Hadrons/Modules/MDistil/Distil.hpp>
 #include <Hadrons/Modules/MDistil/g5_multiply.hpp>
-#include <Hadrons/Modules/MNPR/Bilinear.hpp>
-#include <Hadrons/Modules/MNPR/Amputate.hpp>
-#include <Hadrons/Modules/MNPR/FourQuark.hpp>
-#include <Hadrons/Modules/MAction/DWF.hpp>
-#include <Hadrons/Modules/MAction/MobiusDWF.hpp>
+#include <Hadrons/Modules/MDistil/DistilVectors.hpp>
+#include <Hadrons/Modules/MDistil/Baryon2pt.hpp>
+#include <Hadrons/Modules/MDistil/BContraction.hpp>
+#include <Hadrons/Modules/MDistil/PerambLight.hpp>
+#include <Hadrons/Modules/MDistil/DistilSink.hpp>
+#include <Hadrons/Modules/MDistil/PerambFromSolve.hpp>
+#include <Hadrons/Modules/MDistil/BC2.hpp>
+#include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
+#include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
+#include <Hadrons/Modules/MContraction/DiscLoop.hpp>
+#include <Hadrons/Modules/MContraction/Baryon.hpp>
+#include <Hadrons/Modules/MContraction/Gamma3pt.hpp>
+#include <Hadrons/Modules/MContraction/A2ALoop.hpp>
+#include <Hadrons/Modules/MContraction/A2AMesonField.hpp>
+#include <Hadrons/Modules/MContraction/A2AAslashField.hpp>
+#include <Hadrons/Modules/MContraction/Meson.hpp>
 #include <Hadrons/Modules/MAction/Wilson.hpp>
 #include <Hadrons/Modules/MAction/WilsonClover.hpp>
-#include <Hadrons/Modules/MAction/ZMobiusDWF.hpp>
+#include <Hadrons/Modules/MAction/DWF.hpp>
 #include <Hadrons/Modules/MAction/ScaledDWF.hpp>
-#include <Hadrons/Modules/MScalarSUN/StochFreeField.hpp>
-#include <Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp>
-#include <Hadrons/Modules/MScalarSUN/Div.hpp>
-#include <Hadrons/Modules/MScalarSUN/TrMag.hpp>
-#include <Hadrons/Modules/MScalarSUN/EMT.hpp>
-#include <Hadrons/Modules/MScalarSUN/TwoPoint.hpp>
-#include <Hadrons/Modules/MScalarSUN/TrPhi.hpp>
-#include <Hadrons/Modules/MScalarSUN/Utils.hpp>
-#include <Hadrons/Modules/MScalarSUN/TransProj.hpp>
-#include <Hadrons/Modules/MScalarSUN/Grad.hpp>
-#include <Hadrons/Modules/MScalarSUN/TrKinetic.hpp>
-#include <Hadrons/Modules/MIO/LoadEigenPack.hpp>
+#include <Hadrons/Modules/MAction/ZMobiusDWF.hpp>
+#include <Hadrons/Modules/MAction/MobiusDWF.hpp>
+#include <Hadrons/Modules/MGauge/Random.hpp>
+#include <Hadrons/Modules/MGauge/Unit.hpp>
+#include <Hadrons/Modules/MGauge/UnitEm.hpp>
+#include <Hadrons/Modules/MGauge/StoutSmearing.hpp>
+#include <Hadrons/Modules/MGauge/StochEm.hpp>
+#include <Hadrons/Modules/MGauge/Electrify.hpp>
+#include <Hadrons/Modules/MGauge/FundtoHirep.hpp>
+#include <Hadrons/Modules/MGauge/GaugeFix.hpp>
+#include <Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp>
+#include <Hadrons/Modules/MNoise/FullVolumeSpinColorDiagonal.hpp>
+#include <Hadrons/Modules/MIO/LoadBinary.hpp>
+#include <Hadrons/Modules/MIO/LoadCosmHol.hpp>
 #include <Hadrons/Modules/MIO/LoadNersc.hpp>
 #include <Hadrons/Modules/MIO/LoadA2AVectors.hpp>
-#include <Hadrons/Modules/MIO/LoadCosmHol.hpp>
 #include <Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp>
-#include <Hadrons/Modules/MIO/LoadBinary.hpp>
+#include <Hadrons/Modules/MIO/LoadEigenPack.hpp>
+#include <Hadrons/Modules/MIO/LoadPerambulator.hpp>
+#include <Hadrons/Modules/MNPR/Amputate.hpp>
+#include <Hadrons/Modules/MNPR/FourQuark.hpp>
+#include <Hadrons/Modules/MNPR/Bilinear.hpp>
+#include <Hadrons/Modules/MScalarSUN/TransProj.hpp>
+#include <Hadrons/Modules/MScalarSUN/TwoPoint.hpp>
+#include <Hadrons/Modules/MScalarSUN/TrMag.hpp>
+#include <Hadrons/Modules/MScalarSUN/TrKinetic.hpp>
+#include <Hadrons/Modules/MScalarSUN/EMT.hpp>
+#include <Hadrons/Modules/MScalarSUN/Grad.hpp>
+#include <Hadrons/Modules/MScalarSUN/Utils.hpp>
+#include <Hadrons/Modules/MScalarSUN/Div.hpp>
+#include <Hadrons/Modules/MScalarSUN/TrPhi.hpp>
+#include <Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp>
+#include <Hadrons/Modules/MScalarSUN/StochFreeField.hpp>
+#include <Hadrons/Modules/MSink/Smear.hpp>
+#include <Hadrons/Modules/MSink/Point.hpp>
+#include <Hadrons/Modules/MFermion/GaugeProp.hpp>
+#include <Hadrons/Modules/MFermion/FreeProp.hpp>
+#include <Hadrons/Modules/MScalar/Scalar.hpp>
+#include <Hadrons/Modules/MScalar/FreeProp.hpp>
+#include <Hadrons/Modules/MScalar/ChargedProp.hpp>
+#include <Hadrons/Modules/MSource/Momentum.hpp>
+#include <Hadrons/Modules/MSource/SeqGamma.hpp>
+#include <Hadrons/Modules/MSource/Point.hpp>
+#include <Hadrons/Modules/MSource/Z2.hpp>
+#include <Hadrons/Modules/MSource/Wall.hpp>
+#include <Hadrons/Modules/MSource/SeqConserved.hpp>
--- a/Hadrons/Modules/MIO/LoadPerambulator.cc
+++ b/Hadrons/Modules/MIO/LoadPerambulator.cc
@@ -0,0 +1,7 @@
+#include <Hadrons/Modules/MIO/LoadPerambulator.hpp>
+
+using namespace Grid;
+using namespace Hadrons;
+using namespace MIO;
+
+template class Grid::Hadrons::MIO::TLoadPerambulator<FIMPL>;
--- a/Hadrons/Modules/MIO/LoadPerambulator.hpp
+++ b/Hadrons/Modules/MIO/LoadPerambulator.hpp
@@ -0,0 +1,116 @@
+#ifndef Hadrons_MIO_LoadPerambulator_hpp_
+#define Hadrons_MIO_LoadPerambulator_hpp_
+
+#include <Hadrons/Global.hpp>
+#include <Hadrons/Module.hpp>
+#include <Hadrons/ModuleFactory.hpp>
+#include <Hadrons/EigenPack.hpp>
+#include <Hadrons/Modules/MDistil/Distil.hpp>
+
+BEGIN_HADRONS_NAMESPACE
+
+/******************************************************************************
+ *                         LoadPerambulator                                 *
+ ******************************************************************************/
+BEGIN_MODULE_NAMESPACE(MIO)
+
+class LoadPerambulatorPar: Serializable
+{
+public:
+    GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPerambulatorPar,
+                                        std::string, PerambFileName, //stem!!!
+	                                std::string, UniqueIdentifier,
+	                                int, nvec,
+	                                MDistil::DistilParameters, Distil);
+};
+
+template <typename FImpl>
+class TLoadPerambulator: public Module<LoadPerambulatorPar>
+{
+public:
+    // constructor
+    TLoadPerambulator(const std::string name);
+    // destructor
+    virtual ~TLoadPerambulator(void) {};
+    // dependency relation
+    virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getOutput(void);
+    // setup
+    virtual void setup(void);
+    // execution
+    virtual void execute(void);
+};
+
+MODULE_REGISTER_TMP(LoadPerambulator, TLoadPerambulator<FIMPL>, MIO);
+
+/******************************************************************************
+ *                 TLoadPerambulator implementation                             *
+ ******************************************************************************/
+// constructor /////////////////////////////////////////////////////////////////
+template <typename FImpl>
+TLoadPerambulator<FImpl>::TLoadPerambulator(const std::string name)
+: Module<LoadPerambulatorPar>(name)
+{}
+
+// dependencies/products ///////////////////////////////////////////////////////
+template <typename FImpl>
+std::vector<std::string> TLoadPerambulator<FImpl>::getInput(void)
+{
+    std::vector<std::string> in;
+    
+    return in;
+}
+
+template <typename FImpl>
+std::vector<std::string> TLoadPerambulator<FImpl>::getOutput(void)
+{
+    std::vector<std::string> out = {getName()};
+    
+    return out;
+}
+
+// setup ///////////////////////////////////////////////////////////////////////
+template <typename FImpl>
+void TLoadPerambulator<FImpl>::setup(void)
+{
+    const int nvec{par().nvec};
+    const MDistil::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<std::string,6> sIndexNames{"Nt", "nvec", "LI", "nnoise", "Nt_inv", "SI"};
+
+    envCreate(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>, getName() + "_perambulator_light", 1,
+		              sIndexNames,Distil.Nt,nvec,Distil.LI,Distil.nnoise,Distil.Nt_inv,Distil.SI);
+
+}
+
+// execution ///////////////////////////////////////////////////////////////////
+template <typename FImpl>
+void TLoadPerambulator<FImpl>::execute(void)
+{
+    auto        &perambulator = envGet(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>,
+		                                           getName() + "_perambulator_light");
+
+    
+	const std::string &PerambFileName{par().PerambFileName};
+    if( PerambFileName.length() ){
+      bool bExists = false;
+      {
+        std::ifstream f(PerambFileName, std::ios::binary);
+        if( f.is_open() )
+	bExists = true;
+      }
+      if( bExists ) {
+        perambulator.ReadBinary(PerambFileName);
+        return;
+      }
+    }                                                                                                                
+}
+
+END_MODULE_NAMESPACE
+
+END_HADRONS_NAMESPACE
+
+#endif // Hadrons_MIO_LoadPerambulator_hpp_
--- a/Hadrons/modules.inc
+++ b/Hadrons/modules.inc
@@ -1,152 +1,154 @@
 modules_cc =\
-  Modules/MContraction/Baryon.cc \
-  Modules/MContraction/Meson.cc \
-  Modules/MContraction/WeakEye3pt.cc \
-  Modules/MContraction/A2ALoop.cc \
-  Modules/MContraction/WeakNonEye3pt.cc \
-  Modules/MContraction/A2AAslashField.cc \
-  Modules/MContraction/A2AMesonField.cc \
-  Modules/MContraction/DiscLoop.cc \
-  Modules/MContraction/Gamma3pt.cc \
-  Modules/MFermion/FreeProp.cc \
-  Modules/MFermion/GaugeProp.cc \
-  Modules/MSource/Momentum.cc \
-  Modules/MSource/Point.cc \
-  Modules/MSource/Wall.cc \
-  Modules/MSource/SeqConserved.cc \
-  Modules/MSource/SeqGamma.cc \
-  Modules/MSource/Z2.cc \
-  Modules/MSink/Point.cc \
-  Modules/MSink/Smear.cc \
-  Modules/MSolver/A2AVectors.cc \
-  Modules/MSolver/A2AAslashVectors.cc \
-  Modules/MSolver/RBPrecCG.cc \
-  Modules/MSolver/MixedPrecisionRBPrecCG.cc \
-  Modules/MSolver/LocalCoherenceLanczos.cc \
-  Modules/MGauge/StoutSmearing.cc \
-  Modules/MGauge/Unit.cc \
-  Modules/MGauge/UnitEm.cc \
-  Modules/MGauge/StochEm.cc \
-  Modules/MGauge/Random.cc \
-  Modules/MGauge/Electrify.cc \
-  Modules/MGauge/FundtoHirep.cc \
-  Modules/MGauge/GaugeFix.cc \
-  Modules/MNoise/FullVolumeSpinColorDiagonal.cc \
-  Modules/MNoise/TimeDilutedSpinColorDiagonal.cc \
  Modules/MUtilities/RandomVectors.cc \
  Modules/MUtilities/PrecisionCast.cc \
-  Modules/MScalar/FreeProp.cc \
-  Modules/MScalar/ChargedProp.cc \
-  Modules/MDistil/DistilVectors.cc \
+  Modules/MSolver/MixedPrecisionRBPrecCG.cc \
+  Modules/MSolver/A2AVectors.cc \
+  Modules/MSolver/A2AAslashVectors.cc \
+  Modules/MSolver/LocalCoherenceLanczos.cc \
+  Modules/MSolver/RBPrecCG.cc \
  Modules/MDistil/g5_multiply.cc \
-  Modules/MDistil/BC2.cc \
  Modules/MDistil/BContraction.cc \
+  Modules/MDistil/BC2.cc \
  Modules/MDistil/LapEvec.cc \
-  Modules/MDistil/DistilSink.cc \
-  Modules/MDistil/Baryon2pt.cc \
  Modules/MDistil/PerambFromSolve.cc \
+  Modules/MDistil/Baryon2pt.cc \
  Modules/MDistil/PerambLight.cc \
+  Modules/MDistil/DistilSink.cc \
+  Modules/MDistil/DistilVectors.cc \
+  Modules/MContraction/WeakEye3pt.cc \
+  Modules/MContraction/WeakNonEye3pt.cc \
+  Modules/MContraction/Gamma3pt.cc \
+  Modules/MContraction/DiscLoop.cc \
+  Modules/MContraction/Meson.cc \
+  Modules/MContraction/A2ALoop.cc \
+  Modules/MContraction/A2AMesonField.cc \
+  Modules/MContraction/Baryon.cc \
+  Modules/MContraction/A2AAslashField.cc \
+  Modules/MAction/ZMobiusDWF.cc \
+  Modules/MAction/WilsonClover.cc \
+  Modules/MAction/Wilson.cc \
+  Modules/MAction/DWF.cc \
+  Modules/MAction/MobiusDWF.cc \
+  Modules/MAction/ScaledDWF.cc \
+  Modules/MGauge/FundtoHirep.cc \
+  Modules/MGauge/Random.cc \
+  Modules/MGauge/UnitEm.cc \
+  Modules/MGauge/StochEm.cc \
+  Modules/MGauge/GaugeFix.cc \
+  Modules/MGauge/Unit.cc \
+  Modules/MGauge/StoutSmearing.cc \
+  Modules/MGauge/Electrify.cc \
+  Modules/MNoise/TimeDilutedSpinColorDiagonal.cc \
+  Modules/MNoise/FullVolumeSpinColorDiagonal.cc \
+  Modules/MIO/LoadNersc.cc \
+  Modules/MIO/LoadA2AVectors.cc \
+  Modules/MIO/LoadCoarseEigenPack.cc \
+  Modules/MIO/LoadEigenPack.cc \
+  Modules/MIO/LoadPerambulator.cc \
+  Modules/MIO/LoadBinary.cc \
+  Modules/MIO/LoadCosmHol.cc \
  Modules/MNPR/Amputate.cc \
  Modules/MNPR/Bilinear.cc \
  Modules/MNPR/FourQuark.cc \
-  Modules/MAction/Wilson.cc \
-  Modules/MAction/MobiusDWF.cc \
-  Modules/MAction/ZMobiusDWF.cc \
-  Modules/MAction/WilsonClover.cc \
-  Modules/MAction/DWF.cc \
-  Modules/MAction/ScaledDWF.cc \
-  Modules/MScalarSUN/TrPhi.cc \
-  Modules/MScalarSUN/Grad.cc \
-  Modules/MScalarSUN/TrMag.cc \
-  Modules/MScalarSUN/TrKinetic.cc \
-  Modules/MScalarSUN/EMT.cc \
-  Modules/MScalarSUN/TransProj.cc \
-  Modules/MScalarSUN/StochFreeField.cc \
  Modules/MScalarSUN/TwoPoint.cc \
-  Modules/MScalarSUN/TwoPointNPR.cc \
  Modules/MScalarSUN/Div.cc \
-  Modules/MIO/LoadEigenPack.cc \
-  Modules/MIO/LoadBinary.cc \
-  Modules/MIO/LoadNersc.cc \
-  Modules/MIO/LoadCoarseEigenPack.cc \
-  Modules/MIO/LoadCosmHol.cc \
-  Modules/MIO/LoadA2AVectors.cc
+  Modules/MScalarSUN/TwoPointNPR.cc \
+  Modules/MScalarSUN/TrPhi.cc \
+  Modules/MScalarSUN/TrMag.cc \
+  Modules/MScalarSUN/TransProj.cc \
+  Modules/MScalarSUN/TrKinetic.cc \
+  Modules/MScalarSUN/StochFreeField.cc \
+  Modules/MScalarSUN/EMT.cc \
+  Modules/MScalarSUN/Grad.cc \
+  Modules/MSink/Smear.cc \
+  Modules/MSink/Point.cc \
+  Modules/MFermion/GaugeProp.cc \
+  Modules/MFermion/FreeProp.cc \
+  Modules/MScalar/FreeProp.cc \
+  Modules/MScalar/ChargedProp.cc \
+  Modules/MSource/SeqConserved.cc \
+  Modules/MSource/SeqGamma.cc \
+  Modules/MSource/Wall.cc \
+  Modules/MSource/Z2.cc \
+  Modules/MSource/Point.cc \
+  Modules/MSource/Momentum.cc

 modules_hpp =\
-  Modules/MContraction/WeakEye3pt.hpp \
-  Modules/MContraction/Baryon.hpp \
-  Modules/MContraction/A2AAslashField.hpp \
-  Modules/MContraction/A2ALoop.hpp \
-  Modules/MContraction/A2AMesonField.hpp \
-  Modules/MContraction/Meson.hpp \
-  Modules/MContraction/DiscLoop.hpp \
-  Modules/MContraction/Gamma3pt.hpp \
-  Modules/MContraction/WeakNonEye3pt.hpp \
-  Modules/MFermion/FreeProp.hpp \
-  Modules/MFermion/GaugeProp.hpp \
-  Modules/MSource/SeqGamma.hpp \
-  Modules/MSource/Point.hpp \
-  Modules/MSource/Wall.hpp \
-  Modules/MSource/Z2.hpp \
-  Modules/MSource/SeqConserved.hpp \
-  Modules/MSource/Momentum.hpp \
-  Modules/MSink/Smear.hpp \
-  Modules/MSink/Point.hpp \
+  Modules/MUtilities/RandomVectors.hpp \
+  Modules/MUtilities/PrecisionCast.hpp \
  Modules/MSolver/MixedPrecisionRBPrecCG.hpp \
-  Modules/MSolver/LocalCoherenceLanczos.hpp \
  Modules/MSolver/A2AAslashVectors.hpp \
  Modules/MSolver/Guesser.hpp \
+  Modules/MSolver/LocalCoherenceLanczos.hpp \
  Modules/MSolver/RBPrecCG.hpp \
  Modules/MSolver/A2AVectors.hpp \
-  Modules/MGauge/UnitEm.hpp \
-  Modules/MGauge/StoutSmearing.hpp \
-  Modules/MGauge/Unit.hpp \
-  Modules/MGauge/Random.hpp \
-  Modules/MGauge/GaugeFix.hpp \
-  Modules/MGauge/FundtoHirep.hpp \
-  Modules/MGauge/StochEm.hpp \
-  Modules/MGauge/Electrify.hpp \
-  Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp \
-  Modules/MNoise/FullVolumeSpinColorDiagonal.hpp \
-  Modules/MUtilities/PrecisionCast.hpp \
-  Modules/MUtilities/RandomVectors.hpp \
-  Modules/MScalar/FreeProp.hpp \
-  Modules/MScalar/Scalar.hpp \
-  Modules/MScalar/ChargedProp.hpp \
-  Modules/MDistil/Distil.hpp \
  Modules/MDistil/LapEvec.hpp \
-  Modules/MDistil/DistilVectors.hpp \
-  Modules/MDistil/DistilSink.hpp \
-  Modules/MDistil/BC2.hpp \
-  Modules/MDistil/PerambLight.hpp \
-  Modules/MDistil/PerambFromSolve.hpp \
-  Modules/MDistil/BContraction.hpp \
-  Modules/MDistil/Baryon2pt.hpp \
+  Modules/MDistil/Distil.hpp \
  Modules/MDistil/g5_multiply.hpp \
-  Modules/MNPR/Bilinear.hpp \
-  Modules/MNPR/Amputate.hpp \
-  Modules/MNPR/FourQuark.hpp \
-  Modules/MAction/DWF.hpp \
-  Modules/MAction/MobiusDWF.hpp \
+  Modules/MDistil/DistilVectors.hpp \
+  Modules/MDistil/Baryon2pt.hpp \
+  Modules/MDistil/BContraction.hpp \
+  Modules/MDistil/PerambLight.hpp \
+  Modules/MDistil/DistilSink.hpp \
+  Modules/MDistil/PerambFromSolve.hpp \
+  Modules/MDistil/BC2.hpp \
+  Modules/MContraction/WeakNonEye3pt.hpp \
+  Modules/MContraction/WeakEye3pt.hpp \
+  Modules/MContraction/DiscLoop.hpp \
+  Modules/MContraction/Baryon.hpp \
+  Modules/MContraction/Gamma3pt.hpp \
+  Modules/MContraction/A2ALoop.hpp \
+  Modules/MContraction/A2AMesonField.hpp \
+  Modules/MContraction/A2AAslashField.hpp \
+  Modules/MContraction/Meson.hpp \
  Modules/MAction/Wilson.hpp \
  Modules/MAction/WilsonClover.hpp \
-  Modules/MAction/ZMobiusDWF.hpp \
+  Modules/MAction/DWF.hpp \
  Modules/MAction/ScaledDWF.hpp \
-  Modules/MScalarSUN/StochFreeField.hpp \
-  Modules/MScalarSUN/TwoPointNPR.hpp \
-  Modules/MScalarSUN/Div.hpp \
-  Modules/MScalarSUN/TrMag.hpp \
-  Modules/MScalarSUN/EMT.hpp \
-  Modules/MScalarSUN/TwoPoint.hpp \
-  Modules/MScalarSUN/TrPhi.hpp \
-  Modules/MScalarSUN/Utils.hpp \
-  Modules/MScalarSUN/TransProj.hpp \
-  Modules/MScalarSUN/Grad.hpp \
-  Modules/MScalarSUN/TrKinetic.hpp \
-  Modules/MIO/LoadEigenPack.hpp \
+  Modules/MAction/ZMobiusDWF.hpp \
+  Modules/MAction/MobiusDWF.hpp \
+  Modules/MGauge/Random.hpp \
+  Modules/MGauge/Unit.hpp \
+  Modules/MGauge/UnitEm.hpp \
+  Modules/MGauge/StoutSmearing.hpp \
+  Modules/MGauge/StochEm.hpp \
+  Modules/MGauge/Electrify.hpp \
+  Modules/MGauge/FundtoHirep.hpp \
+  Modules/MGauge/GaugeFix.hpp \
+  Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp \
+  Modules/MNoise/FullVolumeSpinColorDiagonal.hpp \
+  Modules/MIO/LoadBinary.hpp \
+  Modules/MIO/LoadCosmHol.hpp \
  Modules/MIO/LoadNersc.hpp \
  Modules/MIO/LoadA2AVectors.hpp \
-  Modules/MIO/LoadCosmHol.hpp \
  Modules/MIO/LoadCoarseEigenPack.hpp \
-  Modules/MIO/LoadBinary.hpp
+  Modules/MIO/LoadEigenPack.hpp \
+  Modules/MIO/LoadPerambulator.hpp \
+  Modules/MNPR/Amputate.hpp \
+  Modules/MNPR/FourQuark.hpp \
+  Modules/MNPR/Bilinear.hpp \
+  Modules/MScalarSUN/TransProj.hpp \
+  Modules/MScalarSUN/TwoPoint.hpp \
+  Modules/MScalarSUN/TrMag.hpp \
+  Modules/MScalarSUN/TrKinetic.hpp \
+  Modules/MScalarSUN/EMT.hpp \
+  Modules/MScalarSUN/Grad.hpp \
+  Modules/MScalarSUN/Utils.hpp \
+  Modules/MScalarSUN/Div.hpp \
+  Modules/MScalarSUN/TrPhi.hpp \
+  Modules/MScalarSUN/TwoPointNPR.hpp \
+  Modules/MScalarSUN/StochFreeField.hpp \
+  Modules/MSink/Smear.hpp \
+  Modules/MSink/Point.hpp \
+  Modules/MFermion/GaugeProp.hpp \
+  Modules/MFermion/FreeProp.hpp \
+  Modules/MScalar/Scalar.hpp \
+  Modules/MScalar/FreeProp.hpp \
+  Modules/MScalar/ChargedProp.hpp \
+  Modules/MSource/Momentum.hpp \
+  Modules/MSource/SeqGamma.hpp \
+  Modules/MSource/Point.hpp \
+  Modules/MSource/Z2.hpp \
+  Modules/MSource/Wall.hpp \
+  Modules/MSource/SeqConserved.hpp