Skip to content

Commit 833fc0b

Browse files
committed
Add SuiteSparse 4.5.6 patches
1 parent 2d78068 commit 833fc0b

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

Patches/SuiteSparse/CHOLMOD/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ library:
3333
#-------------------------------------------------------------------------------
3434

3535
I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
36+
-I../../CCOLAMD/Include -I../../CAMD/Include \
3637
$(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config \
3738
$(CUDA_INC)
3839

Patches/SuiteSparse/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ include SuiteSparse_config/SuiteSparse_config.mk
1212
# Compile the default rules for each package
1313
go: metis
1414
( cd SuiteSparse_config && $(MAKE) )
15-
( cd AMD && $(MAKE) )
16-
( cd BTF && $(MAKE) )
17-
( cd CAMD && $(MAKE) )
18-
( cd CCOLAMD && $(MAKE) )
19-
( cd COLAMD && $(MAKE) )
20-
( cd CHOLMOD && $(MAKE) )
21-
( cd CSparse && $(MAKE) )
22-
( cd CXSparse && $(MAKE) )
23-
( cd LDL && $(MAKE) )
24-
( cd KLU && $(MAKE) )
25-
( cd UMFPACK && $(MAKE) )
26-
( cd RBio && $(MAKE) )
15+
( cd AMD && $(MAKE) library )
16+
( cd BTF && $(MAKE) library )
17+
( cd CAMD && $(MAKE) library )
18+
( cd CCOLAMD && $(MAKE) library )
19+
( cd COLAMD && $(MAKE) library )
20+
( cd CHOLMOD && $(MAKE) library )
21+
( cd CSparse && $(MAKE) library )
22+
( cd CXSparse && $(MAKE) library )
23+
( cd LDL && $(MAKE) library )
24+
( cd KLU && $(MAKE) library )
25+
( cd UMFPACK && $(MAKE) library )
26+
( cd RBio && $(MAKE) library )
2727
ifneq ($(GPU_CONFIG),)
2828
( cd SuiteSparse_GPURuntime && $(MAKE) )
2929
( cd GPUQREngine && $(MAKE) )
3030
endif
31-
( cd SPQR && $(MAKE) )
31+
( cd SPQR && $(MAKE) library )
3232
# ( cd PIRO_BAND && $(MAKE) )
3333
# ( cd SKYLINE_SVD && $(MAKE) )
3434

@@ -67,7 +67,7 @@ ifeq (,$(MY_METIS_LIB))
6767
- $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf
6868
- $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt
6969
# the following is needed only on the Mac, so *.dylib is hardcoded:
70-
$(SO_INSTALL_NAME) $(INSTALL_LIB)/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib
70+
- $(SO_INSTALL_NAME) $(INSTALL_LIB)/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib
7171
- $(CP) include/metis.h $(INSTALL_INCLUDE)
7272
chmod 755 $(INSTALL_LIB)/libmetis.*
7373
chmod 644 $(INSTALL_INCLUDE)/metis.h

0 commit comments

Comments
 (0)