diff options
| author | Paul Kuberry <pakuber@sandia.gov> | 2022-03-21 07:26:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 14:26:41 +0100 |
| commit | 558e99eccab582a5d7b05d0ee6d20fe5db112fe0 (patch) | |
| tree | b18bbaa1061a3e9da905c92439c4b44318a213d0 /var | |
| parent | 12ed453707980861b3998864f5eab719cbf404a0 (diff) | |
| download | spack-558e99eccab582a5d7b05d0ee6d20fe5db112fe0.tar.gz spack-558e99eccab582a5d7b05d0ee6d20fe5db112fe0.tar.bz2 spack-558e99eccab582a5d7b05d0ee6d20fe5db112fe0.tar.xz spack-558e99eccab582a5d7b05d0ee6d20fe5db112fe0.zip | |
xyce: switch to Trilinos 13.2.0 and add dependencies for +pymi (#29331)
* xyce: switch to Trilinos 13.2.0 and add dependencies for +pymi
* xyce: clean up Trilinos dependency logic
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/xyce/package.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 26a7f7348d..0a64e2d5b7 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -52,12 +52,17 @@ class Xyce(CMakePackage): variant('pymi', default=False, description='Enable Python Model Interpreter for Xyce') depends_on('python@3:', type=('build', 'link', 'run'), when='+pymi') + depends_on('py-numba@0.48.0:', type=('build', 'link', 'run'), when='+pymi') + depends_on('py-pycompadre+trilinos', type=('build', 'link', 'run'), when='+pymi') depends_on('py-pip', type='run', when='+pymi') - depends_on('py-pybind11@2.6.1:', when='+pymi') + depends_on('py-pybind11@2.6.1:', type=('build', 'link'), when='+pymi') - # Xyce is built against an older version of Trilinos unlikely to be - # used for any other purpose. - depends_on('trilinos@12.12.1 +amesos+amesos2+anasazi+aztec+basker+belos+complex+epetra+epetraext+explicit_template_instantiation+fortran+hdf5+ifpack+isorropia+kokkos+nox+sacado+suite-sparse+trilinoscouplings+zoltan+stokhos+epetraextbtf+epetraextexperimental+epetraextgraphreorderings gotype=all') + depends_on('trilinos +amesos+amesos2+anasazi+aztec+basker+belos+complex+epetra+epetraext+explicit_template_instantiation+fortran+hdf5+ifpack+isorropia+kokkos+nox+sacado+suite-sparse+trilinoscouplings+zoltan+stokhos+epetraextbtf+epetraextexperimental+epetraextgraphreorderings') + # tested versions of Trilinos for everything up to 7.4.0 + depends_on('trilinos@12.12.1:13.2.0', when='@:7.4.0') + depends_on('trilinos gotype=all cxxstd=11', when='^trilinos@:12.15') + # pymi requires Kokkos/KokkosKernels >= 3.3, Trilinos 13.2 onward + depends_on('trilinos@13.2.0:', when='+pymi') # Propagate variants to trilinos: for _variant in ('mpi',): @@ -68,10 +73,6 @@ class Xyce(CMakePackage): # installation of many more packages than are needed for Xyce. depends_on('trilinos~float~ifpack2~ml~muelu~zoltan2') - # ensures trilinos built with same cxxstd as Xyce (which Xyce was tested against) - for cxxstd_ in cxxstd_choices: - depends_on('trilinos cxxstd={0}'.format(cxxstd_), when='cxxstd={0}'.format(cxxstd_)) - def cmake_args(self): spec = self.spec |