@@ -253,11 +253,11 @@ info:
253253 $(info ASAN = $(or $(ASAN ) ,(empty) ) )
254254 $(info V = $(or $(V ) ,(empty) ) [verbose= $( if $( V) ,on,off) ])
255255 $(info ------------------------------------)
256- $(info MEMCHK_STATUS = $(MEMCHK_STATUS )$(call backend_status,/cpu/self/memcheck/serial /cpu/self/memcheck/blocked ) )
257- $(info AVX_STATUS = $(AVX_STATUS )$(call backend_status,/cpu/self/avx/serial /cpu/self/avx/blocked ) )
258- $(info XSMM_DIR = $(XSMM_DIR )$(call backend_status,/cpu/self/xsmm/serial /cpu/self/xsmm/blocked ) )
256+ $(info MEMCHK_STATUS = $(MEMCHK_STATUS )$(call backend_status,$( MEMCHK_BACKENDS ) ) )
257+ $(info AVX_STATUS = $(AVX_STATUS )$(call backend_status,$( AVX_BACKENDS ) ) )
258+ $(info XSMM_DIR = $(XSMM_DIR )$(call backend_status,$( XSMM_BACKENDS ) ) )
259259 $(info OCCA_DIR = $(OCCA_DIR )$(call backend_status,$(OCCA_BACKENDS ) ) )
260- $(info MAGMA_DIR = $(MAGMA_DIR )$(call backend_status,/gpu/magma /gpu/magma/det ) )
260+ $(info MAGMA_DIR = $(MAGMA_DIR )$(call backend_status,$( MAGMA_BACKENDS ) ) )
261261 $(info CUDA_DIR = $(CUDA_DIR )$(call backend_status,$(CUDA_BACKENDS ) ) )
262262 $(info HIP_DIR = $(HIP_DIR )$(call backend_status,$(HIP_BACKENDS ) ) )
263263 $(info ------------------------------------)
@@ -290,23 +290,26 @@ TEST_BACKENDS := /cpu/self/tmpl /cpu/self/tmpl/sub
290290# Memcheck Backend
291291MEMCHK_STATUS = Disabled
292292MEMCHK := $(shell echo "\#include <valgrind/memcheck.h>" | $(CC ) $(CPPFLAGS ) -E - >/dev/null 2>&1 && echo 1)
293+ MEMCHK_BACKENDS = /cpu/self/memcheck/serial /cpu/self/memcheck/blocked
293294ifeq ($(MEMCHK ) ,1)
294295 MEMCHK_STATUS = Enabled
295296 libceed.c += $(ceedmemcheck.c )
296- BACKENDS += /cpu/self/memcheck/serial /cpu/self/memcheck/blocked
297+ BACKENDS += $( MEMCHK_BACKENDS )
297298endif
298299
299300# AVX Backed
300301AVX_STATUS = Disabled
301302AVX_FLAG := $(if $(filter clang,$(CC_VENDOR ) ) ,+avx,-mavx)
302303AVX := $(filter $(AVX_FLAG ) ,$(shell $(CC ) $(OPT ) -v -E -x c /dev/null 2>&1) )
304+ AVX_BACKENDS = /cpu/self/avx/serial /cpu/self/avx/blocked
303305ifneq ($(AVX ) ,)
304306 AVX_STATUS = Enabled
305307 libceed.c += $(avx.c )
306- BACKENDS += /cpu/self/avx/serial /cpu/self/avx/blocked
308+ BACKENDS += $( AVX_BACKENDS )
307309endif
308310
309311# libXSMM Backends
312+ XSMM_BACKENDS = /cpu/self/xsmm/serial /cpu/self/xsmm/blocked
310313ifneq ($(wildcard $(XSMM_DIR ) /lib/libxsmm.* ) ,)
311314 $(libceeds ) : LDFLAGS += -L$(XSMM_DIR ) /lib -Wl,-rpath,$(abspath $(XSMM_DIR ) /lib)
312315 $(libceeds ) : LDLIBS += -lxsmm -ldl
@@ -324,7 +327,7 @@ ifneq ($(wildcard $(XSMM_DIR)/lib/libxsmm.*),)
324327 $(libceeds ) : LDLIBS += $(BLAS_LIB )
325328 libceed.c += $(xsmm.c )
326329 $(xsmm.c:%.c =$(OBJDIR ) /%.o) $(xsmm.c:%=%.tidy ) : CPPFLAGS += -I$(XSMM_DIR ) /include
327- BACKENDS += /cpu/self/xsmm/serial /cpu/self/xsmm/blocked
330+ BACKENDS += $( XSMM_BACKENDS )
328331endif
329332
330333# OCCA Backends
@@ -382,6 +385,7 @@ ifneq ($(HIP_LIB_DIR),)
382385endif
383386
384387# MAGMA Backend
388+ MAGMA_BACKENDS = /gpu/cuda/magma /gpu/cuda/magma/det
385389ifneq ($(wildcard $(MAGMA_DIR ) /lib/libmagma.* ) ,)
386390 ifneq ($(CUDA_LIB_DIR),)
387391 cuda_link = -Wl,-rpath,$(CUDA_LIB_DIR ) -L$(CUDA_LIB_DIR ) -lcublas -lcusparse -lcudart
@@ -395,7 +399,7 @@ ifneq ($(wildcard $(MAGMA_DIR)/lib/libmagma.*),)
395399 libceed.cu += $(magma.cu )
396400 $(magma.c:%.c =$(OBJDIR ) /%.o) $(magma.c:%=%.tidy ) : CPPFLAGS += -DADD_ -I$(MAGMA_DIR ) /include -I$(CUDA_DIR ) /include
397401 $(magma.cu:%.cu =$(OBJDIR ) /%.o) : CPPFLAGS += --compiler-options=-fPIC -DADD_ -I$(MAGMA_DIR ) /include -I$(MAGMA_DIR ) /magmablas -I$(MAGMA_DIR ) /control -I$(CUDA_DIR ) /include
398- BACKENDS += /gpu/cuda/magma /gpu/cuda/magma/det
402+ BACKENDS += $( MAGMA_BACKENDS )
399403 endif
400404endif
401405
0 commit comments