CXSparse cmake

Author: DrTimothyAldenDavis

.gitignore

@@ -138,10 +138,6 @@ CXSparse/Tcov/cov.sort
 CXSparse/Tcov/cover.out
 CXSparse/Tcov/covs.out
 CXSparse/Tcov/cs_*.c
-CXSparse/Tcov/cs*_ci.c
-CXSparse/Tcov/cs*_cl.c
-CXSparse/Tcov/cs*_di.c
-CXSparse/Tcov/cs*_dl.c
 CXSparse/Tcov/*.out
 CXSparse/Tcov/cs_demo1_ci
 CXSparse/Tcov/cs_demo1_cl

BTF/Lib/Makefile

@@ -71,22 +71,18 @@ install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET)
 $(INSTALL_LIB)/$(SO_TARGET): $(OBJ)
 	@mkdir -p $(INSTALL_LIB)
 	@mkdir -p $(INSTALL_INCLUDE)
-	@mkdir -p $(INSTALL_DOC)
 	$(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS)
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) )
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) )
 	$(CP) ../Include/btf.h $(INSTALL_INCLUDE)
-	$(CP) ../README.txt $(INSTALL_DOC)/BTF_README.txt
 	chmod 755 $(INSTALL_LIB)/$(SO_TARGET)
 	chmod 644 $(INSTALL_INCLUDE)/btf.h
-	chmod 644 $(INSTALL_DOC)/BTF_README.txt
 
 uninstall:
 	$(RM) $(INSTALL_LIB)/$(SO_TARGET)
 	$(RM) $(INSTALL_LIB)/$(SO_PLAIN)
 	$(RM) $(INSTALL_LIB)/$(SO_MAIN)
 	$(RM) $(INSTALL_INCLUDE)/btf.h
-	$(RM) $(INSTALL_DOC)/BTF_README.txt
 
 #-------------------------------------------------------------------------------
 

CHOLMOD/Lib/Makefile

@@ -540,25 +540,18 @@ install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET)
 $(INSTALL_LIB)/$(SO_TARGET): $(OBJ)
 	@mkdir -p $(INSTALL_LIB)
 	@mkdir -p $(INSTALL_INCLUDE)
-	@mkdir -p $(INSTALL_DOC)
 	$(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS)
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) )
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) )
 	$(CP) ../Include/cholmod*.h $(INSTALL_INCLUDE)
 	$(RM) $(INSTALL_INCLUDE)/cholmod_internal.h
-	$(CP) ../Doc/CHOLMOD_UserGuide.pdf $(INSTALL_DOC)
-	$(CP) ../README.txt $(INSTALL_DOC)/CHOLMOD_README.txt
 	chmod 755 $(INSTALL_LIB)/$(SO_TARGET)
 	chmod 644 $(INSTALL_INCLUDE)/cholmod*.h
-	chmod 644 $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf
-	chmod 644 $(INSTALL_DOC)/CHOLMOD_README.txt
 
 # uninstall CHOLMOD
 uninstall:
 	$(RM) $(INSTALL_LIB)/$(SO_TARGET)
 	$(RM) $(INSTALL_LIB)/$(SO_PLAIN)
 	$(RM) $(INSTALL_LIB)/$(SO_MAIN)
 	$(RM) $(INSTALL_INCLUDE)/cholmod*.h
-	$(RM) $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf
-	$(RM) $(INSTALL_DOC)/CHOLMOD_README.txt
 

CSparse/Makefile

@@ -28,6 +28,10 @@
 # To clean up the files:
 #
 #       make clean
+#
+# To run test coverage:
+#
+#       make cov
 
 JOBS ?= 8
 
@@ -77,8 +81,13 @@ uninstall:
 # remove all files not in the distribution
 clean:
 	- $(RM) -rf build/* Config/*.tmp
+	( cd Tcov && $(MAKE) purge )
 
 purge: clean
 
 distclean: clean
 
+# test coverage
+cov:
+	( cd Tcov && $(MAKE) )
+

CSparse/README.txt

@@ -124,7 +124,6 @@ cs_updown.c     sparse rank-1 Cholesky update/downate
 cs_usolve.c     x=U\b
 cs_util.c       various utilities (allocate/free matrices, workspace, etc)
 cs_utsolve.c    x=U'\b
-Makefile        Makefile for CSparse
 README.txt      README file for CSparse
 
 --------------------------------------------------------------------------------
@@ -396,7 +395,6 @@ mbeacxc             US economy, 1972.  Dan Szyld, while at NYU
 t1                  small example used in Chapter 2
 west0067            Cavett problem with 5 components (chemical eng., Westerberg)
 
-
 --------------------------------------------------------------------------------
 ./Tcov:             Exhaustive test coverage of CSparse
 --------------------------------------------------------------------------------

CSparse/Source/cs_qr.c

@@ -3,12 +3,12 @@
 csn *cs_qr (const cs *A, const css *S)
 {
     double *Rx, *Vx, *Ax, *x,  *Beta ;
-    csi i, k, p, m, n, vnz, p1, top, m2, len, col, rnz, *s, *leftmost, *Ap, *Ai,
+    csi i, k, p, n, vnz, p1, top, m2, len, col, rnz, *s, *leftmost, *Ap, *Ai,
         *parent, *Rp, *Ri, *Vp, *Vi, *w, *pinv, *q ;
     cs *R, *V ;
     csn *N ;
     if (!CS_CSC (A) || !S) return (NULL) ;
-    m = A->m ; n = A->n ; Ap = A->p ; Ai = A->i ; Ax = A->x ;
+    n = A->n ; Ap = A->p ; Ai = A->i ; Ax = A->x ;
     q = S->q ; parent = S->parent ; pinv = S->pinv ; m2 = S->m2 ;
     vnz = S->lnz ; rnz = S->unz ; leftmost = S->leftmost ;
     w = cs_malloc (m2+n, sizeof (csi)) ;            /* get csi workspace */

CSparse/Tcov/Makefile

@@ -7,6 +7,7 @@ CC = gcc
 CFLAGS = -O -g --coverage -fprofile-abs-path \
     	-Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
     	-Wredundant-decls -Wnested-externs -Wdisabled-optimization -std=c11 \
+        -Wno-unused-but-set-variable \
 	-Wno-unused-parameter -I../Include -I../Demo
 
 run: all run1 runbook run3 runtest
@@ -85,18 +86,12 @@ runtest: all
 	- $(V) ./cstcov_test ../Matrix/ash219 > test_ash.out
 	- $(V) ./cstcov_test ../Matrix/lp_afiro > test_afiro.out
 
-readhb: readhb.f
-	f77 -o readhb readhb.f
-
-readhb.f:
-	- ln -s readhb.f
-
 clean:
 	- $(RM) *.o *.bbg *.da *.gcov *.gcda *.gcno
 
 purge: distclean
 
 # remove everything for distribution, including all symbolic links
 distclean: clean
-	- $(RM) cs_demo1 cs_demo2 readhb *.out *.a cs_demo3 cstcov_test cov.sort
+	- $(RM) cs_demo1 cs_demo2 *.out *.a cs_demo3 cstcov_test cov.sort
 	- $(RM) -r cs_*.c *.dSYM

CSparse/Tcov/covall

@@ -2,6 +2,6 @@
         ./gcovs cs*.c |& awk -f cov.awk | sort -n > cov.out
         sort -n cov.out > cov.sort
         ./covs *.gcov > covs.out
-        echo -n "statments not yet tested: "
+        echo -n "statements not yet tested: "
         grep "#####" *gcov | wc -l
         ./cover *v > cover.out