Fix circular dependency in include

JeffersonLab · Nov 3, 2017 · 0037a39 · 0037a39
1 parent 4be4ae7
commit 0037a39
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 *.jar
 *.log
 *.o
+*.orig
 *.rar
 *.so
 *.sql
@@ -17,17 +18,13 @@
 *.zip
 *autom4te.cache*
 *~
+._*
+.deps
+.deps/
 .DS_Store
 .DS_Store?
 .Spotlight-V100
 .Trashes
-._*
-.deps
-.deps/
-INSTALL
-Makefile
-Makefile.in
-Thumbs.db
 \#*\#
 aclocal.m4
 autom4te.cache*
@@ -49,11 +46,15 @@ include/qphix/qphix_config_internal.h
 include/qphix/qphix_config_internal.h.in
 include/qphix/stamp-h1
 include4git
+INSTALL
 lib/libqphix_solver.a
 lib4git
+Makefile
+Makefile.in
 stamp-h1
 tests/ipo_out.optrpt
 tests/t_dslash
 tests/t_minvcg
 tests/time_clov_noqdp
 tests/time_dslash_noqdp
+Thumbs.db
diff --git a/tests-gtest/CMakeLists.txt b/tests-gtest/CMakeLists.txt
@@ -3,6 +3,8 @@
 # Include GTest Headers
 include_directories(${PROJECT_SOURCE_DIR}/external)
 
+include_directories(${PROJECT_SOURCE_DIR})
+
 if( ${testing})
   if ( ${QDPXX_CXX_FOUND} )
      add_library(gtestlib STATIC process_args.cc random_gauge.cc qdpxx_test_env.cc)

diff --git a/tests-gtest/a_imugamma5.cc b/tests-gtest/a_imugamma5.cc
@@ -8,7 +8,7 @@
 #include <qdp.h>
 #include <qphix/blas_new_c.h>
 
-#include "../tests/compare_qdp_spinors.h"
+#include "../tests/compare_qdp_spinors_gtest.h"
 
 #include <cmath>
 

diff --git a/tests-gtest/clover_product.cc b/tests-gtest/clover_product.cc
@@ -8,6 +8,7 @@ using namespace QPhiX;
 #include "../tests/tolerance.h"
 #include "../tests/clover_fermact_params_w.h"
 #include "../tests/clover_term.h"
+#include "../tests/compare_qdp_spinors_gtest.h"
 
 #include <qphix/clover.h>
 #include <qphix/clover_product.h>
@@ -17,8 +18,6 @@ using namespace QPhiX;
 #include <qphix/wilson.h>
 
 #include <qdp.h>
-#include <gtest/gtest.h>
-#include "../tests/compare_qdp_spinors.h"
 
 #include <iostream>
 

diff --git a/tests-gtest/compare_spinors.h b/tests-gtest/compare_spinors.h
diff --git a/tests-gtest/ndtm_herm.cc b/tests-gtest/ndtm_herm.cc
@@ -6,6 +6,7 @@ using namespace QPhiX;
 
 #include "../tests/veclen.h"
 #include "../tests/tolerance.h"
+#include "../tests/compare_qdp_spinors_gtest.h"
 
 #include <qphix/blas_new_c.h>
 #include <qphix/ndtm_reuse_operator.h>
@@ -15,9 +16,7 @@ using namespace QPhiX;
 #include <qphix/wilson.h>
 
 #include <qdp.h>
-#include <gtest/gtest.h>
 
-#include "../tests/compare_qdp_spinors.h"
 
 #include <iostream>
 #include <vector>

diff --git a/tests-gtest/random_gauge.cc b/tests-gtest/random_gauge.cc
@@ -1,7 +1,6 @@
-#include <gtest/gtest.h>
-
 #include "../tests/RandomGauge.h"
-#include "../tests/compare_qdp_spinors.h"
+#include "../tests/compare_qdp_spinors_gtest.h"
+
 #include <qphix/qphix_cli_args.h>
 
 using namespace QPhiX;

diff --git a/tests-gtest/richardson_cg.cc b/tests-gtest/richardson_cg.cc
@@ -3,15 +3,14 @@
   outer solver.
   */
 
-#include <gtest/gtest.h>
 #include <qphix/blas_new_c.h>
 #include <qdp.h>
 #include <qphix/qphix_cli_args.h>
 #include <qphix/clover.h>
 #include <qphix/invcg.h>
 #include <qphix/inv_richardson_multiprec.h>
 
-#include "../tests/compare_qdp_spinors.h"
+#include "../tests/compare_qdp_spinors_gtest.h"
 #include "../tests/RandomGauge.h"
 #include "../tests/veclen.h"
 

diff --git a/tests/compare_qdp_spinors.h b/tests/compare_qdp_spinors.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#if !defined(COMPARE_QDP_SPINORS_GTEST) && !defined(COMPARE_QDP_SPINORS_CUSTOM)
+#error "This header must not be included directly, use the versions with _gtest or _custom in their filename."
+#endif
+
 #include <qphix/geometry.h>
 #include <qphix/print_utils.h>
 #include <qphix/qdp_packer.h>

diff --git a/tests/compare_qdp_spinors_custom.h b/tests/compare_qdp_spinors_custom.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define COMPARE_QDP_SPINORS_CUSTOM
+#include "compare_qdp_spinors.h"
+#undef COMPARE_QDP_SPINORS_CUSTOM
diff --git a/tests/compare_qdp_spinors_gtest.h b/tests/compare_qdp_spinors_gtest.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <gtest/gtest.h>
+
+#define COMPARE_QDP_SPINORS_GTEST
+#include "tests/compare_qdp_spinors.h"
+#undef COMPARE_QDP_SPINORS_GTEST
diff --git a/tests/testClovDslashFull.cc b/tests/testClovDslashFull.cc
@@ -26,7 +26,7 @@ using namespace std;
 using namespace QPhiX;
 
 #include "RandomGauge.h"
-#include "compare_qdp_spinors.h"
+#include "compare_qdp_spinors_custom.h"
 #include "veclen.h"
 #include "tolerance.h"
 

diff --git a/tests/testDslashFull.cc b/tests/testDslashFull.cc
@@ -27,7 +27,7 @@ using namespace QPhiX;
 #include "veclen.h"
 #include "tolerance.h"
 #include "tparam_selector.h"
-#include "compare_qdp_spinors.h"
+#include "compare_qdp_spinors_custom.h"
 #include "RandomGauge.h"
 
 int Nx, Ny, Nz, Nt, Nxh;

diff --git a/tests/testMInvCG.cc b/tests/testMInvCG.cc
@@ -27,7 +27,7 @@ using namespace QPhiX;
 #include "veclen.h"
 #include "tolerance.h"
 #include "RandomGauge.h"
-#include "compare_qdp_spinors.h"
+#include "compare_qdp_spinors_custom.h"
 
 void TestMultishift::run()
 {

diff --git a/tests/testTWMCloverFull.cc b/tests/testTWMCloverFull.cc
@@ -26,7 +26,7 @@ using namespace QPhiX;
 
 #include "tolerance.h"
 #include "veclen.h"
-#include "compare_qdp_spinors.h"
+#include "compare_qdp_spinors_custom.h"
 #include "cli_args.h"
 #include "tparam_selector.h"
 #include "RandomGauge.h"

diff --git a/tests/testTWMDslashFull.cc b/tests/testTWMDslashFull.cc
@@ -33,7 +33,7 @@ using namespace QPhiX;
 #include "veclen.h"
 #include "tolerance.h"
 #include "tparam_selector.h"
-#include "compare_qdp_spinors.h"
+#include "compare_qdp_spinors_custom.h"
 
 int Nx, Ny, Nz, Nt, Nxh;
 bool verbose = true;