Setup uses new layout for HSL packages.

nlpy/linalg/scaling/setup.py

@@ -13,7 +13,7 @@ def configuration(parent_package='',top_path=None):
 
     config = Configuration('scaling', parent_package, top_path)
 
-    mc29_sources = [os.path.join(hsl_dir,'mc29ad.f'),
+    mc29_sources = [os.path.join(hsl_dir,'mc29d','mc29d.f'),
                     os.path.join('src','mc29.pyf')]
 
     config.add_extension(

nlpy/linalg/setup.py

@@ -19,12 +19,6 @@ def configuration(parent_package='',top_path=None):
     metis_lib = nlpy_config.get('HSL', 'metis_lib')
     galahad_dir = nlpy_config.get('GALAHAD', 'galahad_dir')
     propack_dir = nlpy_config.get('PROPACK', 'propack_dir')
-    #try:
-    #    pysparse_include = nlpy_config.get('PYSPARSE', 'pysparse_include')
-    #except:
-    #    pysparse_include = []
-
-    #print 'hsl_dir = ', hsl_dir
 
     config = Configuration('linalg', parent_package, top_path)
 
@@ -43,9 +37,10 @@ def configuration(parent_package='',top_path=None):
     pyma27_src = ['ma27_lib.c','nlpy_alloc.c','_pyma27.c']
 
     # Relevant files for building MA57 extension.
-    ma57_src = ['fd05ad.f', 'ma57ad.f', 'mc47ad.f',
-                'mc71ad.f', 'fd15ad.f',
-                'mc21ad.f', 'mc59ad.f', 'mc34ad.f', 'mc64ad.f']
+    #ma57_src = ['fd05ad.f', 'ma57ad.f', 'mc47ad.f',
+    #            'mc71ad.f', 'fd15ad.f',
+    #            'mc21ad.f', 'mc59ad.f', 'mc34ad.f', 'mc64ad.f']
+    ma57_src = ['ddeps.f', 'ma57d.f']
     pyma57_src = ['ma57_lib.c','nlpy_alloc.c','_pyma57.c']
 
     # Build PyMA27
@@ -69,7 +64,7 @@ def configuration(parent_package='',top_path=None):
         )
 
     # Build PyMA57
-    ma57_sources = [os.path.join(hsl_dir,name) for name in ma57_src]
+    ma57_sources = [os.path.join(hsl_dir,'ma57d',name) for name in ma57_src]
     pyma57_sources = [os.path.join('src',name) for name in pyma57_src]
 
     config.add_library(

site.template.cfg

@@ -28,7 +28,7 @@
 #       List of directories to add to the header file earch path.
 #           include_dirs = /usr/include:/usr/local/include
 #
-#   src_dirs 
+#   src_dirs
 #       List of directories that contain extracted source code for the
 #       dependency. For some dependencies, numpy.distutils will be able to build
 #       them from source if binaries cannot be found. The FORTRAN BLAS and
@@ -92,25 +92,26 @@ libampl_dir = /home/orban/local/dev/LibAmpl
 
 # HSL
 # ---
-# Refer to http://hsl.rl.ac.uk/hsl2007/hsl20074researchers.html for license
-# terms and for obtaining the software. Place all source files in the directory
-# specified in hsl_dir below. The relevant source files are as follows:
-# For MA27: 
-#   fd05ad.f  ma27ad.f
-# For MA57:
-#   fd05ad.f  ma57ad.f  mc47ad.f  mc71ad.f
-#   fd15ad.f  mc21ad.f  mc59ad.f  mc34ad.f  mc64ad.f
-#   You will also need the METIS library and header files. The source tree may
+# 1. You will need the following files from the HSL Archive
+#    (see http://www.hsl.rl.ac.uk/archive/hslarchive/hslarchive.html for
+#    license terms and for obtaining the software):
+#    fd05ad.f  ma27ad.f
+#    These two files must be placed in the directory specified in hsl_dir
+#    below.
+#
+# 2. You will need the following packages from the HSL:
+#    (see http://hsl.rl.ac.uk/hsl2007/hsl20074researchers.html for license
+#    terms and for obtaining the software):
+#    ma57d mc29d hsl_zd11d.f90
+#    The directory specified in hsl_dir below should contain a subdirectory
+#    named ma57d and one named mc29d. These should not be altered. The file
+#    hsl_zd11d.f90 should be placed in hsl_dir.
+#
+# 4. You will also need the METIS library and header files. The source tree may
 #   be downloaded from http://glaros.dtc.umn.edu/gkhome/metis/metis/download
-# For the scaling submodule:
-#   mc29ad.f
-# For GLTR:
-#   hsl_zd11d.f90
-# Note that some packages are available from the HSL Archive:
-# http://www.hsl.rl.ac.uk/archive/hslarchive/hslarchive.html
 [HSL]
 hsl_dir = /home/orban/local/linalg/hsl
-metis_dir = /home/orban/Work/FEniCS/lib
+metis_dir = /home/orban/local/linalg/lib
 metis_lib = metis
 
 # GALAHAD