From 47429218bbbbf47af4b19d5fdb6d5f839cb9bc26 Mon Sep 17 00:00:00 2001 From: Mashy Green Date: Wed, 27 Nov 2024 16:29:22 +0000 Subject: [PATCH 1/3] patched version + modifications to deriv -> staple in qcd/gauge --- Grid/qcd/action/gauge/WilsonGaugeAction.h | 17 ++++++++++++----- HMC/FTHMC2p1f.cc | 10 ++++++++-- HMC/FTHMC2p1f_3GeV.cc | 9 +++++++++ HMC/HMC2p1f_3GeV.cc | 8 ++++++++ 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Grid/qcd/action/gauge/WilsonGaugeAction.h b/Grid/qcd/action/gauge/WilsonGaugeAction.h index f535b54f7..661b0ca5b 100644 --- a/Grid/qcd/action/gauge/WilsonGaugeAction.h +++ b/Grid/qcd/action/gauge/WilsonGaugeAction.h @@ -69,15 +69,22 @@ class WilsonGaugeAction : public Action { RealD factor = 0.5 * beta / RealD(Nc); - GaugeLinkField Umu(U.Grid()); + // GaugeLinkField Umu(U.Grid()); + std::vector Uvec(Nd, U.Grid()); + for (int d = 0; d < Nd; d++) { + Uvec[d] = PeekIndex(U, d); + } + GaugeLinkField dSdU_mu(U.Grid()); for (int mu = 0; mu < Nd; mu++) { - Umu = PeekIndex(U, mu); - + // Umu = PeekIndex(U, mu); + // Staple in direction mu - WilsonLoops::Staple(dSdU_mu, U, mu); - dSdU_mu = Ta(Umu * dSdU_mu) * factor; + // WilsonLoops::Staple(dSdU_mu, U, mu); + // dSdU_mu = Ta(Umu * dSdU_mu) * factor; + WilsonLoops::Staple(dSdU_mu, Uvec, mu); + dSdU_mu = Ta(Uvec[mu] * dSdU_mu) * factor; PokeIndex(dSdU, dSdU_mu, mu); } diff --git a/HMC/FTHMC2p1f.cc b/HMC/FTHMC2p1f.cc index 7d93d168f..1e914e872 100644 --- a/HMC/FTHMC2p1f.cc +++ b/HMC/FTHMC2p1f.cc @@ -25,13 +25,20 @@ directory *************************************************************************************/ /* END LEGAL */ #include + +#if Nc == 3 #include #include +#endif using namespace Grid; int main(int argc, char **argv) { +#if Nc != 3 +#warning FTHMC2p1f will not work for Nc != 3 + std::cout << "This program will currently only work for Nc == 3." << std::endl; +#else std::cout << std::setprecision(12); Grid_init(&argc, &argv); @@ -220,7 +227,6 @@ int main(int argc, char **argv) TheHMC.Run(SmearingPolicy); // for smearing Grid_finalize(); +#endif } // main - - diff --git a/HMC/FTHMC2p1f_3GeV.cc b/HMC/FTHMC2p1f_3GeV.cc index a8aa67f8c..36d5caa3b 100644 --- a/HMC/FTHMC2p1f_3GeV.cc +++ b/HMC/FTHMC2p1f_3GeV.cc @@ -24,14 +24,22 @@ See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ + #include + +#if Nc == 3 #include #include +#endif using namespace Grid; int main(int argc, char **argv) { +#if Nc != 3 +#warning FTHMC2p1f_3GeV will not work for Nc != 3 + std::cout << "This program will currently only work for Nc == 3." << std::endl; +#else std::cout << std::setprecision(12); Grid_init(&argc, &argv); @@ -220,6 +228,7 @@ int main(int argc, char **argv) TheHMC.Run(SmearingPolicy); // for smearing Grid_finalize(); +#endif } // main diff --git a/HMC/HMC2p1f_3GeV.cc b/HMC/HMC2p1f_3GeV.cc index 4bf088d7f..199d4be81 100644 --- a/HMC/HMC2p1f_3GeV.cc +++ b/HMC/HMC2p1f_3GeV.cc @@ -25,13 +25,20 @@ directory *************************************************************************************/ /* END LEGAL */ #include + +#if Nc == 3 #include #include +#endif using namespace Grid; int main(int argc, char **argv) { +#if Nc != 3 +#warning HMC2p1f_3GeV will not work for Nc != 3 + std::cout << "This program will currently only work for Nc == 3." << std::endl; +#else std::cout << std::setprecision(12); Grid_init(&argc, &argv); @@ -220,6 +227,7 @@ int main(int argc, char **argv) TheHMC.Run(SmearingPolicy); // for smearing Grid_finalize(); +#endif } // main From 3ba019c747bc22411406c3ea142ad9aa5c66bc59 Mon Sep 17 00:00:00 2001 From: Mashy Green Date: Tue, 3 Dec 2024 15:23:00 +0000 Subject: [PATCH 2/3] Cleaning up and aligning variable naming between action deriv versions --- .../action/gauge/PlaqPlusRectangleAction.h | 30 ++-- Grid/qcd/action/gauge/WilsonGaugeAction.h | 22 ++- Grid/qcd/utils/WilsonLoops.h | 25 ++-- tests/run_regression_test.py | 134 ++++++++++++++++++ ...hmc_Sp_WilsonFundFermionGauge_expected.txt | 1 + 5 files changed, 169 insertions(+), 43 deletions(-) create mode 100644 tests/run_regression_test.py create mode 100644 tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt diff --git a/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h b/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h index b9d6ac165..55b98986e 100644 --- a/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h +++ b/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h @@ -71,30 +71,30 @@ class PlaqPlusRectangleAction : public Action { return action; }; - virtual void deriv(const GaugeField &Umu,GaugeField & dSdU) { - //extend Ta to include Lorentz indexes - RealD factor_p = c_plaq/RealD(Nc)*0.5; - RealD factor_r = c_rect/RealD(Nc)*0.5; + virtual void deriv(const GaugeField &U, GaugeField &dSdU) { + // extend Ta to include Lorentz indexes + RealD factor_p = c_plaq / RealD(Nc) * 0.5; + RealD factor_r = c_rect / RealD(Nc) * 0.5; - GridBase *grid = Umu.Grid(); + GridBase *grid = U.Grid(); - std::vector U (Nd,grid); - for(int mu=0;mu(Umu,mu); + std::vector Umu(Nd, grid); + for (int mu = 0; mu < Nd; mu++) { + Umu[mu] = PeekIndex(U, mu); } - std::vector RectStaple(Nd,grid), Staple(Nd,grid); - WilsonLoops::StapleAndRectStapleAll(Staple, RectStaple, U, workspace); + std::vector RectStaple(Nd, grid), Staple(Nd, grid); + WilsonLoops::StapleAndRectStapleAll(Staple, RectStaple, Umu, + workspace); GaugeLinkField dSdU_mu(grid); GaugeLinkField staple(grid); - for (int mu=0; mu < Nd; mu++){ - dSdU_mu = Ta(U[mu]*Staple[mu])*factor_p; - dSdU_mu = dSdU_mu + Ta(U[mu]*RectStaple[mu])*factor_r; - + for (int mu = 0; mu < Nd; mu++) { + dSdU_mu = Ta(Umu[mu] * Staple[mu]) * factor_p; + dSdU_mu = dSdU_mu + Ta(Umu[mu] * RectStaple[mu]) * factor_r; + PokeIndex(dSdU, dSdU_mu, mu); } - }; }; diff --git a/Grid/qcd/action/gauge/WilsonGaugeAction.h b/Grid/qcd/action/gauge/WilsonGaugeAction.h index 661b0ca5b..952536b38 100644 --- a/Grid/qcd/action/gauge/WilsonGaugeAction.h +++ b/Grid/qcd/action/gauge/WilsonGaugeAction.h @@ -68,27 +68,23 @@ class WilsonGaugeAction : public Action { // extend Ta to include Lorentz indexes RealD factor = 0.5 * beta / RealD(Nc); + GridBase *grid = U.Grid(); - // GaugeLinkField Umu(U.Grid()); - std::vector Uvec(Nd, U.Grid()); - for (int d = 0; d < Nd; d++) { - Uvec[d] = PeekIndex(U, d); + GaugeLinkField dSdU_mu(grid); + std::vector Umu(Nd, grid); + for (int mu = 0; mu < Nd; mu++) { + Umu[mu] = PeekIndex(U, mu); } - GaugeLinkField dSdU_mu(U.Grid()); for (int mu = 0; mu < Nd; mu++) { - - // Umu = PeekIndex(U, mu); - // Staple in direction mu - // WilsonLoops::Staple(dSdU_mu, U, mu); - // dSdU_mu = Ta(Umu * dSdU_mu) * factor; - WilsonLoops::Staple(dSdU_mu, Uvec, mu); - dSdU_mu = Ta(Uvec[mu] * dSdU_mu) * factor; - + WilsonLoops::Staple(dSdU_mu, Umu, mu); + dSdU_mu = Ta(Umu[mu] * dSdU_mu) * factor; + PokeIndex(dSdU, dSdU_mu, mu); } } + private: RealD beta; }; diff --git a/Grid/qcd/utils/WilsonLoops.h b/Grid/qcd/utils/WilsonLoops.h index 851ba1724..cd281033f 100644 --- a/Grid/qcd/utils/WilsonLoops.h +++ b/Grid/qcd/utils/WilsonLoops.h @@ -292,18 +292,16 @@ template class WilsonLoops : public Gimpl { ////////////////////////////////////////////////// // the sum over all nu-oriented staples for nu != mu on each site ////////////////////////////////////////////////// - static void Staple(GaugeMat &staple, const GaugeLorentz &Umu, int mu) { + static void Staple(GaugeMat &staple, const GaugeLorentz &U, int mu) { - GridBase *grid = Umu.Grid(); - - std::vector U(Nd, grid); + std::vector Umu(Nd, U.grid()); for (int d = 0; d < Nd; d++) { - U[d] = PeekIndex(Umu, d); + Umu[d] = PeekIndex(U, d); } - Staple(staple, U, mu); + Staple(staple, Umu, mu); } - static void Staple(GaugeMat &staple, const std::vector &U, int mu) { + static void Staple(GaugeMat &staple, const std::vector &Umu, int mu) { staple = Zero(); for (int nu = 0; nu < Nd; nu++) { @@ -318,13 +316,10 @@ template class WilsonLoops : public Gimpl { // | // __| // - + staple += Gimpl::ShiftStaple( - Gimpl::CovShiftForward( - U[nu], nu, - Gimpl::CovShiftBackward( - U[mu], mu, Gimpl::CovShiftIdentityBackward(U[nu], nu))), - mu); + Gimpl::CovShiftForward(Umu[nu], nu, + Gimpl::CovShiftBackward(Umu[mu], mu, Gimpl::CovShiftIdentityBackward(Umu[nu], nu))), mu); // __ // | @@ -333,8 +328,8 @@ template class WilsonLoops : public Gimpl { // staple += Gimpl::ShiftStaple( - Gimpl::CovShiftBackward(U[nu], nu, - Gimpl::CovShiftBackward(U[mu], mu, U[nu])), mu); + Gimpl::CovShiftBackward(Umu[nu], nu, + Gimpl::CovShiftBackward(Umu[mu], mu, Umu[nu])), mu); } } } diff --git a/tests/run_regression_test.py b/tests/run_regression_test.py new file mode 100644 index 000000000..c7ad03674 --- /dev/null +++ b/tests/run_regression_test.py @@ -0,0 +1,134 @@ +def read_expected(test_name="Test_hmc_Sp_WilsonFundFermionGauge", grid="8.8.8.8", mpi="1.1.1.1"): + """ + Read expected values from file. + + The file contains one or more entries of the following format: + + Eg. + 8.8.8.8 1.1.1.1 0.0256253844 922c392f d1e4cc1c + """ + + with open(f"{test_name}_expected.txt") as file: + for line in file: + line_split = line.split() + if line_split[0] == grid and line_split[1] == mpi: + return float(line_split[2]), line_split[3], line_split[4] + + +def read_output(): + """ + Read test output and fish out values of interest. + """ + + checksum_rng = None + checksum_lat = None + plaquette = None + with open("output.txt", 'r') as file: + for line in file: + if "Written NERSC" in line: + subline = line.split('checksum ')[1] + if len(subline.split()) == 1: # this is the rng checksum line + checksum_rng = subline.strip() + elif len(subline.split()) == 3: # this is the lat checksum and plaquette value line + checksum_lat = subline.split()[0] + plaquette = float(subline.split()[2]) + else: + print("Picked wrong line...") + + if (checksum_rng is None) or (checksum_lat is None) or (plaquette is None): + print("Error reading values from output file. Make sure you compile the test with CPparams.saveInterval=1 in order to produce the required output.") + exit(1) + + return plaquette, checksum_rng, checksum_lat + + +def compare(actual, expected, what, stop=False): + """ + Compare actual with expected output, and output message if failed. + """ + + if actual != expected: + print(f"{what} comparison failed: actual={actual} , expected={expected}") + if stop: + exit(1) + else: + return False + return True + + + +if __name__ == '__main__': + import argparse + import subprocess + import os + + parser = argparse.ArgumentParser(description='Run end-to-end tests and compare results with expectations.') + parser.add_argument("test_name", help="File name of the test") + parser.add_argument("grid", help="Grid configuration") + parser.add_argument("mpi", help="MPI configuration") + parser.add_argument("-s", "--stop", action='store_true', help="Flag to stop testing when a test fails.") + args = parser.parse_args() + + expected_plaquette, expected_checksum_rng, expected_checksum_lat = read_expected(args.test_name, args.grid, args.mpi) + + result = subprocess.run([f"./{args.test_name} --grid {args.grid} --mpi {args.mpi} --Thermalizations 0 --Trajectories 1 > output.txt"], shell=True, encoding="text") + plaquette, checksum_rng, checksum_lat = read_output() + + print(f"Running {args.test_name}") + result = compare(plaquette, expected_plaquette, "plaquette", args.stop) + result = result and compare(checksum_rng, expected_checksum_rng, "Checksum RNG file ", args.stop) + result = result and compare(checksum_lat, expected_checksum_lat, "Checksum LAT file ", args.stop) + if result: + print("All tests passed!") + else: + print("Some tests failed...") + + os.remove("output.txt") + os.remove("ckpoint_rng.1") + os.remove("ckpoint_lat.1") + +#result = subprocess.run(["./Test_hmc_Sp_WilsonFundFermionGauge --grid 8.8.8.8 --mpi 1.1.1.1 --Thermalizations 0 --Trajectories 1 > output1.txt"], shell=True, encoding="text") + +# expected_value = 0.0256253844 +# checksum_rng = "922c392f" +# checksum_lat = "d1e4cc1c" + +# with open("output1.txt", 'r') as file: +# for line in file: +# # if "Plaquette" in line: +# # #print(line) +# # plaquette_value = float(line.split('] ')[1]) +# # #print(plaquette_value) +# # if plaquette_value == expected_value: +# # print("Success!") +# if "Written NERSC" in line: +# print(line) +# subline = line.split('checksum ')[1] +# if len(subline.split()) == 1: # this is the rng checksum line +# print(subline) +# if subline.strip() == checksum_rng: +# print("RNG file checksum success!") +# else: +# print("RNG file checksum failed!") +# elif len(subline.split()) == 3: # this is the lat checksum and plaquette value line +# print(subline) +# checksum_value = subline.split()[0] +# plaquette_value = float(subline.split()[2]) +# print(checksum_value, plaquette_value) +# if checksum_value == checksum_lat: +# print("LAT file checksum success!") +# else: +# print("LAT file checksum failed!") +# if plaquette_value == expected_value: +# print("Plaquette value success!") +# else: +# print("Plaquette value failed!") +# else: +# print("Picked wrong line...") + + +#loc1 = result.find("Plaquette") +#print(loc1) +#loc2 = result.find("Smeared") +#print(loc2) +#print(result[loc1,loc2]) diff --git a/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt b/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt new file mode 100644 index 000000000..7edc6fa0a --- /dev/null +++ b/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt @@ -0,0 +1 @@ +8.8.8.8 1.1.1.1 0.0256253844 922c392f d1e4cc1c From e99d42404e64e6f3833616dc9c975ce001744b52 Mon Sep 17 00:00:00 2001 From: Mashy Green Date: Mon, 16 Dec 2024 16:31:22 +0000 Subject: [PATCH 3/3] Removing the regresion test files that were also in this branch for a clean PR --- tests/run_regression_test.py | 134 ------------------ ...hmc_Sp_WilsonFundFermionGauge_expected.txt | 1 - 2 files changed, 135 deletions(-) delete mode 100644 tests/run_regression_test.py delete mode 100644 tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt diff --git a/tests/run_regression_test.py b/tests/run_regression_test.py deleted file mode 100644 index c7ad03674..000000000 --- a/tests/run_regression_test.py +++ /dev/null @@ -1,134 +0,0 @@ -def read_expected(test_name="Test_hmc_Sp_WilsonFundFermionGauge", grid="8.8.8.8", mpi="1.1.1.1"): - """ - Read expected values from file. - - The file contains one or more entries of the following format: - - Eg. - 8.8.8.8 1.1.1.1 0.0256253844 922c392f d1e4cc1c - """ - - with open(f"{test_name}_expected.txt") as file: - for line in file: - line_split = line.split() - if line_split[0] == grid and line_split[1] == mpi: - return float(line_split[2]), line_split[3], line_split[4] - - -def read_output(): - """ - Read test output and fish out values of interest. - """ - - checksum_rng = None - checksum_lat = None - plaquette = None - with open("output.txt", 'r') as file: - for line in file: - if "Written NERSC" in line: - subline = line.split('checksum ')[1] - if len(subline.split()) == 1: # this is the rng checksum line - checksum_rng = subline.strip() - elif len(subline.split()) == 3: # this is the lat checksum and plaquette value line - checksum_lat = subline.split()[0] - plaquette = float(subline.split()[2]) - else: - print("Picked wrong line...") - - if (checksum_rng is None) or (checksum_lat is None) or (plaquette is None): - print("Error reading values from output file. Make sure you compile the test with CPparams.saveInterval=1 in order to produce the required output.") - exit(1) - - return plaquette, checksum_rng, checksum_lat - - -def compare(actual, expected, what, stop=False): - """ - Compare actual with expected output, and output message if failed. - """ - - if actual != expected: - print(f"{what} comparison failed: actual={actual} , expected={expected}") - if stop: - exit(1) - else: - return False - return True - - - -if __name__ == '__main__': - import argparse - import subprocess - import os - - parser = argparse.ArgumentParser(description='Run end-to-end tests and compare results with expectations.') - parser.add_argument("test_name", help="File name of the test") - parser.add_argument("grid", help="Grid configuration") - parser.add_argument("mpi", help="MPI configuration") - parser.add_argument("-s", "--stop", action='store_true', help="Flag to stop testing when a test fails.") - args = parser.parse_args() - - expected_plaquette, expected_checksum_rng, expected_checksum_lat = read_expected(args.test_name, args.grid, args.mpi) - - result = subprocess.run([f"./{args.test_name} --grid {args.grid} --mpi {args.mpi} --Thermalizations 0 --Trajectories 1 > output.txt"], shell=True, encoding="text") - plaquette, checksum_rng, checksum_lat = read_output() - - print(f"Running {args.test_name}") - result = compare(plaquette, expected_plaquette, "plaquette", args.stop) - result = result and compare(checksum_rng, expected_checksum_rng, "Checksum RNG file ", args.stop) - result = result and compare(checksum_lat, expected_checksum_lat, "Checksum LAT file ", args.stop) - if result: - print("All tests passed!") - else: - print("Some tests failed...") - - os.remove("output.txt") - os.remove("ckpoint_rng.1") - os.remove("ckpoint_lat.1") - -#result = subprocess.run(["./Test_hmc_Sp_WilsonFundFermionGauge --grid 8.8.8.8 --mpi 1.1.1.1 --Thermalizations 0 --Trajectories 1 > output1.txt"], shell=True, encoding="text") - -# expected_value = 0.0256253844 -# checksum_rng = "922c392f" -# checksum_lat = "d1e4cc1c" - -# with open("output1.txt", 'r') as file: -# for line in file: -# # if "Plaquette" in line: -# # #print(line) -# # plaquette_value = float(line.split('] ')[1]) -# # #print(plaquette_value) -# # if plaquette_value == expected_value: -# # print("Success!") -# if "Written NERSC" in line: -# print(line) -# subline = line.split('checksum ')[1] -# if len(subline.split()) == 1: # this is the rng checksum line -# print(subline) -# if subline.strip() == checksum_rng: -# print("RNG file checksum success!") -# else: -# print("RNG file checksum failed!") -# elif len(subline.split()) == 3: # this is the lat checksum and plaquette value line -# print(subline) -# checksum_value = subline.split()[0] -# plaquette_value = float(subline.split()[2]) -# print(checksum_value, plaquette_value) -# if checksum_value == checksum_lat: -# print("LAT file checksum success!") -# else: -# print("LAT file checksum failed!") -# if plaquette_value == expected_value: -# print("Plaquette value success!") -# else: -# print("Plaquette value failed!") -# else: -# print("Picked wrong line...") - - -#loc1 = result.find("Plaquette") -#print(loc1) -#loc2 = result.find("Smeared") -#print(loc2) -#print(result[loc1,loc2]) diff --git a/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt b/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt deleted file mode 100644 index 7edc6fa0a..000000000 --- a/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge_expected.txt +++ /dev/null @@ -1 +0,0 @@ -8.8.8.8 1.1.1.1 0.0256253844 922c392f d1e4cc1c