Skip to content

Commit a9a22b4

Browse files
authored
Merge pull request #230 from CEED/makefile-info-fix
Fix the output of 'make info' for the CUDA backends.
2 parents 01da737 + ab9cabd commit a9a22b4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ info:
211211
$(info XSMM_DIR = $(XSMM_DIR)$(call backend_status,/cpu/self/xsmm/serial /cpu/self/xsmm/blocked))
212212
$(info OCCA_DIR = $(OCCA_DIR)$(call backend_status,/cpu/occa /gpu/occa /omp/occa))
213213
$(info MAGMA_DIR = $(MAGMA_DIR)$(call backend_status,/gpu/magma))
214-
$(info CUDA_DIR = $(CUDA_DIR)$(call backend_status,/gpu/magma))
214+
$(info CUDA_DIR = $(CUDA_DIR)$(call backend_status,$(CUDA_BACKENDS)))
215215
$(info ------------------------------------)
216216
$(info MFEM_DIR = $(MFEM_DIR))
217217
$(info NEK5K_DIR = $(NEK5K_DIR))
@@ -271,13 +271,14 @@ endif
271271
# Cuda Backend
272272
CUDA_LIB_DIR := $(wildcard $(foreach d,lib lib64,$(CUDA_DIR)/$d/libcudart.${SO_EXT}))
273273
CUDA_LIB_DIR := $(patsubst %/,%,$(dir $(firstword $(CUDA_LIB_DIR))))
274+
CUDA_BACKENDS = /gpu/cuda/ref /gpu/cuda/reg
274275
ifneq ($(CUDA_LIB_DIR),)
275276
$(libceed) : CFLAGS += -I$(CUDA_DIR)/include
276277
$(libceed) : LDFLAGS += -L$(CUDA_LIB_DIR) -Wl,-rpath,$(abspath $(CUDA_LIB_DIR))
277278
$(libceed) : LDLIBS += -lcudart -lnvrtc -lcuda
278279
libceed.c += $(cuda.c) $(cuda-reg.c)
279280
libceed.cu += $(cuda.cu) $(cuda-reg.cu)
280-
BACKENDS += /gpu/cuda/ref /gpu/cuda/reg
281+
BACKENDS += $(CUDA_BACKENDS)
281282
endif
282283

283284
# MAGMA Backend

0 commit comments

Comments
 (0)