From 1949f67a7111a810dbc6f5e6d6624e003434c229 Mon Sep 17 00:00:00 2001 From: Cameron Book <43379611+ulmononian@users.noreply.github.com> Date: Mon, 26 Jun 2023 05:55:21 -0700 Subject: scotch: add new variants + bison version min. (#37958) --- var/spack/repos/builtin/packages/scotch/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 18704f4744..861ea92426 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -37,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=False, description="use multi-threaded algorithms") 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)") @@ -54,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") @@ -115,10 +117,10 @@ class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder): 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? - if "+int64" in spec: args.append("-DINTSIZE=64") -- cgit v1.2.3-60-g2f50