From f0f2c6c48673a9c65a1b0990e88b379d7f9678d2 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 19 Aug 2016 17:05:14 -0500 Subject: Add latest version of fftw --- var/spack/repos/builtin/packages/fftw/package.py | 30 ++++++++++++---------- .../repos/builtin/packages/gromacs/package.py | 3 +-- 2 files changed, 17 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 570cd1bbdd..da3e8f7328 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -22,8 +22,6 @@ # 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 * @@ -33,22 +31,19 @@ class Fftw(Package): size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST). We believe that FFTW, which is free software, should become the FFT - library of choice for most applications. + library of choice for most applications.""" - """ homepage = "http://www.fftw.org" url = "http://www.fftw.org/fftw-3.3.4.tar.gz" + version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569') version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3') - variant( - 'float', default=True, + variant('float', default=True, description='Produces a single precision version of the library') - variant( - 'long_double', default=True, + variant('long_double', default=True, description='Produces a long double precision version of the library') - variant( - 'quad', default=False, + variant('quad', default=False, description='Produces a quad precision version of the library ' '(works only with GCC and libquadmath)') variant('openmp', default=False, description="Enable OpenMP support.") @@ -60,10 +55,13 @@ class Fftw(Package): # targets are supported def install(self, spec, prefix): - options = ['--prefix=%s' % prefix, - '--enable-shared', - '--enable-threads'] - # Add support for OpenMP + options = [ + '--prefix={0}'.format(prefix), + '--enable-shared', + '--enable-threads' + ] + + # Add support for OpenMP if '+openmp' in spec: # Note: Apple's Clang does not support OpenMP. if spec.satisfies('%clang'): @@ -78,17 +76,21 @@ class Fftw(Package): configure(*options) make() + make("check") make("install") if '+float' in spec: configure('--enable-float', *options) make() + make("check") make("install") if '+long_double' in spec: configure('--enable-long-double', *options) make() + make("check") make("install") if '+quad' in spec: configure('--enable-quad-precision', *options) make() + make("check") make("install") diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index d39c9738ef..8611dc2026 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -22,7 +22,6 @@ # 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 * @@ -57,7 +56,7 @@ class Gromacs(Package): depends_on('plumed+mpi', when='+plumed+mpi') depends_on('plumed~mpi', when='+plumed~mpi') depends_on('fftw') - depends_on('cmake', type='build') + depends_on('cmake@2.8.8:', type='build') # TODO : add GPU support -- cgit v1.2.3-70-g09d2 From d5903e461204ae284aca133ca810e12b47f53089 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 19 Aug 2016 17:06:34 -0500 Subject: Flake8 --- var/spack/repos/builtin/packages/fftw/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index da3e8f7328..37d272e9c9 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -39,11 +39,14 @@ class Fftw(Package): version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569') version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3') - variant('float', default=True, + variant( + 'float', default=True, description='Produces a single precision version of the library') - variant('long_double', default=True, + variant( + 'long_double', default=True, description='Produces a long double precision version of the library') - variant('quad', default=False, + variant( + 'quad', default=False, description='Produces a quad precision version of the library ' '(works only with GCC and libquadmath)') variant('openmp', default=False, description="Enable OpenMP support.") -- cgit v1.2.3-70-g09d2 From 5970b7a00ab3c831ab3cae2307d4b15b486fac9a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 24 Aug 2016 10:34:20 -0500 Subject: Only run tests if explicitly requested --- var/spack/repos/builtin/packages/fftw/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 37d272e9c9..3069e39226 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -79,21 +79,25 @@ class Fftw(Package): configure(*options) make() - make("check") + if self.run_tests: + make("check") make("install") if '+float' in spec: configure('--enable-float', *options) make() - make("check") + if self.run_tests: + make("check") make("install") if '+long_double' in spec: configure('--enable-long-double', *options) make() - make("check") + if self.run_tests: + make("check") make("install") if '+quad' in spec: configure('--enable-quad-precision', *options) make() - make("check") + if self.run_tests: + make("check") make("install") -- cgit v1.2.3-70-g09d2