Merge pull request #858 from DrTimothyAldenDavis/dev2

test coverage
DrTimothyAldenDavis · Aug 3, 2024 · 09d3f41 · 09d3f41
2 parents e8bdd4b + 725152e
commit 09d3f41
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/KLU/Tcov/Makefile b/KLU/Tcov/Makefile
@@ -22,7 +22,7 @@ LDLIBS = -L../../lib \
     -lm -lrt \
     -Wl,-rpath=../../lib -lstdc++
 
-I = -I../../include/suitesparse -I../Include -I../User -I../../BTF/Include -I../Source
+I = -I../../include/suitesparse -I../Include -I../User -I../../BTF/Include -I../Source -I/usr/local/cuda/include
 
 all: klutest klultest
 	- ./klultests > klultests.out

diff --git a/SPQR/Tcov/Makefile b/SPQR/Tcov/Makefile
@@ -54,7 +54,7 @@ CF = -pg -g --coverage -fprofile-abs-path -O0 \
 CUDA_LIB = $(CUDART_LIB) $(CUBLAS_LIB)
 
 NVCC = /usr/local/cuda/bin/nvcc -g --profile --generate-line-info $(NV20) \
-	-Xcompiler -fprofile-arcs -Xcompiler -ftest-coverage
+	-Xcompiler -fprofile-arcs -Xcompiler -ftest-coverage -DSPQR_HAS_CUDA
 
 #-------------------------------------------------------------------------------
 
@@ -163,11 +163,12 @@ endif
 
 $(OBJ): $(INC)
 
-I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include -I../../include/suitesparse
+I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include -I../../include/suitesparse 
 
 ifneq ($(GPU_CONFIG),)
-    I += -I../../SuiteSparse_GPURuntime/Include \
-        -I../../GPUQREngine/Include $(CUDA_INC)
+    I += -I../GPURuntime/Include \
+        -I../GPUQREngine/Include $(CUDA_INC) \
+        -isystem /usr/local/cuda/include
 endif
 
 C = $(CXX) $(CF) $(I) $(GPU_CONFIG)
@@ -365,7 +366,7 @@ spqrgpu_computeFrontStaging.o: ../SPQRGPU/spqrgpu_computeFrontStaging.cpp
 # SuiteSparse_GPURuntime
 #-------------------------------------------------------------------------------
 
-GPURUNTIME = ../../SuiteSparse_GPURuntime
+GPURUNTIME = ../GPURuntime
 GPURUNSRC = $(GPURUNTIME)/Source
 GPURUNINC = -I$(GPURUNTIME)/Include -I../../SuiteSparse_config
 
@@ -398,7 +399,7 @@ SuiteSparseGPU_Workspace_transfer.o: \
 # GPUQREngine
 #-------------------------------------------------------------------------------
 
-GPUQR = ../../GPUQREngine
+GPUQR = ../GPUQREngine
 GPUQRSRC = $(GPUQR)/Source
 GPUQRDEMO = $(GPUQR)/Demo
 GPUQRINC = $(GPURUNINC) -I$(GPUQR)/Include

diff --git a/UMFPACK/Tcov/Makefile b/UMFPACK/Tcov/Makefile
@@ -27,7 +27,7 @@ SUITESPARSE ?= $(realpath $(CURDIR)/../..)
 
 CF = $(OPTION) -g --coverage -fprofile-abs-path -std=c11 -DTESTING -fopenmp \
     -DBLAS32
-I = -I../../include/suitesparse -I../Include -I../../UMFPACK/Source -I../../AMD/Include
+I = -I../../include/suitesparse -I../Include -I../../UMFPACK/Source -I../../AMD/Include -isystem /usr/local/cuda/include
 
 BLAS = -lblas
 FLIB = $(LAPACK) $(BLAS)
@@ -41,8 +41,8 @@ CLIB = $(SUITESPARSE)/SuiteSparse_config/build/libsuitesparseconfig.a \
       $(SUITESPARSE)/CCOLAMD/build/libccolamd.a
 
 # dynamic libraries (if CUDA is needed for CHOLMOD): Linux only
-CLIB = -L../../lib -lsuitesparseconfig -lcholmod -lamd -lcolamd -lccolamd -lcamd \
-    -Wl,--rpath=$(SUITESPARSE)/lib
+CLIB = -L../../lib -lsuitesparseconfig -lcholmod -lamd -lcolamd -lccolamd \
+    -lcamd -Wl,--rpath=$(SUITESPARSE)/lib
 
 LIBS = $(FLIB) $(CLIB) -lm -lrt