diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 6f4c576be5aedb..a83d0919f258ab 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -20,6 +20,7 @@ class Scotch(CMakePackage, MakefilePackage): maintainers("pghysels") + version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5") version("7.0.1", sha256="0618e9bc33c02172ea7351600fce4fccd32fe00b3359c4aabb5e415f17c06fed") version("6.1.3", sha256="4e54f056199e6c23d46581d448fcfe2285987e5554a0aa527f7931684ef2809e") version("6.1.2", sha256="9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450") @@ -36,6 +37,8 @@ class Scotch(CMakePackage, MakefilePackage): version("5.1.10b", sha256="54c9e7fafefd49d8b2017d179d4f11a655abe10365961583baaddc4eeb6a9add") build_system(conditional("cmake", when="@7:"), "makefile", default="cmake") + variant("threads", default=True, description="use POSIX Pthreads within Scotch and PT-Scotch") + variant("mpi_thread", default=True, description="use multi-threaded algorithms in conjunction with MPI") variant("mpi", default=True, description="Compile parallel libraries") variant("compression", default=True, description="May use compressed files") variant("esmumps", default=False, description="Compile esmumps (needed by mumps)") @@ -53,7 +56,7 @@ class Scotch(CMakePackage, MakefilePackage): # Does not build with flex 2.6.[23] depends_on("flex@:2.6.1,2.6.4:", type="build") - depends_on("bison", type="build") + depends_on("bison@3.4:", type="build") depends_on("mpi", when="+mpi") depends_on("zlib", when="+compression") @@ -114,6 +117,8 @@ def cmake_args(self): self.define_from_variant("BUILD_LIBESMUMPS", "esmumps"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("BUILD_PTSCOTCH", "mpi"), + self.define_from_variant("THREADS", "threads"), + self.define_from_variant("MPI_THREAD_MULTIPLE", "mpi_thread") ] # TODO should we enable/disable THREADS? diff --git a/var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py index f959f6734a954a..89e3a43e475a00 100644 --- a/var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py +++ b/var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py @@ -34,6 +34,7 @@ class UfsWeatherModelEnv(BundlePackage): depends_on("ip", type="run") depends_on("sp", type="run") depends_on("w3emc", type="run") + depends_on("scotch", type="run") depends_on("esmf~debug", type="run", when="~debug") depends_on("esmf+debug", type="run", when="+debug")