From 0a81a41729f0fd7cfe9fe20b0b0994ecb4029499 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Tue, 25 Aug 2026 15:29:21 -0400
Subject: [PATCH] Slate changes and warn suppression

---
 .../fermion/implementation/StaggeredKernelsAsm.h |  1 +
 .../implementation/StaggeredKernelsHand.h        |  4 +++-
 configure.ac                                     | 13 +++++++++++++
 systems/Frontier/config-command                  |  1 +
 systems/Frontier/sourceme-rocm7.2.sh             | 16 +++++++++++++++-
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h b/Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h
index 299f26224..aadf96207 100644
--- a/Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h
+++ b/Grid/qcd/action/fermion/implementation/StaggeredKernelsAsm.h
@@ -963,4 +963,5 @@ template <> inline void StaggeredKernels<StaggeredImplD>::DhopSiteAsm(StencilVie
 }
 
 NAMESPACE_END(Grid);
+#undef PERMUTE_DIR
 
diff --git a/Grid/qcd/action/fermion/implementation/StaggeredKernelsHand.h b/Grid/qcd/action/fermion/implementation/StaggeredKernelsHand.h
index 04337671f..cfb0b0801 100644
--- a/Grid/qcd/action/fermion/implementation/StaggeredKernelsHand.h
+++ b/Grid/qcd/action/fermion/implementation/StaggeredKernelsHand.h
@@ -63,7 +63,6 @@ NAMESPACE_BEGIN(Grid);
 
 #endif
 
-
 // To splat or not to splat depends on the implementation
 #define MULT(A,UChi)				\
   auto & ref(U[sU](A));			\
@@ -377,6 +376,9 @@ void StaggeredKernels<Impl>::DhopSiteHandExt(StencilView &st,
 
 #undef LOAD_CHI
 #undef HAND_DECLARATIONS
+#undef PERMUTE_DIR
+#undef LOAD_CHI_COMMS
+#undef MULT
 
 NAMESPACE_END(Grid);
 
diff --git a/configure.ac b/configure.ac
index 471bbd1ff..811047bb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,13 @@ AC_CHECK_DECLS([be64toh],[], [], [[#include <arpa/inet.h>]])
 AC_CHECK_LIB([m],[cos])
 AC_CHECK_LIB([stdc++],[abort])
 
+############## SLATE
+AC_ARG_WITH([slate],
+    [AS_HELP_STRING([--with-slate=prefix],
+    [try this for a non-standard install prefix of the SLATE library])],
+    [AM_CXXFLAGS="-I$with_slate/include $AM_CXXFLAGS"]
+    [AM_LDFLAGS="-L$with_slate/lib64 $AM_LDFLAGS"])
+
 ############### GMP and MPFR
 AC_ARG_WITH([gmp],
     [AS_HELP_STRING([--with-gmp=prefix],
@@ -408,6 +415,12 @@ AC_SEARCH_LIBS([fftw_execute], [fftw3],
                [AC_DEFINE([HAVE_FFTW], [1], [Define to 1 if you have the `FFTW' library])]
                [have_fftw=true])
 
+AC_SEARCH_LIBS([slate_init], [slate],
+               [AC_SEARCH_LIBS([slate_init], [slate], [],
+                               [AC_MSG_ERROR("SLATE library not found")])]
+               [AC_DEFINE([HAVE_SLATE], [1], [Define to 1 if you have the `SLATE' library])]
+               [have_slate=true])
+
 AC_SEARCH_LIBS([limeCreateReader], [lime],
                [AC_DEFINE([HAVE_LIME], [1], [Define to 1 if you have the `LIME' library])]
                [have_lime=true],
diff --git a/systems/Frontier/config-command b/systems/Frontier/config-command
index 278a64c1a..0f7cb10be 100644
--- a/systems/Frontier/config-command
+++ b/systems/Frontier/config-command
@@ -2,6 +2,7 @@ CLIME=`spack find --paths c-lime@2-3-9 | grep c-lime| cut -c 15-`
 
 ../../configure --enable-comms=mpi-auto \
 --with-lime=$CLIME \
+--with-slate=$OLCF_SLATE_ROOT \
 --enable-unified=no \
 --enable-shm=nvlink \
 --enable-tracing=roctx \
diff --git a/systems/Frontier/sourceme-rocm7.2.sh b/systems/Frontier/sourceme-rocm7.2.sh
index 24422e5ff..cb8eab352 100644
--- a/systems/Frontier/sourceme-rocm7.2.sh
+++ b/systems/Frontier/sourceme-rocm7.2.sh
@@ -1,6 +1,19 @@
 
 echo spack
-. /autofs/nccs-svm1_home1/paboyle/spack/share/spack/setup-env.sh
+. /autofs/nccs-svm1_home1/paboyle/spack-frontier/share/spack/setup-env.sh
+
+
+export SLATE=`spack find --paths slate   | grep ^slate  | awk '{print $2}' `
+export BLASPP=`spack find --paths blaspp | grep ^blaspp | awk '{print $2}' `
+export LAPACKPP=`spack find --paths lapackpp | grep ^lapackpp | awk '{print $2}' `
+
+echo SLATE    $SLATE
+echo LAPACKPP $LAPACKPP
+echo BLASPP   $BLASPP
+
+ls $SLATE/lib64/libslate.so $LAPACKPP/lib64/liblapackpp.so 2>/dev/null || ls $SLATE/lib $LAPACKPP/lib
+ldd $SLATE/lib64/libslate.so | grep -E "blaspp|lapackpp|rocblas|amdhip|mpi_cray|libsci"
+ldd $LAPACKPP/lib64/liblapackpp.so | grep -E "blaspp|libsci"
 
 export CLIME=`spack find --paths c-lime | grep ^c-lime | awk '{print $2}' `
 export MPFR=`spack find --paths mpfr    | grep ^mpfr  | awk '{print $2}' `
@@ -12,4 +25,5 @@ module load cpe/26.03
 module load rocm/7.2.0
 export LD_LIBRARY_PATH=/opt/rocm-7.2.0/lib/llvm/lib/:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CRAY_LD_LIBRARY_PATH
+module load slate
 module load emacs