Compare commits

..

No commits in common. "b4d4dcccd065e03d8f749a1c404dbad92eb3c81d" and "3595f7d250a35487354374af7c168eb95d28011e" have entirely different histories.

View File

@ -44,10 +44,10 @@ struct RbcUkqcd
inline static constexpr EnsembleParameters m0LCDPar{0.0006203, 0.02661, 1.8, 2., 64, 128, 12};
// C1M
inline static constexpr EnsembleParameters c1mIRLPar{0.005, 0.0362, 1.8, 2., 24, 64, 24};
inline static constexpr EnsembleParameters c1m16IRLPar{0.005, 0.0362, 1.8, 2., 16, 64, 24};
inline static constexpr EnsembleParameters c1m20IRLPar{0.005, 0.0362, 1.8, 2., 20, 64, 24};
inline static constexpr EnsembleParameters c1m32IRLPar{0.005, 0.0362, 1.8, 2., 32, 64, 24};
inline static constexpr EnsembleParameters c1mLCDPar {0.005, 0.0362, 1.8, 2., 24, 64, 24};
inline static constexpr EnsembleParameters c1m16LCDPar{0.005, 0.0362, 1.8, 2., 16, 64, 24};
inline static constexpr EnsembleParameters c1m20LCDPar{0.005, 0.0362, 1.8, 2., 20, 64, 24};
inline static constexpr EnsembleParameters c1m32LCDPar{0.005, 0.0362, 1.8, 2., 32, 64, 24};
// Runtime deflation parameters
struct DeflationParameters
@ -56,12 +56,17 @@ struct RbcUkqcd
unsigned int nPoly, nStop, nK, nM;
};
inline static constexpr DeflationParameters c1mDeflPar{5.0e-04, 5.5, 101, 100, 110, 120};
inline static constexpr DeflationParameters c1mDeflPar {5.0e-04, 5.5, 101, 100, 110, 120};
inline static constexpr DeflationParameters c1m16DeflPar{5.0e-03, 5.5, 101, 200, 220, 230};
inline static constexpr DeflationParameters c1m20DeflPar{3.0e-03, 5.5, 101, 200, 220, 230};
inline static constexpr DeflationParameters c1m32DeflPar{3.0e-06, 5.5, 101, 100, 110, 120};
// Light solver: load deflation from disk
static inline void addLightLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
const std::string solverName, const std::string gaugeName,
const std::string gaugeTransform,
const std::string eigenpackPath, const double residual);
static inline void addM0LightLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
@ -69,24 +74,24 @@ struct RbcUkqcd
const double residual = 1.0e-8);
// Light solver: deflation at runtime
static inline void
addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
addLightRuntimeLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
const RbcUkqcd::DeflationParameters &deflPar,
const std::string solverName, const std::string gaugeName,
const std::string gaugeTransform, const double residual);
static inline void addC1MLightRuntimeIRLSolver(Application &app, const std::string solverName,
static inline void addC1MLightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual = 1.0e-8);
static inline void addC1M16LightRuntimeIRLSolver(Application &app, const std::string solverName,
static inline void addC1M16LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual = 1.0e-8);
static inline void addC1M20LightRuntimeIRLSolver(Application &app, const std::string solverName,
static inline void addC1M20LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual = 1.0e-8);
static inline void addC1M32LightRuntimeIRLSolver(Application &app, const std::string solverName,
static inline void addC1M32LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual = 1.0e-8);
@ -120,10 +125,11 @@ struct RbcUkqcd
// Implementations /////////////////////////////////////////////////////////////////////////////////
// Light M0 (load deflation from disk)
void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName, const std::string gaugeTransform,
const std::string eigenpackPath, const double residual)
// Load deflation from disk
void RbcUkqcd::addLightLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
const std::string solverName, const std::string gaugeName,
const std::string gaugeTransform, const std::string eigenpackPath,
const double residual)
{
const std::string prefix = solverName;
@ -137,10 +143,10 @@ void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverNam
MAction::ScaledDWF::Par actionPar;
actionPar.gauge = gaugeName;
actionPar.Ls = RbcUkqcd::m0LCDPar.Ls;
actionPar.M5 = RbcUkqcd::m0LCDPar.M5;
actionPar.mass = RbcUkqcd::m0LCDPar.ml;
actionPar.scale = RbcUkqcd::m0LCDPar.scale;
actionPar.Ls = par.Ls;
actionPar.M5 = par.M5;
actionPar.mass = par.ml;
actionPar.scale = par.scale;
actionPar.boundary = "1 1 1 1";
actionPar.twist = "0. 0. 0. 0.";
app.createModule<MAction::ScaledDWF>(prefix + "_dwf", actionPar);
@ -183,8 +189,17 @@ void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverNam
app.createModule<MSolver::MixedPrecisionRBPrecCGBatched>(solverName, solverPar);
}
// Light M0
void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName, const std::string gaugeTransform,
const std::string eigenpackPath, const double residual)
{
RbcUkqcd::addLightLCDSolver(app, RbcUkqcd::m0LCDPar, solverName, gaugeName, gaugeTransform,
eigenpackPath, residual);
}
// Deflation at runtime
void RbcUkqcd::addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
void RbcUkqcd::addLightRuntimeLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
const RbcUkqcd::DeflationParameters &deflPar,
const std::string solverName, const std::string gaugeName,
const std::string gaugeTransform, const double residual)
@ -205,7 +220,7 @@ void RbcUkqcd::addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::Ensemb
actionPar.M5 = par.M5;
actionPar.mass = par.ml;
actionPar.scale = par.scale;
actionPar.boundary = "1 1 1 -1";
actionPar.boundary = "1 1 1 1";
actionPar.twist = "0. 0. 0. 0.";
app.createModule<MAction::ScaledDWF>(prefix + "_dwf", actionPar);
actionPar.gauge = prefix + "_gauge_fp32";
@ -252,41 +267,38 @@ void RbcUkqcd::addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::Ensemb
}
// Light C1M
void RbcUkqcd::addC1MLightRuntimeIRLSolver(Application &app, const std::string solverName,
void RbcUkqcd::addC1MLightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform, const double residual)
{
RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1mIRLPar, RbcUkqcd::c1mDeflPar, solverName,
RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1mLCDPar, RbcUkqcd::c1mDeflPar, solverName,
gaugeName, gaugeTransform, residual);
}
// Light C1M16
void RbcUkqcd::addC1M16LightRuntimeIRLSolver(Application &app, const std::string solverName,
void RbcUkqcd::addC1M16LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual)
const std::string gaugeTransform, const double residual)
{
RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m16IRLPar, RbcUkqcd::c1m16DeflPar, solverName,
RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m16LCDPar, RbcUkqcd::c1m16DeflPar, solverName,
gaugeName, gaugeTransform, residual);
}
// Light C1M20
void RbcUkqcd::addC1M20LightRuntimeIRLSolver(Application &app, const std::string solverName,
void RbcUkqcd::addC1M20LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual)
const std::string gaugeTransform, const double residual)
{
RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m20IRLPar, RbcUkqcd::c1m20DeflPar, solverName,
RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m20LCDPar, RbcUkqcd::c1m20DeflPar, solverName,
gaugeName, gaugeTransform, residual);
}
// Light C1M32
void RbcUkqcd::addC1M32LightRuntimeIRLSolver(Application &app, const std::string solverName,
void RbcUkqcd::addC1M32LightRuntimeLCDSolver(Application &app, const std::string solverName,
const std::string gaugeName,
const std::string gaugeTransform,
const double residual)
const std::string gaugeTransform, const double residual)
{
RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m32IRLPar, RbcUkqcd::c1m32DeflPar, solverName,
RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m32LCDPar, RbcUkqcd::c1m32DeflPar, solverName,
gaugeName, gaugeTransform, residual);
}
@ -342,7 +354,7 @@ void RbcUkqcd::addC1MStrangeSolver(Application &app, const std::string solverNam
const std::string gaugeName, const std::string gaugeTransform,
const double residual)
{
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1mIRLPar, solverName, gaugeName, gaugeTransform,
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1mLCDPar, solverName, gaugeName, gaugeTransform,
residual);
}
@ -350,7 +362,7 @@ void RbcUkqcd::addC1M16StrangeSolver(Application &app, const std::string solverN
const std::string gaugeName, const std::string gaugeTransform,
const double residual)
{
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m16IRLPar, solverName, gaugeName, gaugeTransform,
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m16LCDPar, solverName, gaugeName, gaugeTransform,
residual);
}
@ -358,7 +370,7 @@ void RbcUkqcd::addC1M20StrangeSolver(Application &app, const std::string solverN
const std::string gaugeName, const std::string gaugeTransform,
const double residual)
{
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m20IRLPar, solverName, gaugeName, gaugeTransform,
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m20LCDPar, solverName, gaugeName, gaugeTransform,
residual);
}
@ -366,7 +378,7 @@ void RbcUkqcd::addC1M32StrangeSolver(Application &app, const std::string solverN
const std::string gaugeName, const std::string gaugeTransform,
const double residual)
{
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m32IRLPar, solverName, gaugeName, gaugeTransform,
RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m32LCDPar, solverName, gaugeName, gaugeTransform,
residual);
}