summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Galarowicz <jeg@trenzasynergy.com>2023-10-23 14:31:20 -0500
committerGitHub <noreply@github.com>2023-10-23 12:31:20 -0700
commit8def7f5583e0bb52aff735cd3737e7080ab4993d (patch)
treefb7e64b158f55897ff79192e063197ca4432dbb8
parent66f07088cbd6ac123e8a92081ed7b4a8dd928e26 (diff)
downloadspack-8def7f5583e0bb52aff735cd3737e7080ab4993d.tar.gz
spack-8def7f5583e0bb52aff735cd3737e7080ab4993d.tar.bz2
spack-8def7f5583e0bb52aff735cd3737e7080ab4993d.tar.xz
spack-8def7f5583e0bb52aff735cd3737e7080ab4993d.zip
Update survey package file for survey version 9 changes. (#40619)
* Update survey package file for survey version 9 changes. * Fix single quote - make double. * Small change to trigger spack tests
-rw-r--r--var/spack/repos/builtin/packages/survey/package.py22
1 files changed, 17 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/survey/package.py b/var/spack/repos/builtin/packages/survey/package.py
index 79bac92966..1fc4c550f0 100644
--- a/var/spack/repos/builtin/packages/survey/package.py
+++ b/var/spack/repos/builtin/packages/survey/package.py
@@ -19,7 +19,7 @@ class Survey(CMakePackage):
available for tools inside current MPI implementations including:
MPICH, MVAPICH, MPT, and OpenMPI. It also supports multiple
architectures and has been tested on machines based on Intel,
- AMD, ARM, and IBM P8/9 processors and integrated GPUs.
+ AMD, ARM, and IBM P8/9 processors and integrated NVIDIA GPUs.
Survey is a licensed product with the source not openly available.
To access the survey source and build with spack please contact:
@@ -33,7 +33,8 @@ class Survey(CMakePackage):
maintainers("jgalarowicz")
version("master", branch="master")
- version("1.0.8", branch="1.0.8")
+ version("1.0.9", branch="1.0.9")
+ version("1.0.8", tag="1.0.8")
version("1.0.7", tag="1.0.7")
version("1.0.6", tag="1.0.6")
version("1.0.5", tag="1.0.5")
@@ -45,6 +46,7 @@ class Survey(CMakePackage):
version("1.0.0", branch="1.0.0")
variant("mpi", default=False, description="Enable mpi, build MPI data collector")
+ variant("debug", default=False, description="Build a debug survey version")
variant(
"tls_model",
@@ -61,9 +63,10 @@ class Survey(CMakePackage):
depends_on("libmonitor@2021.11.08+commrank", type=("build", "link", "run"), when="@1.0.3:")
depends_on("papi@5:", type=("build", "link", "run"))
- depends_on("gotcha@master", type=("build", "link", "run"))
- depends_on("llvm-openmp@9.0.0", type=("build", "link", "run"), when="@:1.0.2")
- depends_on("llvm-openmp@12.0.1", type=("build", "link", "run"), when="@1.0.3:")
+ depends_on("gotcha@master", type=("build", "link"), when="@:1.0.7")
+ depends_on("gotcha@1.0.4", type=("build", "link"), when="@1.0.8:")
+ depends_on("llvm-openmp@9.0.0", type=("build", "link"), when="@:1.0.2")
+ depends_on("llvm-openmp@12.0.1", type=("build", "link"), when="@1.0.3:")
# MPI Installation
depends_on("mpi", when="+mpi")
@@ -81,6 +84,10 @@ class Survey(CMakePackage):
depends_on("py-more-itertools", type=("build", "run"), when="@1.0.4:")
depends_on("py-versioneer", type=("build", "run"), when="@1.0.5:")
depends_on("py-filelock", type=("build", "run"), when="@1.0.7:")
+ depends_on("py-zipp", type=("build", "run"), when="@1.0.7:")
+ depends_on("py-humanize", type=("build", "run"), when="@1.0.8:")
+ depends_on("py-importlib-resources", type=("build", "run"), when="@1.0.8:")
+ depends_on("py-gitpython", type=("build", "run"), when="@1.0.9:")
extends("python")
@@ -117,6 +124,11 @@ class Survey(CMakePackage):
mpi_options = self.get_mpi_cmake_options(spec)
cmake_args.extend(mpi_options)
+ if "+debug" in spec:
+ cmake_args.append("-DCMAKE_C_FLAGS=-g -O2")
+ cmake_args.append("-DCMAKE_CXX_FLAGS=-g -O2")
+ cmake_args.append("-DCMAKE_BUILD_TYPE=Custom")
+
return cmake_args
def setup_run_environment(self, env):