From 4e2a6d87c463615f228365b224158c713c03a5f6 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Tue, 27 Aug 2024 19:24:05 +0000
Subject: [PATCH] Gemm batched fix

---
 BLAS_benchmark/BatchBlasBench.cc        | 33 -------------------------
 BLAS_benchmark/compile-command          |  2 +-
 BLAS_benchmark/compile-command-frontier |  2 +-
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/BLAS_benchmark/BatchBlasBench.cc b/BLAS_benchmark/BatchBlasBench.cc
index f8827b03..8c76fd62 100644
--- a/BLAS_benchmark/BatchBlasBench.cc
+++ b/BLAS_benchmark/BatchBlasBench.cc
@@ -12,9 +12,6 @@
 #include <iostream>
 #include <sys/time.h>
 
-#undef GRID_SYCL
-#define  GRID_HIP
-#undef  GRID_CUDA
 
 #ifdef GRID_HIP
 #include <hipblas/hipblas.h>
@@ -586,36 +583,6 @@ public:
 		beta,
 		Cmn);
   }
-  void gemmBatched(int m,int n, int k,
-		   RealD alpha,
-		   deviceVector<RealD*> &Amk,  // pointer list to matrices
-		   deviceVector<RealD*> &Bkn,
-		   RealD beta,
-		   deviceVector<RealD*> &Cmn)
-  {
-    gemmBatched(GridBLAS_OP_N,GridBLAS_OP_N,
-		m,n,k,
-		alpha,
-		Amk,
-		Bkn,
-		beta,
-		Cmn);
-  }
-  void gemmBatched(int m,int n, int k,
-		   RealF alpha,
-		   deviceVector<RealF*> &Amk,  // pointer list to matrices
-		   deviceVector<RealF*> &Bkn,
-		   RealF beta,
-		   deviceVector<RealF*> &Cmn)
-  {
-    gemmBatched(GridBLAS_OP_N,GridBLAS_OP_N,
-		m,n,k,
-		alpha,
-		Amk,
-		Bkn,
-		beta,
-		Cmn);
-  }
 
   void gemmBatched(GridBLASOperation_t OpA,
 		   GridBLASOperation_t OpB,
diff --git a/BLAS_benchmark/compile-command b/BLAS_benchmark/compile-command
index 254d603e..938364be 100644
--- a/BLAS_benchmark/compile-command
+++ b/BLAS_benchmark/compile-command
@@ -1,2 +1,2 @@
 
-mpicxx -qmkl=parallel -fsycl BatchBlasBench.cc -o BatchBlasBench
\ No newline at end of file
+mpicxx -qmkl=parallel -fsycl BatchBlasBench.cc -o BatchBlasBench -DGRID_SYCL
\ No newline at end of file
diff --git a/BLAS_benchmark/compile-command-frontier b/BLAS_benchmark/compile-command-frontier
index d47c3d6e..5d0df87a 100644
--- a/BLAS_benchmark/compile-command-frontier
+++ b/BLAS_benchmark/compile-command-frontier
@@ -1,5 +1,5 @@
 CXX=hipcc
 MPICXX=mpicxx 
-CXXFLAGS="-fPIC -I{$ROCM_PATH}/include/ -I${MPICH_DIR}/include -L/lib64 -I/opt/cray/pe/mpich/8.1.28/ofi/gnu/12.3/include"
+CXXFLAGS="-fPIC -I{$ROCM_PATH}/include/ -I${MPICH_DIR}/include -L/lib64 -I/opt/cray/pe/mpich/8.1.28/ofi/gnu/12.3/include -DGRID_HIP"
 LDFLAGS="-L/lib64 -L${MPICH_DIR}/lib -lmpi -L${CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa -lamdhip64 -lhipblas -lrocblas -lmpi_gnu_123"
 hipcc $CXXFLAGS $LDFLAGS BatchBlasBench.cc -o BatchBlasBench
\ No newline at end of file