zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upate ATLAS and netlib-blas.

Browse Source
This commit is contained in:
Todd Gamblin 2015-06-07 15:41:15 -07:00
parent 0a92349f90
commit bde9c7eee3
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
var/spack/packages/atlas/package.py
View File

@ -12,13 +12,17 @@ class Atlas(Package):
LAPACK library. LAPACK library.
""" """
homepage = "http://math-atlas.sourceforge.net/" homepage = "http://math-atlas.sourceforge.net/"
url = "http://downloads.sourceforge.net/project/math-atlas/Stable/3.10.2/atlas3.10.2.tar.bz2"
# TODO: make this provide BLAS once we have the ability to prefer dependencies. version('3.11.34', '0b6c5389c095c4c8785fd0f724ec6825',
# TODO: until then netlib-blas will be the default (and only) blas url='http://sourceforge.net/projects/math-atlas/files/Developer%20%28unstable%29/3.11.34/atlas3.11.34.tar.bz2/download')
version('3.10.2', 'a4e21f343dec8f22e7415e339f09f6da',
url='http://downloads.sourceforge.net/project/math-atlas/Stable/3.10.2/atlas3.10.2.tar.bz2')
# TODO: make this provide BLAS once it works better. Create a way
# TODO: to mark "beta" packages and require explicit invocation.
# provides('blas') # provides('blas')
version('3.10.2', 'a4e21f343dec8f22e7415e339f09f6da')
def patch(self): def patch(self):
# Disable thraed check. LLNL's environment does not allow # Disable thraed check. LLNL's environment does not allow
@ -29,13 +33,25 @@ def patch(self):
# TODO: investigate a better way to add the check back in # TODO: investigate a better way to add the check back in
# TODO: using, say, MSRs. Or move this to a variant. # TODO: using, say, MSRs. Or move this to a variant.
@when('@:3.10')
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('ATLAS-Build', create=True): with working_dir('ATLAS-Build', create=True):
self.module.configure = Executable('../configure') configure = Executable('../configure')
configure('--prefix=%s' % prefix, configure('--prefix=%s' % prefix, '-C', 'ic', 'cc', '-C', 'if', 'f77', "--dylibs")
'-C', 'ic', 'cc', make()
'-C', 'if', 'f77', make('check')
"--dylibs") make('ptcheck')
make('time')
make("install")
def install(self, spec, prefix):
with working_dir('ATLAS-Build', create=True):
configure = Executable('../configure')
configure('--incdir=%s' % prefix.include,
'--libdir=%s' % prefix.lib,
'--cc=cc',
"--shared")
make() make()
make('check') make('check')

17
var/spack/packages/netlib-blas/package.py
View File

@ -1,4 +1,6 @@
from spack import * from spack import *
import os
class NetlibBlas(Package): class NetlibBlas(Package):
"""Netlib reference BLAS""" """Netlib reference BLAS"""
@ -13,8 +15,16 @@ class NetlibBlas(Package):
# Doesn't always build correctly in parallel # Doesn't always build correctly in parallel
parallel = False parallel = False
def patch(self):
os.symlink('make.inc.example', 'make.inc')
mf = FileFilter('make.inc')
mf.filter('^FORTRAN.*', 'FORTRAN = f90')
mf.filter('^LOADER.*', 'LOADER = f90')
mf.filter('^CC =.*', 'CC = cc')
def install(self, spec, prefix): def install(self, spec, prefix):
symlink('make.inc.example', 'make.inc')
make('blaslib') make('blaslib')
# Tests that blas builds correctly # Tests that blas builds correctly
@ -25,5 +35,6 @@ def install(self, spec, prefix):
install('librefblas.a', prefix.lib) install('librefblas.a', prefix.lib)
# Blas virtual package should provide blas.a and libblas.a # Blas virtual package should provide blas.a and libblas.a
symlink(prefix.lib + '/librefblas.a', prefix.lib + '/blas.a') with working_dir(prefix.lib):
symlink(prefix.lib + '/librefblas.a', prefix.lib + '/libblas.a') symlink('librefblas.a', 'blas.a')
symlink('librefblas.a', 'libblas.a')