zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update survey package file for survey version 9 changes. (#40619)

Browse Source 
* Update survey package file for survey version 9 changes.
* Fix single quote - make double.
* Small change to trigger spack tests
This commit is contained in:
Jim Galarowicz 2023-10-23 14:31:20 -05:00 committed by GitHub
parent 66f07088cb
commit 8def7f5583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/survey/package.py
View File

@ -19,7 +19,7 @@ class Survey(CMakePackage):
available for tools inside current MPI implementations including: available for tools inside current MPI implementations including:
MPICH, MVAPICH, MPT, and OpenMPI. It also supports multiple MPICH, MVAPICH, MPT, and OpenMPI. It also supports multiple
architectures and has been tested on machines based on Intel, 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. Survey is a licensed product with the source not openly available.
To access the survey source and build with spack please contact: To access the survey source and build with spack please contact:
@ -33,7 +33,8 @@ class Survey(CMakePackage):
maintainers("jgalarowicz") maintainers("jgalarowicz")
version("master", branch="master") 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.7", tag="1.0.7")
version("1.0.6", tag="1.0.6") version("1.0.6", tag="1.0.6")
version("1.0.5", tag="1.0.5") version("1.0.5", tag="1.0.5")
@ -45,6 +46,7 @@ class Survey(CMakePackage):
version("1.0.0", branch="1.0.0") version("1.0.0", branch="1.0.0")
variant("mpi", default=False, description="Enable mpi, build MPI data collector") variant("mpi", default=False, description="Enable mpi, build MPI data collector")
variant("debug", default=False, description="Build a debug survey version")
variant( variant(
"tls_model", "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("libmonitor@2021.11.08+commrank", type=("build", "link", "run"), when="@1.0.3:")
depends_on("papi@5:", type=("build", "link", "run")) depends_on("papi@5:", type=("build", "link", "run"))
depends_on("gotcha@master", type=("build", "link", "run")) depends_on("gotcha@master", type=("build", "link"), when="@:1.0.7")
depends_on("llvm-openmp@9.0.0", type=("build", "link", "run"), when="@:1.0.2") depends_on("gotcha@1.0.4", type=("build", "link"), when="@1.0.8:")
depends_on("llvm-openmp@12.0.1", type=("build", "link", "run"), when="@1.0.3:") 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 # MPI Installation
depends_on("mpi", when="+mpi") 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-more-itertools", type=("build", "run"), when="@1.0.4:")
depends_on("py-versioneer", type=("build", "run"), when="@1.0.5:") 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-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") extends("python")
@ -117,6 +124,11 @@ def cmake_args(self):
mpi_options = self.get_mpi_cmake_options(spec) mpi_options = self.get_mpi_cmake_options(spec)
cmake_args.extend(mpi_options) 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 return cmake_args
def setup_run_environment(self, env): def setup_run_environment(self, env):