SITMO I/O for NERSC working now bit repro

2025-11-04 05:54:32 +00:00 · 2017-05-05 16:54:44 +01:00
parent 14bedebb11
commit 697c0603ce
24 changed files with 33 additions and 29 deletions
--- a/lib/lattice/Lattice_rng.h
+++ b/lib/lattice/Lattice_rng.h
@@ -158,7 +158,7 @@ namespace Grid {
 #ifdef RNG_SITMO
    typedef sitmo::prng_engine 	RngEngine;
    typedef uint64_t    	RngStateType;
-    static const int    	RngStateCount = 4;
+    static const int    	RngStateCount = 13;
 #endif

    std::vector<RngEngine>                             _generators;
--- a/tests/IO/Test_nersc_io.cc
+++ b/tests/IO/Test_nersc_io.cc
@@ -41,7 +41,7 @@ int main (int argc, char ** argv)

  std::vector<int> simd_layout = GridDefaultSimd(4,vComplex::Nsimd());
  std::vector<int> mpi_layout  = GridDefaultMpi();
-  std::vector<int> latt_size  ({32,32,32,32});
+  std::vector<int> latt_size  ({16,16,16,16});
  std::vector<int> clatt_size  ({4,4,4,8});
  int orthodir=3;
  int orthosz =latt_size[orthodir];
@@ -54,8 +54,8 @@ int main (int argc, char ** argv)
  GridSerialRNG     sRNGa;
  GridSerialRNG     sRNGb;

-  pRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9});
-  sRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9});
+  pRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9}));
+  sRNGa.SeedFixedIntegers(std::vector<int>({45,12,81,9}));
  
  std::string rfile("./ckpoint_rng.4000");
  NerscIO::writeRNGState(sRNGa,pRNGa,rfile);
@@ -80,8 +80,14 @@ int main (int argc, char ** argv)

  std::vector<LatticeColourMatrix> U(4,&Fine);
  
+  SU3::ColdConfiguration(pRNGa,Umu);
+
  NerscField header;
  std::string file("./ckpoint_lat.4000");
+
+  int precision32 = 0;
+  int tworow      = 0;
+  NerscIO::writeConfiguration(Umu,file,tworow,precision32);
  NerscIO::readConfiguration(Umu,header,file);

  for(int mu=0;mu<Nd;mu++){
@@ -147,8 +153,6 @@ int main (int argc, char ** argv)
  std::string clone2x3("./ckpoint_clone2x3.4000");
  std::string clone3x3("./ckpoint_clone3x3.4000");

-  int precision32 = 1;
-  int tworow      = 1;
  NerscIO::writeConfiguration(Umu,clone3x3,0,precision32);
  NerscIO::writeConfiguration(Umu,clone2x3,1,precision32);
  
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = core forces hmc solver debug smearing
+SUBDIRS = core forces hmc solver debug smearing IO

 if BUILD_CHROMA_REGRESSION
  SUBDIRS+= qdpxx
--- a/tests/hmc/Test_hmc_EODWFRatio.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio.cc
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
+++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_EOMobiusRatio.cc
+++ b/tests/hmc/Test_hmc_EOMobiusRatio.cc
@@ -130,7 +130,7 @@ int main(int argc, char **argv) {
  CPparams.format = "IEEE64BIG";
  */
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  // RNG definition (Name: RandomNumberGenerator)
  RNGModuleParameters RNGpar(Reader);
--- a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_hmc_EOWilsonRatio.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_GparityWilsonGauge.cc
+++ b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_IwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_IwasakiGauge.cc
@@ -54,7 +54,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 20;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_RectGauge.cc
+++ b/tests/hmc/Test_hmc_RectGauge.cc
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 20;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonGauge.cc
@@ -51,10 +51,10 @@ int main(int argc, char **argv) {
  CheckpointerParameters CPparams;  
  CPparams.config_prefix = "ckpoint_lat";
  CPparams.rng_prefix = "ckpoint_rng";
-  CPparams.saveInterval = 20;
+  CPparams.saveInterval = 1;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonRatio.cc
+++ b/tests/hmc/Test_hmc_WilsonRatio.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_rhmc_EOWilson1p1.cc
+++ b/tests/hmc/Test_rhmc_EOWilson1p1.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_rhmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_rhmc_Wilson1p1.cc
+++ b/tests/hmc/Test_rhmc_Wilson1p1.cc
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";
--- a/tests/hmc/Test_rhmc_WilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_WilsonRatio.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
  CPparams.saveInterval = 5;
  CPparams.format = "IEEE64BIG";
  
-  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+  TheHMC.Resources.LoadNerscCheckpointer(CPparams);

  RNGModuleParameters RNGpar;
  RNGpar.serial_seeds = "1 2 3 4 5";