Merge branch 'develop' of github.com:lattice/quda into HEAD

lattice · May 7, 2024 · bfea442 · bfea442
2 parents 328389b + d157911
commit bfea442
Show file tree

Hide file tree

Showing 62 changed files with 2,269 additions and 1,057 deletions.
diff --git a/.github/workflows/rocm-build-ci.yml b/.github/workflows/rocm-build-ci.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: [self-hosted, amd]
     strategy:
       matrix:
-        rocm: [ 5.6.1, 5.7.2 ]
+        rocm: [ 5.6.1, 6.0.2 ]
     steps:
       - uses: actions/checkout@v3
       - run: |
@@ -22,12 +22,13 @@ jobs:
             -DROCM_PATH=${ROCM_PATH} \
             -DQUDA_DIRAC_CLOVER=ON \
             -DQUDA_DIRAC_CLOVER_HASENBUSCH=OFF \
-            -DQUDA_DIRAC_DOMAIN_WALL=OFF \
+            -DQUDA_DIRAC_DOMAIN_WALL=ON \
             -DQUDA_DIRAC_NDEG_TWISTED_MASS=OFF \
             -DQUDA_DIRAC_STAGGERED=ON \
             -DQUDA_DIRAC_TWISTED_MASS=OFF \
             -DQUDA_DIRAC_TWISTED_CLOVER=OFF \
             -DQUDA_DIRAC_WILSON=ON \
+            -DQUDA_DIRAC_LAPLACE=ON \
             -DQUDA_CLOVER_DYNAMIC=ON \
             -DQUDA_QDPJIT=OFF \
             -DQUDA_INTERFACE_QDPJIT=OFF \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,13 +150,13 @@ option(QUDA_DIRAC_TWISTED_CLOVER "build twisted clover Dirac operators" ${QUDA_D
 option(QUDA_DIRAC_CLOVER_HASENBUSCH "build clover Hasenbusch twist operators" ${QUDA_DIRAC_DEFAULT})
 option(QUDA_DIRAC_NDEG_TWISTED_MASS "build non-degenerate twisted mass Dirac operators" ${QUDA_DIRAC_DEFAULT})
 option(QUDA_DIRAC_NDEG_TWISTED_CLOVER "build non-degenerate twisted clover Dirac operators" ${QUDA_DIRAC_DEFAULT})
+option(QUDA_DIRAC_LAPLACE "build laplace operator" ${QUDA_DIRAC_DEFAULT})
 
 option(QUDA_DIRAC_DD "build code for domain decomposition of the Dirac operator" OFF)
 
 option(QUDA_CONTRACT "build code for bilinear contraction" OFF)
 option(QUDA_COVDEV "build code for covariant derivative" OFF)
 
-option(QUDA_LAPLACE "build laplace operator" OFF)
 option(QUDA_QIO "build QIO code for binary I/O" OFF)
 
 option(QUDA_SMEAR_GAUSS_TWOLINK "build code for two-link Gaussian smearing" OFF)

diff --git a/README.md b/README.md
@@ -266,12 +266,14 @@ Advanced Scientific Computing (PASC21) [arXiv:2104.05615[hep-lat]].
 *  Steven Gottlieb (Indiana University) 
 *  Anthony Grebe (Fermilab)
 *  Kyriakos Hadjiyiannakou (Cyprus)
+*  Ben Hoerz (Intel)
 *  Dean Howarth (Lawrence Livermore Lab, Lawrence Berkeley Lab)
 *  Hwancheol Jeong (Indiana University)
 *  Xiangyu Jiang (ITP, Chinese Academy of Sciences)
 *  Balint Joo (OLCF, Oak Ridge National Laboratory, formerly Jefferson Lab)
 *  Hyung-Jin Kim (Samsung Advanced Institute of Technology)
 *  Bartosz Kostrzewa (HPC/A-Lab, University of Bonn)
+*  Damon McDougall (AMD)
 *  James Osborn (Argonne National Laboratory)
 *  Ferenc Pittler (Cyprus)
 *  Claudio Rebbi (Boston University) 

diff --git a/ci/docker/Dockerfile.build b/ci/docker/Dockerfile.build
@@ -2,6 +2,8 @@ FROM docker.io/nvidia/cuda:11.8.0-devel-ubuntu22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+RUN echo "Running CSCS CI on $(nproc) processors"
+
 RUN apt-get update -qq && apt-get install -qq -y --no-install-recommends \
     build-essential \
     cmake \
@@ -34,18 +36,19 @@ RUN  QUDA_TEST_GRID_SIZE="1 1 1 2" cmake -S /quda/src \
     -DQUDA_CTEST_LAUNCH="" \
     -DQUDA_GPU_ARCH=sm_60 \
     -DQUDA_MULTIGRID=ON \
-    -DQUDA_MULTIGRID_NVEC_LIST=24 \
+    -DQUDA_MULTIGRID_NVEC_LIST=6 \
     -DQUDA_MDW_FUSED_LS_LIST=4 \
     -DQUDA_MPI=ON  \
     -DQUDA_DIRAC_DEFAULT_OFF=ON \
     -DQUDA_DIRAC_WILSON=ON \
     -DQUDA_DIRAC_CLOVER=ON \
     -DQUDA_DIRAC_TWISTED_CLOVER=ON \
     -DQUDA_DIRAC_STAGGERED=ON \
+    -DQUDA_DIRAC_LAPLACE=ON \
     -GNinja \
     -B /quda/build 
 
-RUN cmake --build /quda/build
+RUN cmake --build /quda/build -j $(nproc)
 
 RUN cmake --install /quda/build
 

diff --git a/include/clover_field.h b/include/clover_field.h
@@ -20,6 +20,19 @@ namespace quda {
 #endif
   }
 
+  /**
+     @brief Helper function that returns whether we have enabled
+     clover fermions.
+   */
+  constexpr bool is_enabled_twisted_clover()
+  {
+#ifdef GPU_TWISTED_CLOVER_DIRAC
+    return true;
+#else
+    return false;
+#endif
+  }
+
   namespace clover
   {