Merge branch 'feature/DD' into HEAD

lattice · Nov 7, 2024 · 7b88081 · 7b88081
2 parents 65fec21 + be72ab3
commit 7b88081
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/lib/dslash_wilson_clover.in.cu b/lib/dslash_wilson_clover.in.cu
@@ -7,7 +7,6 @@
 namespace quda
 {
 
-
   constexpr QudaPrecision precision = QUDA_@QUDA_DSLASH_PREC@_PRECISION;
   constexpr int nColor = @QUDA_DSLASH_NCOLOR@;
   constexpr int reconI = @QUDA_DSLASH_RECONI@;

diff --git a/lib/dslash_wilson_clover_distance.cu b/lib/dslash_wilson_clover_distance.cu
@@ -1,4 +1,6 @@
+#define SIGNATURE_ONLY
 #include <dslash_wilson_clover.hpp>
+#undef SIGNATURE_ONLY
 
 /**
    This is the Wilson-clover linear operator

diff --git a/lib/dslash_wilson_clover_preconditioned_distance.cu b/lib/dslash_wilson_clover_preconditioned_distance.cu
@@ -1,4 +1,6 @@
+#define SIGNATURE_ONLY
 #include <dslash_wilson_clover_preconditioned.hpp>
+#undef SIGNATURE_ONLY
 
 /**
    This is the Wilson-clover preconditioned linear operator

diff --git a/tests/staggered_eigensolve_test.cpp b/tests/staggered_eigensolve_test.cpp
@@ -114,7 +114,7 @@ void init()
   cpuFatMILC = GaugeField(cpuParam);
 
   cpuParam.link_type = QUDA_ASQTAD_LONG_LINKS;
-  cpuParam.nFace = 3;
+  cpuParam.nFace = dslash_type == QUDA_ASQTAD_DSLASH ? 3 : 1;
   cpuParam.order = QUDA_QDP_GAUGE_ORDER;
   cpuLongQDP = GaugeField(cpuParam);
   cpuParam.order = QUDA_MILC_GAUGE_ORDER;
@@ -127,7 +127,7 @@ void init()
 
   // Reorder gauge fields to MILC order
   cpuFatMILC = cpuFatQDP;
-  cpuLongMILC = cpuLongQDP;
+  if (dslash_type == QUDA_ASQTAD_DSLASH) cpuLongMILC = cpuLongQDP;
 
   // Compute plaquette. Routine is aware that the gauge fields already have the phases on them.
   // This needs to be called before `loadFatLongGaugeQuda` because this routine also loads the
@@ -148,10 +148,11 @@ void init()
 
   // now copy back to QDP aliases, since these are used for the reference dslash
   cpuFatQDP = cpuFatMILC;
-  cpuLongQDP = cpuLongMILC;
-  // ensure QDP alias has exchanged ghosts
   cpuFatQDP.exchangeGhost();
-  cpuLongQDP.exchangeGhost();
+  if (dslash_type == QUDA_ASQTAD_DSLASH) {
+    cpuLongQDP = cpuLongMILC;
+    cpuLongQDP.exchangeGhost();
+  }
 
   // Staggered Gauge construct END
   //-----------------------------------------------------------------------------------

diff --git a/tests/staggered_invert_test.cpp b/tests/staggered_invert_test.cpp
@@ -203,7 +203,7 @@ void init()
   cpuFatMILC = GaugeField(cpuParam);
 
   cpuParam.link_type = QUDA_ASQTAD_LONG_LINKS;
-  cpuParam.nFace = 3;
+  cpuParam.nFace = dslash_type == QUDA_ASQTAD_DSLASH ? 3 : 1;
   cpuParam.order = QUDA_QDP_GAUGE_ORDER;
   cpuLongQDP = GaugeField(cpuParam);
   cpuParam.order = QUDA_MILC_GAUGE_ORDER;
@@ -216,7 +216,7 @@ void init()
 
   // Reorder gauge fields to MILC order
   cpuFatMILC = cpuFatQDP;
-  cpuLongMILC = cpuLongQDP;
+  if (dslash_type == QUDA_ASQTAD_DSLASH) cpuLongMILC = cpuLongQDP;
 
   // Compute plaquette. Routine is aware that the gauge fields already have the phases on them.
   // This needs to be called before `loadFatLongGaugeQuda` because this routine also loads the
@@ -237,10 +237,11 @@ void init()
 
   // now copy back to QDP aliases, since these are used for the reference dslash
   cpuFatQDP = cpuFatMILC;
-  cpuLongQDP = cpuLongMILC;
-  // ensure QDP alias has exchanged ghosts
   cpuFatQDP.exchangeGhost();
-  cpuLongQDP.exchangeGhost();
+  if (dslash_type == QUDA_ASQTAD_DSLASH) {
+    cpuLongQDP = cpuLongMILC;
+    cpuLongQDP.exchangeGhost();
+  }
 
   // Staggered Gauge construct END
   //-----------------------------------------------------------------------------------