Resolve the cmake/clang-format conflicts, hopefully.

lattice · Jan 17, 2025 · d8adfa2 · d8adfa2
1 parent dcad5c8
commit d8adfa2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/lib/block_transpose.in.cu b/lib/block_transpose.in.cu
@@ -133,7 +133,9 @@ namespace quda
   void launch_span_nColor(v_t &V, cvector_ref<b_t> &B, bool from_to_non_rel, IntList<nColor, N...>)
   {
     if (B[0].Ncolor() == nColor) {
-      IntList<@QUDA_MULTIGRID_MRHS_LIST @> nVecs;
+      // clang-format off
+      IntList<@QUDA_MULTIGRID_MRHS_LIST@> nVecs;
+      // clang-format on
       launch_span_nVec<v_t, b_t, vFloat, bFloat, nSpin, nColor>(V, B, from_to_non_rel, nVecs);
     } else {
       IntList<N...> nColors_remaining;
@@ -152,7 +154,9 @@ namespace quda
 
     if (V.Nspin() == nSpin) {
       if constexpr (is_enabled_spin(nSpin)) {
-        IntList<@QUDA_MULTIGRID_NC_NVEC_LIST @> nColors;
+        // clang-format off
+        IntList<@QUDA_MULTIGRID_NC_NVEC_LIST@> nColors;
+        // clang-format on
         launch_span_nColor<v_t, b_t, vFloat, bFloat, nSpin>(V, B, from_to_non_rel, nColors);
       } else {
         errorQuda("nSpin = %d not instantiated", nSpin);

diff --git a/lib/dslash_coarse.in.cpp b/lib/dslash_coarse.in.cpp
@@ -122,8 +122,11 @@ namespace quda
           if (dslash) { BlockTransposeForward(v_inA, inA_offseted); }
           if (clover) { BlockTransposeForward(v_inB, inB_offseted); }
 
+          // clang-format off
+          IntList<@QUDA_MULTIGRID_NVEC_LIST@> nColors;
+          // clang-format on
           ApplyCoarse<true>(v_out, v_inA, v_inB, *Y_, *X_, kappa, parity, dslash, clover, dagger, commDim,
-                            halo_precision, IntList<@QUDA_MULTIGRID_NVEC_LIST @>());
+                            halo_precision, nColors);
 
           BlockTransposeBackward(v_out, out_offseted);
         }

diff --git a/lib/prolongator.in.cpp b/lib/prolongator.in.cpp
@@ -36,8 +36,10 @@ namespace quda
             auto v_out = create_color_spinor_copy(out, nVec, csOrder);
             BlockTransposeForward(v_in, in);
 
-            IntList<@QUDA_MULTIGRID_MRHS_LIST @> nvecs;
-            ProlongateMma2<fineColor, coarseColor>(v_out, v_in, V, fine_to_coarse, spin_map, parity, nvecs);
+            // clang-format off
+            IntList<@QUDA_MULTIGRID_MRHS_LIST@> nVecs;
+            // clang-format on
+            ProlongateMma2<fineColor, coarseColor>(v_out, v_in, V, fine_to_coarse, spin_map, parity, nVecs);
 
             bool to_non_rel = (out.Nspin() == 4) && (out[0].GammaBasis() == QUDA_UKQCD_GAMMA_BASIS);
             BlockTransposeBackward(v_out, out, to_non_rel);

diff --git a/lib/restrictor.in.cpp b/lib/restrictor.in.cpp
@@ -40,8 +40,10 @@ namespace quda
             bool from_non_rel = (in.Nspin() == 4) && (in[0].GammaBasis() == QUDA_UKQCD_GAMMA_BASIS);
             BlockTransposeForward(v_in, in, from_non_rel);
 
-            IntList<@QUDA_MULTIGRID_MRHS_LIST @> nvecs;
-            RestrictMma2<fineColor, coarseColor>(v_out, v_in, V, fine_to_coarse, coarse_to_fine, spin_map, parity, nvecs);
+            // clang-format off
+            IntList<@QUDA_MULTIGRID_MRHS_LIST@> nVecs;
+            // clang-format on
+            RestrictMma2<fineColor, coarseColor>(v_out, v_in, V, fine_to_coarse, coarse_to_fine, spin_map, parity, nVecs);
 
             BlockTransposeBackward(v_out, out);
           };