From 2b083ca987e8c4cccaa9a042c25e59b515080901 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Wed, 3 Jun 2015 10:54:03 +0100 Subject: [PATCH] CG test written and passes i.e. converges with small true residual in RedBlack MpcDagMpc, Unprec MdagM and Schur red black solver for each of. DomainWallFermion MobiusFermion MobiusZolotarevFermion ScaledShamirFermion ScaledShamirZolotarevFermion --- .../{Grid_comms.cc => Benchmark_comms.cc} | 0 benchmarks/{Grid_dwf.cc => Benchmark_dwf.cc} | 0 ...width.cc => Benchmark_memory_bandwidth.cc} | 0 benchmarks/{Grid_su3.cc => Benchmark_su3.cc} | 0 ...Grid_su3_expr.cc => Benchmark_su3_expr.cc} | 0 ...Grid_su3_test.cc => Benchmark_su3_test.cc} | 0 .../{Grid_wilson.cc => Benchmark_wilson.cc} | 0 benchmarks/Makefile.am | 30 ++-- tests/Makefile.am | 121 ++++++------- tests/{Grid_cshift.cc => Test_cshift.cc} | 0 ..._red_black.cc => Test_cshift_red_black.cc} | 0 ...rid_dwf_cg_prec.cc => Test_dwf_cg_prec.cc} | 0 ...d_dwf_cg_schur.cc => Test_dwf_cg_schur.cc} | 0 ...dwf_cg_unprec.cc => Test_dwf_cg_unprec.cc} | 0 ...d_dwf_even_odd.cc => Test_dwf_even_odd.cc} | 0 tests/{Grid_gamma.cc => Test_gamma.cc} | 0 tests/{Grid_main.cc => Test_main.cc} | 0 tests/Test_many_cg.cc | 164 ++++++++++++++++++ ...id_any_evenodd.cc => Test_many_evenodd.cc} | 0 tests/{Grid_nersc_io.cc => Test_nersc_io.cc} | 0 tests/{Grid_remez.cc => Test_remez.cc} | 0 tests/{Grid_rng.cc => Test_rng.cc} | 0 .../{Grid_rng_fixed.cc => Test_rng_fixed.cc} | 0 tests/{Grid_simd.cc => Test_simd.cc} | 0 tests/{Grid_simd_new.cc => Test_simd_new.cc} | 0 tests/{Grid_stencil.cc => Test_stencil.cc} | 0 ...lson_cg_prec.cc => Test_wilson_cg_prec.cc} | 0 ...on_cg_schur.cc => Test_wilson_cg_schur.cc} | 0 ..._cg_unprec.cc => Test_wilson_cg_unprec.cc} | 0 ...lson_evenodd.cc => Test_wilson_evenodd.cc} | 0 30 files changed, 241 insertions(+), 74 deletions(-) rename benchmarks/{Grid_comms.cc => Benchmark_comms.cc} (100%) rename benchmarks/{Grid_dwf.cc => Benchmark_dwf.cc} (100%) rename benchmarks/{Grid_memory_bandwidth.cc => Benchmark_memory_bandwidth.cc} (100%) rename benchmarks/{Grid_su3.cc => Benchmark_su3.cc} (100%) rename benchmarks/{Grid_su3_expr.cc => Benchmark_su3_expr.cc} (100%) rename benchmarks/{Grid_su3_test.cc => Benchmark_su3_test.cc} (100%) rename benchmarks/{Grid_wilson.cc => Benchmark_wilson.cc} (100%) rename tests/{Grid_cshift.cc => Test_cshift.cc} (100%) rename tests/{Grid_cshift_red_black.cc => Test_cshift_red_black.cc} (100%) rename tests/{Grid_dwf_cg_prec.cc => Test_dwf_cg_prec.cc} (100%) rename tests/{Grid_dwf_cg_schur.cc => Test_dwf_cg_schur.cc} (100%) rename tests/{Grid_dwf_cg_unprec.cc => Test_dwf_cg_unprec.cc} (100%) rename tests/{Grid_dwf_even_odd.cc => Test_dwf_even_odd.cc} (100%) rename tests/{Grid_gamma.cc => Test_gamma.cc} (100%) rename tests/{Grid_main.cc => Test_main.cc} (100%) create mode 100644 tests/Test_many_cg.cc rename tests/{Grid_any_evenodd.cc => Test_many_evenodd.cc} (100%) rename tests/{Grid_nersc_io.cc => Test_nersc_io.cc} (100%) rename tests/{Grid_remez.cc => Test_remez.cc} (100%) rename tests/{Grid_rng.cc => Test_rng.cc} (100%) rename tests/{Grid_rng_fixed.cc => Test_rng_fixed.cc} (100%) rename tests/{Grid_simd.cc => Test_simd.cc} (100%) rename tests/{Grid_simd_new.cc => Test_simd_new.cc} (100%) rename tests/{Grid_stencil.cc => Test_stencil.cc} (100%) rename tests/{Grid_wilson_cg_prec.cc => Test_wilson_cg_prec.cc} (100%) rename tests/{Grid_wilson_cg_schur.cc => Test_wilson_cg_schur.cc} (100%) rename tests/{Grid_wilson_cg_unprec.cc => Test_wilson_cg_unprec.cc} (100%) rename tests/{Grid_wilson_evenodd.cc => Test_wilson_evenodd.cc} (100%) diff --git a/benchmarks/Grid_comms.cc b/benchmarks/Benchmark_comms.cc similarity index 100% rename from benchmarks/Grid_comms.cc rename to benchmarks/Benchmark_comms.cc diff --git a/benchmarks/Grid_dwf.cc b/benchmarks/Benchmark_dwf.cc similarity index 100% rename from benchmarks/Grid_dwf.cc rename to benchmarks/Benchmark_dwf.cc diff --git a/benchmarks/Grid_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc similarity index 100% rename from benchmarks/Grid_memory_bandwidth.cc rename to benchmarks/Benchmark_memory_bandwidth.cc diff --git a/benchmarks/Grid_su3.cc b/benchmarks/Benchmark_su3.cc similarity index 100% rename from benchmarks/Grid_su3.cc rename to benchmarks/Benchmark_su3.cc diff --git a/benchmarks/Grid_su3_expr.cc b/benchmarks/Benchmark_su3_expr.cc similarity index 100% rename from benchmarks/Grid_su3_expr.cc rename to benchmarks/Benchmark_su3_expr.cc diff --git a/benchmarks/Grid_su3_test.cc b/benchmarks/Benchmark_su3_test.cc similarity index 100% rename from benchmarks/Grid_su3_test.cc rename to benchmarks/Benchmark_su3_test.cc diff --git a/benchmarks/Grid_wilson.cc b/benchmarks/Benchmark_wilson.cc similarity index 100% rename from benchmarks/Grid_wilson.cc rename to benchmarks/Benchmark_wilson.cc diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index e1e092f4..74ff03c6 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -6,24 +6,24 @@ AM_LDFLAGS = -L$(top_builddir)/lib # Test code # bin_PROGRAMS = \ - Grid_comms \ - Grid_memory_bandwidth \ - Grid_su3 \ - Grid_wilson \ - Grid_dwf + Benchmark_comms \ + Benchmark_memory_bandwidth \ + Benchmark_su3 \ + Benchmark_wilson \ + Benchmark_dwf -Grid_comms_SOURCES = Grid_comms.cc -Grid_comms_LDADD = -lGrid +Benchmark_comms_SOURCES = Benchmark_comms.cc +Benchmark_comms_LDADD = -lGrid -Grid_memory_bandwidth_SOURCES = Grid_memory_bandwidth.cc -Grid_memory_bandwidth_LDADD = -lGrid +Benchmark_memory_bandwidth_SOURCES = Benchmark_memory_bandwidth.cc +Benchmark_memory_bandwidth_LDADD = -lGrid -Grid_su3_SOURCES = Grid_su3.cc Grid_su3_test.cc Grid_su3_expr.cc -Grid_su3_LDADD = -lGrid +Benchmark_su3_SOURCES = Benchmark_su3.cc Benchmark_su3_test.cc Benchmark_su3_expr.cc +Benchmark_su3_LDADD = -lGrid -Grid_wilson_SOURCES = Grid_wilson.cc -Grid_wilson_LDADD = -lGrid +Benchmark_wilson_SOURCES = Benchmark_wilson.cc +Benchmark_wilson_LDADD = -lGrid -Grid_dwf_SOURCES = Grid_dwf.cc -Grid_dwf_LDADD = -lGrid +Benchmark_dwf_SOURCES = Benchmark_dwf.cc +Benchmark_dwf_LDADD = -lGrid diff --git a/tests/Makefile.am b/tests/Makefile.am index f8f5df29..bb3448f1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,85 +5,88 @@ AM_LDFLAGS = -L$(top_builddir)/lib # # Test code # -bin_PROGRAMS = Grid_main \ - Grid_simd \ - Grid_gamma \ - Grid_cshift \ - Grid_cshift_red_black \ - Grid_stencil \ - Grid_nersc_io \ - Grid_rng \ - Grid_remez \ - Grid_rng_fixed \ - Grid_wilson_evenodd \ - Grid_wilson_cg_unprec \ - Grid_wilson_cg_prec \ - Grid_wilson_cg_schur \ - Grid_dwf_even_odd\ - Grid_dwf_cg_unprec\ - Grid_dwf_cg_prec\ - Grid_dwf_cg_schur\ - Grid_any_evenodd +bin_PROGRAMS = Test_main \ + Test_simd \ + Test_gamma \ + Test_cshift \ + Test_cshift_red_black \ + Test_stencil \ + Test_nersc_io \ + Test_rng \ + Test_remez \ + Test_rng_fixed \ + Test_wilson_evenodd \ + Test_wilson_cg_unprec \ + Test_wilson_cg_prec \ + Test_wilson_cg_schur \ + Test_dwf_even_odd\ + Test_dwf_cg_unprec\ + Test_dwf_cg_prec\ + Test_dwf_cg_schur\ + Test_many_evenodd\ + Test_many_cg -Grid_main_SOURCES = Grid_main.cc -Grid_main_LDADD = -lGrid +Test_main_SOURCES = Test_main.cc +Test_main_LDADD = -lGrid -Grid_rng_SOURCES = Grid_rng.cc -Grid_rng_LDADD = -lGrid +Test_rng_SOURCES = Test_rng.cc +Test_rng_LDADD = -lGrid -Grid_rng_fixed_SOURCES = Grid_rng_fixed.cc -Grid_rng_fixed_LDADD = -lGrid +Test_rng_fixed_SOURCES = Test_rng_fixed.cc +Test_rng_fixed_LDADD = -lGrid -Grid_remez_SOURCES = Grid_remez.cc -Grid_remez_LDADD = -lGrid +Test_remez_SOURCES = Test_remez.cc +Test_remez_LDADD = -lGrid -Grid_nersc_io_SOURCES = Grid_nersc_io.cc -Grid_nersc_io_LDADD = -lGrid +Test_nersc_io_SOURCES = Test_nersc_io.cc +Test_nersc_io_LDADD = -lGrid -Grid_cshift_SOURCES = Grid_cshift.cc -Grid_cshift_LDADD = -lGrid +Test_cshift_SOURCES = Test_cshift.cc +Test_cshift_LDADD = -lGrid -Grid_cshift_red_black_SOURCES = Grid_cshift_red_black.cc -Grid_cshift_red_black_LDADD = -lGrid +Test_cshift_red_black_SOURCES = Test_cshift_red_black.cc +Test_cshift_red_black_LDADD = -lGrid -Grid_gamma_SOURCES = Grid_gamma.cc -Grid_gamma_LDADD = -lGrid +Test_gamma_SOURCES = Test_gamma.cc +Test_gamma_LDADD = -lGrid -Grid_stencil_SOURCES = Grid_stencil.cc -Grid_stencil_LDADD = -lGrid +Test_stencil_SOURCES = Test_stencil.cc +Test_stencil_LDADD = -lGrid -Grid_simd_SOURCES = Grid_simd.cc -Grid_simd_LDADD = -lGrid +Test_simd_SOURCES = Test_simd.cc +Test_simd_LDADD = -lGrid -#Grid_simd_new_SOURCES = Grid_simd_new.cc -#Grid_simd_new_LDADD = -lGrid +#Test_simd_new_SOURCES = Test_simd_new.cc +#Test_simd_new_LDADD = -lGrid -Grid_wilson_evenodd_SOURCES = Grid_wilson_evenodd.cc -Grid_wilson_evenodd_LDADD = -lGrid +Test_wilson_evenodd_SOURCES = Test_wilson_evenodd.cc +Test_wilson_evenodd_LDADD = -lGrid -Grid_any_evenodd_SOURCES = Grid_any_evenodd.cc -Grid_any_evenodd_LDADD = -lGrid +Test_wilson_cg_unprec_SOURCES = Test_wilson_cg_unprec.cc +Test_wilson_cg_unprec_LDADD = -lGrid -Grid_wilson_cg_unprec_SOURCES = Grid_wilson_cg_unprec.cc -Grid_wilson_cg_unprec_LDADD = -lGrid +Test_wilson_cg_prec_SOURCES = Test_wilson_cg_prec.cc +Test_wilson_cg_prec_LDADD = -lGrid -Grid_wilson_cg_prec_SOURCES = Grid_wilson_cg_prec.cc -Grid_wilson_cg_prec_LDADD = -lGrid +Test_wilson_cg_schur_SOURCES = Test_wilson_cg_schur.cc +Test_wilson_cg_schur_LDADD = -lGrid -Grid_wilson_cg_schur_SOURCES = Grid_wilson_cg_schur.cc -Grid_wilson_cg_schur_LDADD = -lGrid +Test_dwf_even_odd_SOURCES = Test_dwf_even_odd.cc +Test_dwf_even_odd_LDADD = -lGrid -Grid_dwf_even_odd_SOURCES = Grid_dwf_even_odd.cc -Grid_dwf_even_odd_LDADD = -lGrid +Test_dwf_cg_unprec_SOURCES = Test_dwf_cg_unprec.cc +Test_dwf_cg_unprec_LDADD = -lGrid -Grid_dwf_cg_unprec_SOURCES = Grid_dwf_cg_unprec.cc -Grid_dwf_cg_unprec_LDADD = -lGrid +Test_dwf_cg_prec_SOURCES = Test_dwf_cg_prec.cc +Test_dwf_cg_prec_LDADD = -lGrid -Grid_dwf_cg_prec_SOURCES = Grid_dwf_cg_prec.cc -Grid_dwf_cg_prec_LDADD = -lGrid +Test_dwf_cg_schur_SOURCES = Test_dwf_cg_schur.cc +Test_dwf_cg_schur_LDADD = -lGrid -Grid_dwf_cg_schur_SOURCES = Grid_dwf_cg_schur.cc -Grid_dwf_cg_schur_LDADD = -lGrid +Test_many_evenodd_SOURCES = Test_many_evenodd.cc +Test_many_evenodd_LDADD = -lGrid +Test_many_cg_SOURCES = Test_many_cg.cc +Test_many_cg_LDADD = -lGrid diff --git a/tests/Grid_cshift.cc b/tests/Test_cshift.cc similarity index 100% rename from tests/Grid_cshift.cc rename to tests/Test_cshift.cc diff --git a/tests/Grid_cshift_red_black.cc b/tests/Test_cshift_red_black.cc similarity index 100% rename from tests/Grid_cshift_red_black.cc rename to tests/Test_cshift_red_black.cc diff --git a/tests/Grid_dwf_cg_prec.cc b/tests/Test_dwf_cg_prec.cc similarity index 100% rename from tests/Grid_dwf_cg_prec.cc rename to tests/Test_dwf_cg_prec.cc diff --git a/tests/Grid_dwf_cg_schur.cc b/tests/Test_dwf_cg_schur.cc similarity index 100% rename from tests/Grid_dwf_cg_schur.cc rename to tests/Test_dwf_cg_schur.cc diff --git a/tests/Grid_dwf_cg_unprec.cc b/tests/Test_dwf_cg_unprec.cc similarity index 100% rename from tests/Grid_dwf_cg_unprec.cc rename to tests/Test_dwf_cg_unprec.cc diff --git a/tests/Grid_dwf_even_odd.cc b/tests/Test_dwf_even_odd.cc similarity index 100% rename from tests/Grid_dwf_even_odd.cc rename to tests/Test_dwf_even_odd.cc diff --git a/tests/Grid_gamma.cc b/tests/Test_gamma.cc similarity index 100% rename from tests/Grid_gamma.cc rename to tests/Test_gamma.cc diff --git a/tests/Grid_main.cc b/tests/Test_main.cc similarity index 100% rename from tests/Grid_main.cc rename to tests/Test_main.cc diff --git a/tests/Test_many_cg.cc b/tests/Test_many_cg.cc new file mode 100644 index 00000000..3241a025 --- /dev/null +++ b/tests/Test_many_cg.cc @@ -0,0 +1,164 @@ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +template +struct scal { + d internal; +}; + + Gamma::GammaMatrix Gmu [] = { + Gamma::GammaX, + Gamma::GammaY, + Gamma::GammaZ, + Gamma::GammaT + }; + +template +void TestCGinversions(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5); +template +void TestCGschur(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5); + +template +void TestCGunprec(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5); + +template +void TestCGprec(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5); + +int main (int argc, char ** argv) +{ + Grid_init(&argc,&argv); + + int threads = GridThread::GetThreads(); + std::cout << "Grid is setup to use "< seeds4({1,2,3,4}); + std::vector seeds5({5,6,7,8}); + GridParallelRNG RNG5(FGrid); RNG5.SeedFixedIntegers(seeds5); + GridParallelRNG RNG4(UGrid); RNG4.SeedFixedIntegers(seeds4); + + LatticeGaugeField Umu(UGrid); random(RNG4,Umu); + std::vector U(4,UGrid); + + RealD mass=0.1; + RealD M5 =1.8; + std::cout <<"DomainWallFermion test"<(Ddwf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + + RealD b=1.5;// Scale factor b+c=2, b-c=1 + RealD c=0.5; + std::cout <<"MobiusFermion test"<(Dmob,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + + std::cout <<"MobiusZolotarevFermion test"<(Dzolo,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + + std::cout <<"ScaledShamirFermion test"<(Dsham,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + + std::cout <<"ScaledShamirZolotarevFermion test"<(Dshamz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + + Grid_finalize(); +} +template +void TestCGinversions(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5) +{ + std::cout << "Testing unpreconditioned inverter"<(Ddwf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,RNG4,RNG5); + std::cout << "Testing red black preconditioned inverter"<(Ddwf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,RNG4,RNG5); + std::cout << "Testing red black Schur inverter"<(Ddwf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,RNG4,RNG5); +} + +template +void TestCGunprec(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5) +{ + LatticeFermion src (FGrid); random(*RNG5,src); + LatticeFermion result(FGrid); result=zero; + + HermitianOperator HermOp(Ddwf); + ConjugateGradient CG(1.0e-8,10000); + CG(HermOp,src,result); + +} +template +void TestCGprec(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5) +{ + LatticeFermion src (FGrid); random(*RNG5,src); + LatticeFermion src_o(FrbGrid); + LatticeFermion result_o(FrbGrid); + pickCheckerboard(Odd,src_o,src); + result_o=zero; + + HermitianCheckerBoardedOperator HermOpEO(Ddwf); + ConjugateGradient CG(1.0e-8,10000); + CG(HermOpEO,src_o,result_o); +} + + +template +void TestCGschur(What & Ddwf, + GridCartesian * FGrid, GridRedBlackCartesian * FrbGrid, + GridCartesian * UGrid, GridRedBlackCartesian * UrbGrid, + RealD mass, RealD M5, + GridParallelRNG *RNG4, + GridParallelRNG *RNG5) +{ + LatticeFermion src (FGrid); random(*RNG5,src); + LatticeFermion result(FGrid); result=zero; + + ConjugateGradient CG(1.0e-8,10000); + SchurRedBlackSolve SchurSolver(CG); + SchurSolver(Ddwf,src,result); +} diff --git a/tests/Grid_any_evenodd.cc b/tests/Test_many_evenodd.cc similarity index 100% rename from tests/Grid_any_evenodd.cc rename to tests/Test_many_evenodd.cc diff --git a/tests/Grid_nersc_io.cc b/tests/Test_nersc_io.cc similarity index 100% rename from tests/Grid_nersc_io.cc rename to tests/Test_nersc_io.cc diff --git a/tests/Grid_remez.cc b/tests/Test_remez.cc similarity index 100% rename from tests/Grid_remez.cc rename to tests/Test_remez.cc diff --git a/tests/Grid_rng.cc b/tests/Test_rng.cc similarity index 100% rename from tests/Grid_rng.cc rename to tests/Test_rng.cc diff --git a/tests/Grid_rng_fixed.cc b/tests/Test_rng_fixed.cc similarity index 100% rename from tests/Grid_rng_fixed.cc rename to tests/Test_rng_fixed.cc diff --git a/tests/Grid_simd.cc b/tests/Test_simd.cc similarity index 100% rename from tests/Grid_simd.cc rename to tests/Test_simd.cc diff --git a/tests/Grid_simd_new.cc b/tests/Test_simd_new.cc similarity index 100% rename from tests/Grid_simd_new.cc rename to tests/Test_simd_new.cc diff --git a/tests/Grid_stencil.cc b/tests/Test_stencil.cc similarity index 100% rename from tests/Grid_stencil.cc rename to tests/Test_stencil.cc diff --git a/tests/Grid_wilson_cg_prec.cc b/tests/Test_wilson_cg_prec.cc similarity index 100% rename from tests/Grid_wilson_cg_prec.cc rename to tests/Test_wilson_cg_prec.cc diff --git a/tests/Grid_wilson_cg_schur.cc b/tests/Test_wilson_cg_schur.cc similarity index 100% rename from tests/Grid_wilson_cg_schur.cc rename to tests/Test_wilson_cg_schur.cc diff --git a/tests/Grid_wilson_cg_unprec.cc b/tests/Test_wilson_cg_unprec.cc similarity index 100% rename from tests/Grid_wilson_cg_unprec.cc rename to tests/Test_wilson_cg_unprec.cc diff --git a/tests/Grid_wilson_evenodd.cc b/tests/Test_wilson_evenodd.cc similarity index 100% rename from tests/Grid_wilson_evenodd.cc rename to tests/Test_wilson_evenodd.cc