diff options
| author | Kelly Thompson <KineticTheory@users.noreply.github.com> | 2016-09-21 05:10:30 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-21 04:10:30 -0700 |
| commit | 3d3614e52259913e8d96d811a2a95bc02637c63f (patch) | |
| tree | e53d5e504042a0d0b8da5d7bdc3d221c18ecad3a | |
| parent | c1284a9046bc54c34ec400bffa9458f084c0f9da (diff) | |
| download | spack-3d3614e52259913e8d96d811a2a95bc02637c63f.tar.gz spack-3d3614e52259913e8d96d811a2a95bc02637c63f.tar.bz2 spack-3d3614e52259913e8d96d811a2a95bc02637c63f.tar.xz spack-3d3614e52259913e8d96d811a2a95bc02637c63f.zip | |
Update to allow netlib-scalapack to build against netlib-lapack. (#1539)
| -rw-r--r-- | var/spack/repos/builtin/packages/netlib-scalapack/package.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 49b8633209..13e932e176 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -41,12 +41,14 @@ class NetlibScalapack(Package): variant('shared', default=True, description='Build the shared library version') - variant('fpic', default=False, description="Build with -fpic compiler option") + variant('fpic', default=False, + description="Build with -fpic compiler option") provides('scalapack') depends_on('mpi') depends_on('lapack') + depends_on('blas') depends_on('cmake', when='@2.0.0:', type='build') def install(self, spec, prefix): @@ -54,18 +56,18 @@ class NetlibScalapack(Package): "-DBUILD_SHARED_LIBS:BOOL=%s" % ('ON' if '+shared' in spec else 'OFF'), "-DBUILD_STATIC_LIBS:BOOL=%s" % ('OFF' if '+shared' in spec else - 'ON'), - # forces scalapack to use find_package(LAPACK): - "-DUSE_OPTIMIZED_LAPACK_BLAS:BOOL=ON", + 'ON') ] # Make sure we use Spack's Lapack: options.extend([ '-DLAPACK_FOUND=true', - '-DLAPACK_INCLUDE_DIRS=%s' % spec['lapack'].prefix.include, '-DLAPACK_LIBRARIES=%s' % ( spec['lapack'].lapack_shared_lib if '+shared' in spec else spec['lapack'].lapack_static_lib), + '-DBLAS_LIBRARIES=%s' % ( + spec['blas'].blas_shared_lib if '+shared' in spec else + spec['blas'].blas_static_lib) ]) if '+fpic' in spec: |