From 494d2b8b61b008b411389e23380c8bb2400c8e20 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Tue, 2 Jun 2015 17:25:26 +0100 Subject: [PATCH] Reorg; moving prec/unprec/schur CG for Wilson and DWF into tests as these are really tests and not benchmarks (no performance reports, only convergence test). --- benchmarks/Makefile.am | 39 ++------------- {benchmarks => tests}/Grid_dwf_cg_prec.cc | 0 {benchmarks => tests}/Grid_dwf_cg_schur.cc | 0 {benchmarks => tests}/Grid_dwf_cg_unprec.cc | 0 {benchmarks => tests}/Grid_dwf_even_odd.cc | 0 {benchmarks => tests}/Grid_wilson_cg_prec.cc | 0 {benchmarks => tests}/Grid_wilson_cg_schur.cc | 0 .../Grid_wilson_cg_unprec.cc | 0 {benchmarks => tests}/Grid_wilson_evenodd.cc | 0 tests/Makefile.am | 50 ++++++++++++++++++- 10 files changed, 52 insertions(+), 37 deletions(-) rename {benchmarks => tests}/Grid_dwf_cg_prec.cc (100%) rename {benchmarks => tests}/Grid_dwf_cg_schur.cc (100%) rename {benchmarks => tests}/Grid_dwf_cg_unprec.cc (100%) rename {benchmarks => tests}/Grid_dwf_even_odd.cc (100%) rename {benchmarks => tests}/Grid_wilson_cg_prec.cc (100%) rename {benchmarks => tests}/Grid_wilson_cg_schur.cc (100%) rename {benchmarks => tests}/Grid_wilson_cg_unprec.cc (100%) rename {benchmarks => tests}/Grid_wilson_evenodd.cc (100%) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index e92f2e84..e1e092f4 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -10,53 +10,20 @@ bin_PROGRAMS = \ Grid_memory_bandwidth \ Grid_su3 \ Grid_wilson \ - Grid_wilson_evenodd \ - Grid_wilson_cg_unprec \ - Grid_wilson_cg_prec \ - Grid_wilson_cg_schur \ - Grid_dwf\ - Grid_dwf_even_odd\ - Grid_dwf_cg_unprec\ - Grid_dwf_cg_prec\ - Grid_dwf_cg_schur + Grid_dwf Grid_comms_SOURCES = Grid_comms.cc Grid_comms_LDADD = -lGrid -Grid_su3_SOURCES = Grid_su3.cc Grid_su3_test.cc Grid_su3_expr.cc -Grid_su3_LDADD = -lGrid - Grid_memory_bandwidth_SOURCES = Grid_memory_bandwidth.cc Grid_memory_bandwidth_LDADD = -lGrid +Grid_su3_SOURCES = Grid_su3.cc Grid_su3_test.cc Grid_su3_expr.cc +Grid_su3_LDADD = -lGrid Grid_wilson_SOURCES = Grid_wilson.cc Grid_wilson_LDADD = -lGrid -Grid_wilson_evenodd_SOURCES = Grid_wilson_evenodd.cc -Grid_wilson_evenodd_LDADD = -lGrid - -Grid_wilson_cg_unprec_SOURCES = Grid_wilson_cg_unprec.cc -Grid_wilson_cg_unprec_LDADD = -lGrid - -Grid_wilson_cg_prec_SOURCES = Grid_wilson_cg_prec.cc -Grid_wilson_cg_prec_LDADD = -lGrid - -Grid_wilson_cg_schur_SOURCES = Grid_wilson_cg_schur.cc -Grid_wilson_cg_schur_LDADD = -lGrid - Grid_dwf_SOURCES = Grid_dwf.cc Grid_dwf_LDADD = -lGrid -Grid_dwf_even_odd_SOURCES = Grid_dwf_even_odd.cc -Grid_dwf_even_odd_LDADD = -lGrid - -Grid_dwf_cg_unprec_SOURCES = Grid_dwf_cg_unprec.cc -Grid_dwf_cg_unprec_LDADD = -lGrid - -Grid_dwf_cg_prec_SOURCES = Grid_dwf_cg_prec.cc -Grid_dwf_cg_prec_LDADD = -lGrid - -Grid_dwf_cg_schur_SOURCES = Grid_dwf_cg_schur.cc -Grid_dwf_cg_schur_LDADD = -lGrid - diff --git a/benchmarks/Grid_dwf_cg_prec.cc b/tests/Grid_dwf_cg_prec.cc similarity index 100% rename from benchmarks/Grid_dwf_cg_prec.cc rename to tests/Grid_dwf_cg_prec.cc diff --git a/benchmarks/Grid_dwf_cg_schur.cc b/tests/Grid_dwf_cg_schur.cc similarity index 100% rename from benchmarks/Grid_dwf_cg_schur.cc rename to tests/Grid_dwf_cg_schur.cc diff --git a/benchmarks/Grid_dwf_cg_unprec.cc b/tests/Grid_dwf_cg_unprec.cc similarity index 100% rename from benchmarks/Grid_dwf_cg_unprec.cc rename to tests/Grid_dwf_cg_unprec.cc diff --git a/benchmarks/Grid_dwf_even_odd.cc b/tests/Grid_dwf_even_odd.cc similarity index 100% rename from benchmarks/Grid_dwf_even_odd.cc rename to tests/Grid_dwf_even_odd.cc diff --git a/benchmarks/Grid_wilson_cg_prec.cc b/tests/Grid_wilson_cg_prec.cc similarity index 100% rename from benchmarks/Grid_wilson_cg_prec.cc rename to tests/Grid_wilson_cg_prec.cc diff --git a/benchmarks/Grid_wilson_cg_schur.cc b/tests/Grid_wilson_cg_schur.cc similarity index 100% rename from benchmarks/Grid_wilson_cg_schur.cc rename to tests/Grid_wilson_cg_schur.cc diff --git a/benchmarks/Grid_wilson_cg_unprec.cc b/tests/Grid_wilson_cg_unprec.cc similarity index 100% rename from benchmarks/Grid_wilson_cg_unprec.cc rename to tests/Grid_wilson_cg_unprec.cc diff --git a/benchmarks/Grid_wilson_evenodd.cc b/tests/Grid_wilson_evenodd.cc similarity index 100% rename from benchmarks/Grid_wilson_evenodd.cc rename to tests/Grid_wilson_evenodd.cc diff --git a/tests/Makefile.am b/tests/Makefile.am index 7ef4eb1f..6f92a94d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,30 @@ AM_LDFLAGS = -L$(top_builddir)/lib # # Test code # -bin_PROGRAMS = Grid_main Grid_stencil Grid_nersc_io Grid_cshift Grid_gamma Grid_simd Grid_rng Grid_remez Grid_rng_fixed Grid_cshift_red_black +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 + +test: + for f in $bin_PROGRAMS + do + ./$f > $f.log + done Grid_main_SOURCES = Grid_main.cc Grid_main_LDADD = -lGrid @@ -39,3 +62,28 @@ Grid_simd_LDADD = -lGrid #Grid_simd_new_SOURCES = Grid_simd_new.cc #Grid_simd_new_LDADD = -lGrid + +Grid_wilson_evenodd_SOURCES = Grid_wilson_evenodd.cc +Grid_wilson_evenodd_LDADD = -lGrid + +Grid_wilson_cg_unprec_SOURCES = Grid_wilson_cg_unprec.cc +Grid_wilson_cg_unprec_LDADD = -lGrid + +Grid_wilson_cg_prec_SOURCES = Grid_wilson_cg_prec.cc +Grid_wilson_cg_prec_LDADD = -lGrid + +Grid_wilson_cg_schur_SOURCES = Grid_wilson_cg_schur.cc +Grid_wilson_cg_schur_LDADD = -lGrid + +Grid_dwf_even_odd_SOURCES = Grid_dwf_even_odd.cc +Grid_dwf_even_odd_LDADD = -lGrid + +Grid_dwf_cg_unprec_SOURCES = Grid_dwf_cg_unprec.cc +Grid_dwf_cg_unprec_LDADD = -lGrid + +Grid_dwf_cg_prec_SOURCES = Grid_dwf_cg_prec.cc +Grid_dwf_cg_prec_LDADD = -lGrid + +Grid_dwf_cg_schur_SOURCES = Grid_dwf_cg_schur.cc +Grid_dwf_cg_schur_LDADD = -lGrid +