From 3137e7c61b3d8e4f233cefebc205bb1833cd85f9 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Thu, 5 May 2022 17:37:52 -0700 Subject: Add two critical fixes and update for version 1.0.4 (#30507) --- var/spack/repos/builtin/packages/survey/package.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/survey/package.py b/var/spack/repos/builtin/packages/survey/package.py index 9d7480a85e..64428ec874 100644 --- a/var/spack/repos/builtin/packages/survey/package.py +++ b/var/spack/repos/builtin/packages/survey/package.py @@ -33,6 +33,7 @@ class Survey(CMakePackage): maintainers = ['jgalarowicz'] version('master', branch='master') + version('1.0.4', branch='1.0.4') version('1.0.3', tag='1.0.3') version('1.0.2', tag='1.0.2') version('1.0.1.1', tag='1.0.1.1') @@ -42,7 +43,7 @@ class Survey(CMakePackage): variant('mpi', default=False, description="Enable mpi, build MPI data collector") - variant('tls_model', default='implicit', + variant('tls_model', default='explicit', description='The TLS model to build with', values=('implicit', 'explicit')) @@ -61,7 +62,7 @@ class Survey(CMakePackage): # MPI Installation depends_on("mpi", when="+mpi") - depends_on("python@3:", type=('build', 'link', 'run')) + depends_on("python@3:", type=('build', 'run')) depends_on("py-setuptools", type='build') depends_on("py-pip", type='build') depends_on("py-pandas", type=('build', 'run')) @@ -71,6 +72,7 @@ class Survey(CMakePackage): depends_on("py-seaborn", type=('build', 'run'), when='@1.0.3:') depends_on("py-jinja2", type=('build', 'run'), when='@1.0.3:') depends_on("py-matplotlib", type=('build', 'run'), when='@1.0.3:') + depends_on("py-more-itertools", type=('build', 'run'), when='@1.0.4:') extends('python') @@ -103,8 +105,10 @@ class Survey(CMakePackage): ] # Add any MPI implementations coming from variant settings - mpi_options = self.get_mpi_cmake_options(spec) - cmake_args.extend(mpi_options) + if '+mpi' in spec: + mpi_options = self.get_mpi_cmake_options(spec) + cmake_args.extend(mpi_options) + return cmake_args def setup_run_environment(self, env): @@ -112,6 +116,8 @@ class Survey(CMakePackage): # Set SURVEY_MPI_IMPLEMENTATON to the appropriate mpi implementation # This is needed by survey to deploy the correct mpi runtimes. - env.set('SURVEY_MPI_IMPLEMENTATION', self.spec['mpi'].name.lower()) + if '+mpi' in self.spec: + env.set('SURVEY_MPI_IMPLEMENTATION', self.spec['mpi'].name.lower()) + # For compatibility reasons we need env.prepend_path('PATH', self.spec['python'].prefix.bin) -- cgit v1.2.3-70-g09d2