update arch files and add errors for missing or unsupported flags

cjknight · Nov 6, 2024 · 3b419b8 · 3b419b8
1 parent bf2517f
commit 3b419b8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/gpu/src/arch/midway b/gpu/src/arch/midway
@@ -9,7 +9,7 @@ CXX = mpicxx
 CXXFLAGS = -g -fopenmp -O3
 CXXFLAGS += $(PYTHON_INC)
 
-CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
+CXXFLAGS += -D_USE_GPU -D_GPU_CUDA -D_GPU_CUBLAS
 CXXFLAGS += -I$(CUDA_HOME)/include
 #CXXFLAGS += -D_SIMPLE_TIMER
 CXXFLAGS += -D_USE_NVTX

diff --git a/gpu/src/arch/polaris-gnu-nvcc b/gpu/src/arch/polaris-gnu-nvcc
@@ -14,7 +14,7 @@ CXXFLAGS = -g -fopenmp -O3
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 CXXFLAGS += $(PYTHON_INC)
 
-CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
+CXXFLAGS += -D_USE_GPU -D_GPU_CUDA -D_GPU_CUBLAS
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 CXXFLAGS += -D_SIMPLE_TIMER
 CXXFLAGS += -D_USE_NVTX

diff --git a/gpu/src/arch/polaris-oneapi-cuda b/gpu/src/arch/polaris-oneapi-cuda
@@ -11,7 +11,7 @@ CXXFLAGS = -g -fopenmp -O3
 CXXFLAGS += --cuda-gpu-arch=sm_80 -x cuda -I$(PATH_TO_CUDA)/include
 CXXFLAGS += $(PYTHON_INC)
 
-CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
+CXXFLAGS += -D_USE_GPU -D_GPU_CUDA -D_GPU_CUBLAS
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 CXXFLAGS += -D_SIMPLE_TIMER
 CXXFLAGS += -D_USE_NVTX

diff --git a/gpu/src/arch/polaris-oneapi-sycl b/gpu/src/arch/polaris-oneapi-sycl
@@ -13,7 +13,7 @@ CXXFLAGS += -std=c++20
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 CXXFLAGS += $(PYTHON_INC)
 
-CXXFLAGS += -D_USE_GPU -D_GPU_SYCL_CUDA
+CXXFLAGS += -D_USE_GPU -D_GPU_SYCL_CUDA -D_GPU_CUBLAS
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 CXXFLAGS += -D_SIMPLE_TIMER
 CXXFLAGS += -D_USE_NVTX

diff --git a/gpu/src/mathlib.h b/gpu/src/mathlib.h
@@ -15,9 +15,9 @@
 #if !defined(_GPU_CUBLAS) && !defined(_GPU_MKL)
 
 #if defined(_GPU_CUDA) || defined(_GPU_SYCL_CUDA)
-#define _GPU_CUBLAS
+#error "Did you forget to set -D_GPU_CUBLAS?"
 #elif defined(_GPU_SYCL)
-#define _GPU_MKL
+#error "Did you forget to set -D_GPU_MKL?"
 #endif
 
 #endif

diff --git a/gpu/src/pm.h b/gpu/src/pm.h
@@ -15,6 +15,7 @@
 #elif defined(_GPU_SYCL) || defined(_GPU_SYCL_CUDA)
 #include "pm_sycl.h"
 #elif defined(_GPU_OPENMP)
+#error "Attempting to use -D_GPU_OPENMP which is not currently supported"
 #include "pm_openmp.h"
 #endif