diff options
Diffstat (limited to 'var')
4 files changed, 108 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 8d2290d8ad..8d1687a11a 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -61,9 +61,9 @@ class Likwid(Package): prefix, 'config.mk') - # TODO: - # set INSTALL_CHOWN in config.mk to your user/group. - # Defaults are root. + filter_file('^INSTALL_CHOWN.*', + 'INSTALL_CHOWN = -o $(USER)', + 'config.mk') make() make('install') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 82b639313a..578349cbc4 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -40,7 +40,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('for-pflotran-0.1.0', git='https://bitbucket.org/petsc/petsc.git', commit='7943f4e1472fff9cf1fc630a1100136616e4970f') - + version('3.7.4', 'aaf94fa54ef83022c14091f10866eedf') version('3.7.2', '50da49867ce7a49e7a0c1b37f4ec7b34') version('3.6.4', '7632da2375a3df35b8891c9526dbdde7') @@ -79,7 +79,7 @@ class Petsc(Package): depends_on('mpi', when='+mpi') # Build dependencies - depends_on('python @2.6:2.7') + depends_on('python @2.6:2.7', type='build') # Other dependencies depends_on('boost', when='@:3.5+boost') @@ -94,7 +94,7 @@ class Petsc(Package): depends_on('hypre~internal-superlu', when='+hypre+mpi~complex') depends_on('superlu-dist@:4.3', when='@3.4.4:3.6.4+superlu-dist+mpi') depends_on('superlu-dist@5.0.0:', when='@3.7:+superlu-dist+mpi') - depends_on('superlu-dist@5.0.0:', when='@for-pflotran-0.1.0+superlu-dist+mpi') + depends_on('superlu-dist@5.0.0:', when='@for-pflotran-0.1.0+superlu-dist+mpi') depends_on('mumps+mpi', when='+mumps+mpi') depends_on('scalapack', when='+mumps+mpi') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index e208400eea..17c512119c 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -41,6 +41,8 @@ class Slepc(Package): variant('arpack', default=True, description='Enables Arpack wrappers') + # NOTE: make sure PETSc and SLEPc use the same python. + depends_on('python@2.6:2.7', type='build') depends_on('petsc@3.7:', when='@3.7.1:') depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3') depends_on('arpack-ng~mpi', when='+arpack^petsc~mpi') diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py new file mode 100644 index 0000000000..7aea15ed9c --- /dev/null +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -0,0 +1,100 @@ +############################################################################## +# Copyright (c) 2013-2016, 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 LICENSE file 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 Xsdktrilinos(CMakePackage): + """xSDKTrilinos contains the portions of Trilinos that depend on PETSc + because they would cause a circular dependency if built as part of + Trilinos. + """ + homepage = "https://trilinos.org/" + base_url = "https://github.com/trilinos/xSDKTrilinos/archive" + + version('develop', git='https://github.com/trilinos/xSDKTrilinos.git', tag='master') + version('12.8.1', '9cc338ded17d1e10ea6c0dc18b22dcd4') + version('12.6.4', '44c4c54ccbac73bb8939f68797b9454a') + + def url_for_version(self, version): + return '%s/trilinos-release-%s.tar.gz' % \ + (Xsdktrilinos.base_url, version.dashed) + + variant('hypre', default=True, + description='Compile with Hypre preconditioner') + variant('petsc', default=True, + description='Compile with PETSc solvers') + variant('shared', default=True, + description='Enables the build of shared libraries') + variant('debug', default=False, + description='Builds a debug version of the libraries') + + depends_on('cmake', type='build') + + # MPI related dependencies + depends_on('mpi') + depends_on('hypre~internal-superlu', when='+hypre') + depends_on('petsc+mpi~complex', when='+petsc') + depends_on('trilinos@12.6.4', when='@12.6.4') + depends_on('trilinos@12.8.1', when='@12.8.1') + depends_on('trilinos@develop', when='@develop') + + def cmake_args(self): + spec = self.spec + + options = [] + + mpi_bin = spec['mpi'].prefix.bin + options.extend([ + '-DxSDKTrilinos_VERBOSE_CONFIGURE:BOOL=OFF', + '-DxSDKTrilinos_ENABLE_TESTS:BOOL=ON', + '-DxSDKTrilinos_ENABLE_EXAMPLES:BOOL=ON', + '-DTrilinos_INSTALL_DIR=%s' % spec['trilinos'].prefix, + '-DCMAKE_BUILD_TYPE:STRING=%s' % ( + 'DEBUG' if '+debug' in spec else 'RELEASE'), + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in spec else 'OFF'), + '-DTPL_ENABLE_MPI:BOOL=ON', + '-DMPI_BASE_DIR:PATH=%s' % spec['mpi'].prefix, + '-DxSDKTrilinos_ENABLE_CXX11:BOOL=ON', + '-DTPL_ENABLE_HYPRE:BOOL=%s' % ( + 'ON' if '+hypre' in spec else 'OFF'), + '-DTPL_ENABLE_PETSC:BOOL=%s' % ( + 'ON' if '+petsc' in spec else 'OFF'), + '-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % self.prefix + ]) + + # Fortran lib + if spec.satisfies('%gcc') or spec.satisfies('%clang'): + libgfortran = os.path.dirname(os.popen( + '%s --print-file-name libgfortran.a' % + join_path(mpi_bin, 'mpif90')).read()) + options.extend([ + '-DxSDKTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % ( + libgfortran), + '-DxSDKTrilinos_ENABLE_Fortran=ON' + ]) + + return options |