diff options
author | Mark C. Miller <miller86@llnl.gov> | 2017-09-20 17:19:04 -0700 |
---|---|---|
committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-09-20 18:19:04 -0600 |
commit | 02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862 (patch) | |
tree | 95fc4ce2529811dc57a01f5bc380192ae3688b94 /var | |
parent | 3606b8a1f343965c815337f676df12f0c587e08b (diff) | |
download | spack-02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862.tar.gz spack-02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862.tar.bz2 spack-02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862.tar.xz spack-02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862.zip |
Rm arpack parpack (#5391)
* fixes #967
* Version bump to 0.9.1
- Bugfixes for spack find
- 0.9.1 can read specs from current develop.
* Don't assume spack is in the path when building docs.
* fixing build issues for gcc on osx
* reverting inadvertent change on develop
* fixing typesetting of bsws description
* very minor update to RTD docs footer to ref github contributors
* Revert "very minor update to RTD docs footer to ref github contributors"
This reverts commit c40d75da7f3b918350a263e7a9ef34df56b7fb01.
* switch fastmath to depend_on arpack_ng; remove arpack/parpack
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/arpack/package.py | 75 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/fastmath/package.py | 2 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/parpack/package.py | 68 |
3 files changed, 1 insertions, 144 deletions
diff --git a/var/spack/repos/builtin/packages/arpack/package.py b/var/spack/repos/builtin/packages/arpack/package.py deleted file mode 100644 index 3e03d0cfd7..0000000000 --- a/var/spack/repos/builtin/packages/arpack/package.py +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import os - - -class Arpack(Package): - """A collection of Fortran77 subroutines designed to solve large scale - eigenvalue problems.""" - - homepage = "http://www.caam.rice.edu/software/ARPACK/" - url = "http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz" - - version('96', 'fffaa970198b285676f4156cebc8626e') - - depends_on('blas') - depends_on('lapack') - - def patch(self): - makefile = FileFilter('ARmake.inc') - - # Section 1: Paths and Libraries - - # Change the build directory - makefile.filter('^home.*', 'home = %s' % os.getcwd()) - - # Use external BLAS/LAPACK - makefile.filter('^BLASdir.*', - 'BLASdir = %s' % self.spec['blas'].prefix) - makefile.filter('^LAPACKdir.*', - 'LAPACKdir = %s' % self.spec['lapack'].prefix) - - # Do not include the platform in the library name - makefile.filter('^PLAT.*', 'PLAT = ') - makefile.filter('^ARPACKLIB.*', 'ARPACKLIB = $(home)/libarpack.a') - - # Section 2: Compilers - - # Be sure to use the Spack compiler wrapper - makefile.filter('^FC.*', 'FC = {0}'.format(os.environ['F77'])) - makefile.filter( - '^FFLAGS.*', 'FFLAGS = -O2 -g {0}'.format(self.compiler.pic_flag) - ) - - if not which('ranlib'): - makefile.filter('^RANLIB.*', 'RANLIB = touch') - - def install(self, spec, prefix): - with working_dir('SRC'): - make('all') - - mkdir(prefix.lib) - install('libarpack.a', prefix.lib) diff --git a/var/spack/repos/builtin/packages/fastmath/package.py b/var/spack/repos/builtin/packages/fastmath/package.py index 84c98fb299..51d7bf64f3 100644 --- a/var/spack/repos/builtin/packages/fastmath/package.py +++ b/var/spack/repos/builtin/packages/fastmath/package.py @@ -46,7 +46,7 @@ class Fastmath(Package): # depends_on('nox-trilinos') # hoping for stripped down install of just nox depends_on('moab') depends_on('mpi') - depends_on('parpack') # we need parpack ng + depends_on('arpack-ng') depends_on('petsc') depends_on('phasta') depends_on('pumi') diff --git a/var/spack/repos/builtin/packages/parpack/package.py b/var/spack/repos/builtin/packages/parpack/package.py deleted file mode 100644 index 3a1b6deafa..0000000000 --- a/var/spack/repos/builtin/packages/parpack/package.py +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import os -import shutil - - -class Parpack(Package): - """ARPACK is a collection of Fortran77 subroutines designed to solve large - scale eigenvalue problems.""" - - homepage = "http://www.caam.rice.edu/software/ARPACK/download.html" - url = "http://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.Z" - - version('96', 'a175f70ff71837a33ff7e4b0b6054f43') - - depends_on('mpi') - depends_on('blas') - depends_on('lapack') - - def patch(self): - # Filter the CJ makefile to make a spack one. - shutil.move('ARMAKES/ARmake.CJ', 'ARmake.inc') - mf = FileFilter('ARmake.inc') - - # Be sure to use Spack F77 wrapper - mf.filter('^FC.*', 'FC = f77') - mf.filter('^FFLAGS.*', 'FFLAGS = -O2 -g') - - # Set up some variables. - mf.filter('^PLAT.*', 'PLAT = ') - mf.filter('^home.*', 'home = %s' % os.getcwd()) - mf.filter('^BLASdir.*', 'BLASdir = %s' % self.spec['blas'].prefix) - mf.filter('^LAPACKdir.*', 'LAPACKdir = %s' % - self.spec['lapack'].prefix) - mf.filter('^MAKE.*', 'MAKE = make') - - # build the library in our own prefix. - mf.filter('^ARPACKLIB.*', 'PARPACKLIB = %s/libparpack.a' % os.getcwd()) - - def install(self, spec, prefix): - with working_dir('PARPACK/SRC/MPI'): - make('all') - - mkdirp(prefix.lib) - install('libparpack.a', prefix.lib) |