Ticket #14699: atlas-3.10.1.p1.diff

SPKG.txt

@@ -89 +89 @@
 
 == ChangeLog ==
 
+=== atlas-3.10.1.p1, lapack-3.4.2 (Volker Braun, Jean-Pierre Flori, 7 June 2013) ===
+ * Trac #14699: Install ATLAS header files
+
 === atlas-3.10.1.p0, lapack-3.4.2 (Jean-Pierre Flori, 26 February 2013) ===
  * Trac #10508: Update ATLAS to version 3.10.1 and LAPACK to version 3.4.2.
  * Removed patches integrated upstream.

spkg-install

@@ -52 +52 @@
 os.environ['MAKE'] += ' -j1'
 MAKE = os.environ['MAKE']
 
+
 ######################################################################
 ### Some auxiliary functions to facilitate IO and error checking
 ######################################################################
@@ -66 +67 @@
     return subprocess.call(command, shell=True)
 
 def assert_success(rc, good=None, bad=None):
-    if rc == 0:  
+    if rc == 0:
         if good is not None:
             print good
         return
@@ -78 +79 @@
         print 'Error: ', bad
     sys.exit(rc)
 
+
 ######################################################################
 ### Skip building ATLAS on specific systems
 ######################################################################
@@ -232 +234 @@
 
 shutil.copytree(os.path.join(PATCH_DIR, 'ATLAS-lib'), BUILD_LIB_DIR)
 
+
 ######################################################################
-### configure
+### configure functions
 ######################################################################
 
 def configure_options_from_environment():
@@ -423 +426 @@
     return (arch, isa_ext, archdef_dir)
 
 
-
-
 ######################################################################
-### make
+### make function
 ######################################################################
 
-def make_atlas():
+def make_atlas(target=None):
     os.chdir(BUILD_DIR)
-    rc = system_with_flush(MAKE)
-    return rc
-
-
-def configure_atlas_library():
-    os.chdir(BUILD_LIB_DIR)
-    static_library_dir = os.path.join(BUILD_DIR, 'lib')
-    for static_lib in glob.glob(os.path.join(static_library_dir, 'lib*.a')):
-        shutil.copy(static_lib, BUILD_LIB_DIR)
-    cmd = './configure'
-    cmd += ' --prefix=' + conf['SAGE_LOCAL']
-    cmd += ' --libdir=' + os.path.join(conf['SAGE_LOCAL'],'lib')
-    cmd += ' --disable-static'
-    return system_with_flush(cmd)
-    
-
-def make_atlas_library(target=None):
-    os.chdir(BUILD_LIB_DIR)
     if target is None:
         return system_with_flush(MAKE)
     else:
@@ -456 +439 @@
 
 
 ######################################################################
-### make and save archdef
+### make and save archdef function
 ######################################################################
 
 def build_and_save_archdef():
@@ -471 +454 @@
     assert_success(rc, bad='Making archdef tarfile failed.', good='Finished building archdef tarfile.')
     for tarfile in glob.glob('*.tar.bz2'):
         cp(tarfile, ARCHDEF_SAVE_DIR)
-    
+
 
 ######################################################################
-### build atlas and lapack
+### static libraries functions
 ######################################################################
 
 def build(arch=None, isa_ext=None, archdef_dir=None):
@@ -483 +466 @@
 
     Return ``0`` if successfull.
     """
-    rc = configure(arch, isa_ext, archdef_dir)    
+    rc = configure(arch, isa_ext, archdef_dir)
     assert_success(rc, bad='Configure failed.', good='Finished configuring ATLAS.')
     return make_atlas()
 
@@ -510 +493 @@
     return make_atlas()
 
 
+######################################################################
+### shared libraries functions
+######################################################################
+
+def configure_atlas_library():
+    os.chdir(BUILD_LIB_DIR)
+    static_library_dir = os.path.join(BUILD_DIR, 'lib')
+    for static_lib in glob.glob(os.path.join(static_library_dir, 'lib*.a')):
+        shutil.copy(static_lib, BUILD_LIB_DIR)
+    cmd = './configure'
+    cmd += ' --prefix=' + conf['SAGE_LOCAL']
+    cmd += ' --libdir=' + os.path.join(conf['SAGE_LOCAL'],'lib')
+    cmd += ' --disable-static'
+    return system_with_flush(cmd)
+
+def make_atlas_library(target=None):
+    os.chdir(BUILD_LIB_DIR)
+    cmd = (MAKE + ' ' + target) if target else MAKE
+    return system_with_flush(cmd)
+
+
+######################################################################
+### build atlas and lapack static libraries
+######################################################################
+
 #
 # Workaround for specific platforms: Disable tuning and go straight to
 # fast/base architectural defaults
@@ -539 +547 @@
 
 build_and_save_archdef()
 
+
+######################################################################
+### install atlas and lapack headers
+######################################################################
+
+edit_in_place(os.path.join(BUILD_DIR, 'Makefile')) \
+    .replace('.*Make.top install_lib.*', '') \
+    .close()
+
+rc = make_atlas('install')
+assert_success(rc, bad='Failed to install ATLAS headers', 
+               good='Installed ATLAS headers')
+
+
+######################################################################
+### configure and build atlas and lapack shared libraries
+######################################################################
+
 rc = configure_atlas_library()
 assert_success(rc, bad='Configuring shared ATLAS library failed.',
                good='Finished configuring shared ATLAS library.')
 
+have_serial_libs = False
+have_parallel_libs = False
+
 rc = make_atlas_library()
 if rc!=0:
     print 'Failed to build serial+parallel shared libraries, possibly because your'
     print 'system does not support both. Trying to build serial libraries only.'
     rc = make_atlas_library('all_serial')
-    have_parallel_libs = False
+    assert_success(rc, bad='Failed to build any shared library.',
+                   good='Finished building serial shared ATLAS library.')
+    have_serial_libs = True
 else:
     have_parallel_libs = True
-assert_success(rc, bad='Building shared ATLAS library failed.',
-               good='Finished building shared ATLAS library.')
 
 
 ######################################################################
-### install
+### install shared libraries
 ######################################################################
 
 if have_parallel_libs:
     rc = make_atlas_library('install')
-else:
+    assert_success(rc, bad='Installing the parallel+serial shared ATLAS library failed.',
+                   good='Finished installing parallel+serial shared ATLAS library.')
+
+if have_serial_libs:
     rc = make_atlas_library('install_serial')
-assert_success(rc, bad='Installing the shared ATLAS library failed.',
-               good='Finished installing shared ATLAS library.')
+    assert_success(rc, bad='Installing the serial shared ATLAS library failed.',
+                   good='Finished installing serial shared ATLAS library.')
 
 
-cp(os.path.join(PATCH_DIR, 'atlas-config'), 
+######################################################################
+### install script to tune and build ATLAS
+######################################################################
+
+cp(os.path.join(PATCH_DIR, 'atlas-config'),
    os.path.join(conf['SAGE_LOCAL'], 'bin'))
-