From 9fe6ac71eab8e0876f1fac6e8d753663d72bcfc7 Mon Sep 17 00:00:00 2001 From: paboyle Date: Wed, 11 Oct 2017 10:12:07 +0100 Subject: [PATCH] Starting reorg of Blocked lanczos --- configure.ac | 1 + .../BlockImplicitlyRestartedLanczos.h | 1 - tests/Makefile.am | 2 +- .../lanczos}/FieldVectorIO.h | 0 tests/lanczos/Makefile.am | 1 + tests/{solver => lanczos}/Params.h | 0 tests/{solver => lanczos}/Test_dwf_compressed_lanczos.cc | 4 ++-- tests/{solver => lanczos}/Test_dwf_lanczos.cc | 0 tests/{debug => lanczos}/Test_synthetic_lanczos.cc | 0 tests/{solver => lanczos}/Test_wilson_lanczos.cc | 0 10 files changed, 5 insertions(+), 4 deletions(-) rename {lib/algorithms/iterative/BlockImplicitlyRestartedLanczos => tests/lanczos}/FieldVectorIO.h (100%) create mode 100644 tests/lanczos/Makefile.am rename tests/{solver => lanczos}/Params.h (100%) rename tests/{solver => lanczos}/Test_dwf_compressed_lanczos.cc (99%) rename tests/{solver => lanczos}/Test_dwf_lanczos.cc (100%) rename tests/{debug => lanczos}/Test_synthetic_lanczos.cc (100%) rename tests/{solver => lanczos}/Test_wilson_lanczos.cc (100%) diff --git a/configure.ac b/configure.ac index b11d6b42..496f7fd7 100644 --- a/configure.ac +++ b/configure.ac @@ -550,6 +550,7 @@ AC_CONFIG_FILES(tests/forces/Makefile) AC_CONFIG_FILES(tests/hadrons/Makefile) AC_CONFIG_FILES(tests/hmc/Makefile) AC_CONFIG_FILES(tests/solver/Makefile) +AC_CONFIG_FILES(tests/lanczos/Makefile) AC_CONFIG_FILES(tests/smearing/Makefile) AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(tests/testu01/Makefile) diff --git a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h index 82a00efa..55a85552 100644 --- a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h +++ b/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h @@ -39,7 +39,6 @@ Author: Christoph Lehner #include #include #include -#include namespace Grid { diff --git a/tests/Makefile.am b/tests/Makefile.am index a8935268..7928a7fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . core forces hmc solver debug smearing IO +SUBDIRS = . core forces hmc solver debug smearing IO lanczos if BUILD_CHROMA_REGRESSION SUBDIRS+= qdpxx diff --git a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldVectorIO.h b/tests/lanczos/FieldVectorIO.h similarity index 100% rename from lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldVectorIO.h rename to tests/lanczos/FieldVectorIO.h diff --git a/tests/lanczos/Makefile.am b/tests/lanczos/Makefile.am new file mode 100644 index 00000000..60b82dd7 --- /dev/null +++ b/tests/lanczos/Makefile.am @@ -0,0 +1 @@ +include Make.inc diff --git a/tests/solver/Params.h b/tests/lanczos/Params.h similarity index 100% rename from tests/solver/Params.h rename to tests/lanczos/Params.h diff --git a/tests/solver/Test_dwf_compressed_lanczos.cc b/tests/lanczos/Test_dwf_compressed_lanczos.cc similarity index 99% rename from tests/solver/Test_dwf_compressed_lanczos.cc rename to tests/lanczos/Test_dwf_compressed_lanczos.cc index b42a2d55..7fe37387 100644 --- a/tests/solver/Test_dwf_compressed_lanczos.cc +++ b/tests/lanczos/Test_dwf_compressed_lanczos.cc @@ -21,9 +21,9 @@ (ortho krylov low poly); and then fix up lowest say 200 eigenvalues by 1 run with high-degree poly (600 could be enough) */ #include -#include "Params.h" - #include +#include "FieldVectorIO.h" +#include "Params.h" using namespace std; using namespace Grid; diff --git a/tests/solver/Test_dwf_lanczos.cc b/tests/lanczos/Test_dwf_lanczos.cc similarity index 100% rename from tests/solver/Test_dwf_lanczos.cc rename to tests/lanczos/Test_dwf_lanczos.cc diff --git a/tests/debug/Test_synthetic_lanczos.cc b/tests/lanczos/Test_synthetic_lanczos.cc similarity index 100% rename from tests/debug/Test_synthetic_lanczos.cc rename to tests/lanczos/Test_synthetic_lanczos.cc diff --git a/tests/solver/Test_wilson_lanczos.cc b/tests/lanczos/Test_wilson_lanczos.cc similarity index 100% rename from tests/solver/Test_wilson_lanczos.cc rename to tests/lanczos/Test_wilson_lanczos.cc