Remove QUDA_STAGGERED_PHASE_CPS enum.

lattice · Oct 5, 2023 · 7b3044d · 7b3044d
1 parent 37a08ac
commit 7b3044d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/include/enum_quda.h b/include/enum_quda.h
@@ -532,9 +532,8 @@ typedef enum QudaGhostExchange_s {
 typedef enum QudaStaggeredPhase_s {
   QUDA_STAGGERED_PHASE_NO = 0,
   QUDA_STAGGERED_PHASE_MILC = 1,
-  QUDA_STAGGERED_PHASE_CPS = 2,
+  QUDA_STAGGERED_PHASE_CHROMA = 2,
   QUDA_STAGGERED_PHASE_TIFR = 3,
-  QUDA_STAGGERED_PHASE_CHROMA = 4,
   QUDA_STAGGERED_PHASE_INVALID = QUDA_INVALID_ENUM
 } QudaStaggeredPhase;
 

diff --git a/include/enum_quda_fortran.h b/include/enum_quda_fortran.h
@@ -476,9 +476,8 @@
 #define QudaStaggeredPhase integer(4)
 #define QUDA_STAGGERED_PHASE_NO     0
 #define QUDA_STAGGERED_PHASE_MILC   1
-#define QUDA_STAGGERED_PHASE_CPS    2
+#define QUDA_STAGGERED_PHASE_CHROMA 2
 #define QUDA_STAGGERED_PHASE_TIFR   3
-#define QUDA_STAGGERED_PHASE_CHROMA 4
 #define QUDA_STAGGERED_PHASE_INVALID QUDA_INVALID_ENUM
 
 #define QudaContractType integer(4)

diff --git a/include/gauge_field_order.h b/include/gauge_field_order.h
@@ -1501,9 +1501,8 @@ namespace quda {
       {
         switch (phase) {
         case QUDA_STAGGERED_PHASE_MILC:
-        case QUDA_STAGGERED_PHASE_CPS:
-        case QUDA_STAGGERED_PHASE_TIFR:
-        case QUDA_STAGGERED_PHASE_CHROMA: return true;
+        case QUDA_STAGGERED_PHASE_CHROMA:
+        case QUDA_STAGGERED_PHASE_TIFR: return true;
         default: return false;
         }
       }

diff --git a/include/kernels/gauge_phase.cuh b/include/kernels/gauge_phase.cuh
@@ -63,17 +63,6 @@ namespace quda {
       } else if (dim == 3) { // also apply boundary condition
 	phase = (t == arg.X[3]-1) ? arg.tBoundary : 1.0;
       }
-    } else if (Arg::phase == QUDA_STAGGERED_PHASE_CPS) {
-      if (dim==0) {
-	phase = 1.0;
-      } else if (dim == 1) {
-	phase = (1.0 - 2.0 * ((x) % 2) );
-      } else if (dim == 2) {
-	phase = (1.0 - 2.0 * ((x + y) % 2) );
-      } else if (dim == 3) { // also apply boundary condition
-	phase = ((t == arg.X[3]-1) ? arg.tBoundary : 1.0) *
-	  (1.0 - 2 * ((x + y + z) % 2) );
-      }
     } else if (Arg::phase == QUDA_STAGGERED_PHASE_CHROMA) {
       // Chroma follows CPS convention, but uses -Dslash instead of Dslash compared to QUDA
       if (dim==0) {

diff --git a/lib/gauge_phase.cu b/lib/gauge_phase.cu
@@ -25,15 +25,12 @@ namespace quda {
       if (u.StaggeredPhase() == QUDA_STAGGERED_PHASE_MILC) {
         GaugePhaseArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_MILC> arg(u);
         launch<GaugePhase>(tp, stream, arg);
-      } else if (u.StaggeredPhase() == QUDA_STAGGERED_PHASE_CPS) {
-        GaugePhaseArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CPS> arg(u);
+      } else if (u.StaggeredPhase() == QUDA_STAGGERED_PHASE_CHROMA) {
+        GaugePhaseArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CHROMA> arg(u);
         launch<GaugePhase>(tp, stream, arg);
       } else if (u.StaggeredPhase() == QUDA_STAGGERED_PHASE_TIFR) {
         GaugePhaseArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_TIFR> arg(u);
         launch<GaugePhase>(tp, stream, arg);
-      } else if (u.StaggeredPhase() == QUDA_STAGGERED_PHASE_CHROMA) {
-        GaugePhaseArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CHROMA> arg(u);
-        launch<GaugePhase>(tp, stream, arg);
       } else {
         errorQuda("Undefined phase type %d", u.StaggeredPhase());
       }

diff --git a/lib/unitarize_links_quda.cu b/lib/unitarize_links_quda.cu
@@ -124,15 +124,12 @@ namespace quda {
       if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_MILC) {
         UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_MILC> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
         launch<Unitarize>(tp, stream, arg);
-      } else if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_CPS) {
-        UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CPS> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
+      } else if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_CHROMA) {
+        UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CHROMA> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
         launch<Unitarize>(tp, stream, arg);
       } else if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_TIFR) {
         UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_TIFR> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
         launch<Unitarize>(tp, stream, arg);
-      } else if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_CHROMA) {
-        UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_CHROMA> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
-        launch<Unitarize>(tp, stream, arg);
       } else if (in.StaggeredPhase() == QUDA_STAGGERED_PHASE_NO) {
         UnitarizeArg<Float, nColor, recon, QUDA_STAGGERED_PHASE_NO> arg(out, in, fails, max_iter, unitarize_eps, max_error, reunit_allow_svd, reunit_svd_only, svd_rel_error, svd_abs_error);
         launch<Unitarize>(tp, stream, arg);