1. petsc
  2. PETSc
  3. buildsystem-3.3

Commits

Jed Brown  committed 9d95c20

Linking for recent versions of UMFPACK and CHOLMOD

  • Participants
  • Parent commits a3b0a0b
  • Branches default

Comments (0)

Files changed (2)

File config/packages/CHOLMOD.py

View file
   def __init__(self, framework):
     config.package.Package.__init__(self, framework)
     self.liblist   = [['libcholmod.a','libamd.a','libcolamd.a','libcamd.a','libccolamd.a'],
-                      ['libcholmod.a','libamd.a','libcolamd.a','libcamd.a','libccolamd.a','libmetis.a']]
-    self.functions = ['cholmod_l_solve'] 
+                      ['libcholmod.a','libamd.a','libcolamd.a','libcamd.a','libccolamd.a','libsuitesparseconfig.a'],
+                      ['libcholmod.a','libamd.a','libcolamd.a','libcamd.a','libccolamd.a','libmetis.a'],
+                      ['libcholmod.a','libamd.a','libcolamd.a','libcamd.a','libccolamd.a','libmetis.a','libsuitesparseconfig.a']]
+    self.functions = ['cholmod_l_solve']
     self.includes  = ['cholmod.h']
     self.complex   = 1
     return
     g.write('CHOLMOD_CONFIG   = '+flg+'\n')
     g.write('CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d\n')
     g.close()
-    
+
     # Build CHOLMOD
     if self.installNeeded(mkfile):
       try:

File config/packages/UMFPACK.py

View file
     config.package.Package.__init__(self, framework)
     self.download  = ['http://ftp.mcs.anl.gov/pub/petsc/externalpackages/UMFPACK-5.5.1.tar.gz']
     self.liblist   = [['libumfpack.a','libamd.a'],
-                      ['libumfpack.a','libcholmod.a','libcamd.a','libccolamd.a','libcolamd.a','libamd.a']]
+                      ['libumfpack.a','libcholmod.a','libcamd.a','libccolamd.a','libcolamd.a','libamd.a'],
+                      ['libumfpack.a','libcholmod.a','libcamd.a','libccolamd.a','libcolamd.a','libamd.a','libsuitesparseconfig.a'],
+                      ['libumfpack.a','libcholmod.a','libcamd.a','libccolamd.a','libcolamd.a','libamd.a','libsuitesparseconfig.a','libmetis.a']]
     self.functions = ['umfpack_di_report_info','umfpack_dl_symbolic','umfpack_dl_numeric','umfpack_dl_wsolve']
     self.includes  = ['umfpack.h']
     self.complex   = 1