From 0570660d8109eb0a1a1d80ab104f9a7ad5ecc623 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sat, 6 Jun 2015 18:23:12 -0700 Subject: Make blas a virtual dependency, default netlib-blas. --- var/spack/packages/atlas/package.py | 4 ++++ var/spack/packages/blas/package.py | 17 ----------------- var/spack/packages/netlib-blas/package.py | 7 ++++--- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 var/spack/packages/blas/package.py (limited to 'var') diff --git a/var/spack/packages/atlas/package.py b/var/spack/packages/atlas/package.py index fc0a1a7e67..255f22d666 100644 --- a/var/spack/packages/atlas/package.py +++ b/var/spack/packages/atlas/package.py @@ -14,6 +14,10 @@ class Atlas(Package): 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. + # TODO: until then netlib-blas will be the default (and only) blas + # provides('blas') + version('3.10.2', 'a4e21f343dec8f22e7415e339f09f6da') def patch(self): diff --git a/var/spack/packages/blas/package.py b/var/spack/packages/blas/package.py deleted file mode 100644 index 0cf495d0c1..0000000000 --- a/var/spack/packages/blas/package.py +++ /dev/null @@ -1,17 +0,0 @@ -from spack import * -import os - -class Blas(Package): - """The BLAS (Basic Linear Algebra Subprograms) are routines that provide standard - building blocks for performing basic vector and matrix operations.""" - - homepage = "http://www.netlib.org/blas/" - - version('unversioned', '5e99e975f7a1e3ea6abcad7c6e7e42e6', - url='http://www.netlib.org/blas/blas.tgz') - - def install(self, spec, prefix): - make() - mkdirp('%s' % prefix.lib) # Create the lib dir inside the install dir. - move('./blas_LINUX.a', '%s/libblas.a' % prefix.lib) # Rename the generated lib file to libblas.a - diff --git a/var/spack/packages/netlib-blas/package.py b/var/spack/packages/netlib-blas/package.py index 725bda1309..ce8fc1eef4 100644 --- a/var/spack/packages/netlib-blas/package.py +++ b/var/spack/packages/netlib-blas/package.py @@ -16,7 +16,7 @@ class NetlibBlas(Package): def install(self, spec, prefix): symlink('make.inc.example', 'make.inc') make('blaslib') - + # Tests that blas builds correctly make('blas_testing') @@ -24,5 +24,6 @@ class NetlibBlas(Package): mkdirp(prefix.lib) install('librefblas.a', prefix.lib) - # Blas virtual package should provide blas.a - symlink(prefix.lib + '/librefblas.a', prefix.lib + '/blas.a') \ No newline at end of file + # Blas virtual package should provide blas.a and libblas.a + symlink(prefix.lib + '/librefblas.a', prefix.lib + '/blas.a') + symlink(prefix.lib + '/librefblas.a', prefix.lib + '/libblas.a') -- cgit v1.2.3-70-g09d2