hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change py-merlinwf to py-merlin (#15453)

Browse source 
* Change py-merlinwf to py-merlin to match PyPi.
Change py-merlin to py-merlin-info.

Move to py-merlin_info.

Add py-merlin-info back in.

* Update dependent packages for the new merlin name.

* Remove non-working pyre and the associated packages, exchanger,
py-pythia and py-mlerin-info from citcoms.

* Remove blank line.
This commit is contained in:
Joe Koning 2020-03-12 11:27:02 -07:00 committed by GitHub
parent 6887cb3da4
commit d87f09cc5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/citcoms/package.py
View file

@ -16,8 +16,6 @@ class Citcoms(AutotoolsPackage):
version('3.3.1', sha256='e3520e0a933e4699d31e86fe309b8c154ea6ecb0f42a1cf6f25e8d13d825a4b3') version('3.3.1', sha256='e3520e0a933e4699d31e86fe309b8c154ea6ecb0f42a1cf6f25e8d13d825a4b3')
version('3.2.0', sha256='773a14d91ecbb4a4d1e04317635fab79819d83c57b47f19380ff30b9b19cb07a') version('3.2.0', sha256='773a14d91ecbb4a4d1e04317635fab79819d83c57b47f19380ff30b9b19cb07a')
variant('pyre', default=False, description='build Pyre modules')
variant('exchanger', default=False, description='use Exchanger')
variant('ggrd', default=False, description='use GGRD file support') variant('ggrd', default=False, description='use GGRD file support')
variant('cuda', default=False, description='use CUDA') variant('cuda', default=False, description='use CUDA')
variant('hdf5', default=False, description='add HDF5 support') variant('hdf5', default=False, description='add HDF5 support')
@ -27,15 +25,10 @@ class Citcoms(AutotoolsPackage):
depends_on('zlib') depends_on('zlib')
# Optional dependencies # Optional dependencies
depends_on('exchanger', when='+exchanger')
depends_on('py-pythia', type=('build', 'run'), when='+pyre')
depends_on('hc', when='+ggrd') depends_on('hc', when='+ggrd')
depends_on('cuda', when='+cuda') depends_on('cuda', when='+cuda')
depends_on('hdf5+mpi', when='+hdf5') depends_on('hdf5+mpi', when='+hdf5')
conflicts('+pyre', when='@3.3:', msg='Pyre support was removed from 3.3+')
conflicts('+exchanger', when='@3.3:', msg='Exchanger support was removed from 3.3+')
def setup_build_environment(self, env): def setup_build_environment(self, env):
if '+ggrd' in self.spec: if '+ggrd' in self.spec:
env.set('HC_HOME', self.spec['hc'].prefix) env.set('HC_HOME', self.spec['hc'].prefix)
@ -45,14 +38,7 @@ def configure_args(self):
# Flags only valid in 3.2 # Flags only valid in 3.2
if self.spec.satisfies('@:3.2'): if self.spec.satisfies('@:3.2'):
if '+pyre' in self.spec:
args.append('--with-pyre')
else:
args.append('--without-pyre') args.append('--without-pyre')
if '+exchanger' in self.spec:
args.append('--with-exchanger')
else:
args.append('--without-exchanger') args.append('--without-exchanger')
if '+ggrd' in self.spec: if '+ggrd' in self.spec:

21
var/spack/repos/builtin/packages/exchanger/package.py
View file

@ -1,21 +0,0 @@
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class Exchanger(AutotoolsPackage):
"""Exchanger is a package containing several C++ base classes. These
classes, when customized for a solver, can provide communication channels
between solvers. This packaged is used by CitcomS for solver coupling."""
homepage = "https://geodynamics.org/cig/software/exchanger/"
url = "https://geodynamics.org/cig/software/exchanger/Exchanger-1.0.1.tar.gz"
version('1.0.1', sha256='1e6c8311db96582bcf2c9aee16a863a5730c1aa54cb3aa7d0249239c6e0b68ee')
depends_on('python', type=('build', 'run'))
depends_on('py-merlin', type='build')
depends_on('py-pythia@0.8.1.0:0.8.1.999', type=('build', 'run'))

31
var/spack/repos/builtin/packages/py-merlin/package.py
View file

@ -7,15 +7,30 @@
class PyMerlin(PythonPackage): class PyMerlin(PythonPackage):
"""A custom version of Phillip J. Eby's setuptools.""" """Merlin Workflow for HPC."""
homepage = "https://pypi.org/project/merlin/" homepage = "https://github.com/LLNL/merlin"
url = "https://pypi.io/packages/source/m/merlin/merlin-1.8.tar.gz" url = "https://pypi.io/packages/source/m/merlin/merlin-1.4.1.tar.gz"
git = "https://github.com/LLNL/merlin.git"
version('1.8', sha256='a1ba9c13c74daa1724dd3820f1c241d7594d487b11f35347606986028c1881fd') version('1.4.1', sha256='9d515cfdbcde2443892afd92b78dbc5bf2aed2060ed3a336e683188e015bca7c')
version('master', branch='master')
version('develop', branch='develop')
depends_on('python@:2', type=('build', 'run')) depends_on('python@3.6:', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
def test(self): depends_on('py-pytest', type='test')
# Unit tests are missing from tarball
pass depends_on('py-cached-property', type=('build', 'run'))
depends_on('py-celery@4.3.0:+redis', type=('build', 'run'))
depends_on('py-coloredlogs@10.0:', type=('build', 'run'))
depends_on('py-cryptography', type=('build', 'run'))
depends_on('py-importlib-resources', when="^python@3.0:3.6.99", type=('build', 'run'))
depends_on('py-maestrowf@1.1.7dev0:', when="@1.2.0:", type=('build', 'run'))
depends_on('py-maestrowf@1.1.6:', when="@:1.1.99", type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-parse', type=('build', 'run'))
depends_on('py-psutil@5.1.0:', type=('build', 'run'))
depends_on('py-pyyaml@5.1.2:', type=('build', 'run'))
depends_on('py-tabulate', type=('build', 'run'))

38
var/spack/repos/builtin/packages/py-merlinwf/package.py
View file

@ -1,38 +0,0 @@
# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class PyMerlinwf(PythonPackage):
"""Merlin Workflow for HPC."""
homepage = "https://github.com/LLNL/merlin"
url = "https://pypi.io/packages/source/m/merlinwf/merlinwf-1.2.3.tar.gz"
git = "https://github.com/LLNL/merlin.git"
version('1.2.3', sha256='6b13a315f3e8e2894ea05d9cc072639f02eaf71ae0fdbd2bafebd1c20c8470ab')
version('1.1.1', sha256='306055a987e42a79ce348a3f9d71293ed8a9b7f5909c26b6fd233d6a176fff6d')
version('1.0.5', sha256='d66f50eac84ff9d7aa484f2d9655dc60f0352196d333284d81b6623a6f0aa180')
version('master', branch='master')
version('develop', branch='develop')
depends_on('python@3.6:', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-pytest', type='test')
depends_on('py-cached-property', type=('build', 'run'))
depends_on('py-celery@4.3.0:+redis', type=('build', 'run'))
depends_on('py-coloredlogs@10.0:', type=('build', 'run'))
depends_on('py-cryptography', type=('build', 'run'))
depends_on('py-importlib-resources', when="^python@3.0:3.6.99", type=('build', 'run'))
depends_on('py-maestrowf@1.1.7dev0:', when="@1.2.0:", type=('build', 'run'))
depends_on('py-maestrowf@1.1.6:', when="@:1.1.99", type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-parse', type=('build', 'run'))
depends_on('py-psutil@5.1.0:', type=('build', 'run'))
depends_on('py-pyyaml@5.1.2:', type=('build', 'run'))
depends_on('py-tabulate', type=('build', 'run'))

20
var/spack/repos/builtin/packages/py-pythia/package.py
View file

@ -1,20 +0,0 @@
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class PyPythia(PythonPackage):
"""Pythia refers to the Pyre framework and a collection of packages that
interact with it, such as an interface to the ACIS solid modelling package.
"""
homepage = "https://geodynamics.org/cig/software/pythia/"
url = "https://geodynamics.org/cig/software/github/pythia/v0.8.1.18/pythia-0.8.1.18.tar.gz"
version('0.8.1.18', sha256='f6025e6d70046dc71e375eded3d731506f8dd79e2e53b7e1436754439dcdef1e')
depends_on('python@:2', type=('build', 'run'))
depends_on('py-merlin', type='build')