Update scotch to 7.0.8 and add/fix determinism flags

Author: klevzoff

CMakeLists.txt

@@ -980,7 +980,7 @@ endif(ENABLE_SUITESPARSE)
 
 if( ENABLE_SCOTCH )
     set( SCOTCH_DIR "${CMAKE_INSTALL_PREFIX}/scotch" )
-    set( SCOTCH_URL "${TPL_MIRROR_DIR}/scotch-v7.0.7.tar.gz" )
+    set( SCOTCH_URL "${TPL_MIRROR_DIR}/scotch-v7.0.8.tar.gz" )
 
     message( STATUS "Building SCOTCH found at ${SCOTCH_URL}" )
 
@@ -1006,7 +1006,7 @@ if( ENABLE_SCOTCH )
                                     -D BUILD_LIBSCOTCHMETIS:BOOL=OFF
                                     -D THREADS:BOOL=${SCOTCH_THREADS}
                                     -D INTSIZE:STRING=64
-                                    -D SCOTCH_RANDOM:STRING=FIXED_SEED
+                                    -D SCOTCH_DETERMINISTIC:STRING=FULL
                                     -D CMAKE_C_COMPILER=${MPI_C_COMPILER}
                                     -D CMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}
                                     -D CMAKE_C_FLAGS=${C_FLAGS_NO_WARNINGS}

scripts/spack_packages/packages/geosx/package.py

@@ -148,7 +148,7 @@ class Geosx(CMakePackage, CudaPackage):
     depends_on("superlu-dist+openmp", when="+openmp")
 
     # -Wno-error=implicit-function-declaration needed for 'METIS_PartMeshDual' error
-    depends_on("scotch@7.0.7 ~compression +mpi +esmumps +int64 ~shared ~metis build_system=cmake cflags='-fPIC' cxxflags='-fPIC'", when='+scotch')
+    depends_on("scotch@7.0.8 ~compression +mpi +esmumps +int64 determinism=FULL ~shared ~metis build_system=cmake cflags='-fPIC' cxxflags='-fPIC'", when='+scotch')
 
     depends_on('suite-sparse@5.10.1')
     depends_on("suite-sparse~openmp", when="~openmp")

scripts/spack_packages/packages/scotch/package.py

@@ -21,6 +21,7 @@ class Scotch(CMakePackage, MakefilePackage):
 
     maintainers("pghysels")
 
+    version("7.0.8", sha256="21f48ac85c7991a5eb5fae9232dd68584556ccc500f85e2ebd6b5b275617e11a")
     version("7.0.7", sha256="02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5")
     version("7.0.6", sha256="b44acd0d2f53de4b578fa3a88944cccc45c4d2961cd8cefa9b9a1d5431de8e2b")
     version("7.0.4", sha256="8ef4719d6a3356e9c4ca7fefd7e2ac40deb69779a5c116f44da75d13b3d2c2c3")
@@ -62,6 +63,7 @@ class Scotch(CMakePackage, MakefilePackage):
         when="@7.0.1",
         description="Link error handling library to libscotch/libptscotch",
     )
+    variant("determinism", default="FULL", values=("NONE", "FIXED_SEED", "FULL"), multi=False, description="Determinism configuration")
 
     depends_on("c", type="build")
     depends_on("cxx", type="build")
@@ -135,7 +137,7 @@ def cmake_args(self):
             self.define_from_variant("BUILD_PTSCOTCH", "mpi"),
             self.define_from_variant("THREADS", "threads"),
             self.define_from_variant("MPI_THREAD_MULTIPLE", "mpi_thread"),
-            self.define("SCOTCH_RANDOM", "FIXED_SEED"),
+            self.define_from_variant("SCOTCH_DETERMINISTIC", "determinism"),
         ]
 
         if self.pkg.version > Version("7.0.4"):
@@ -164,7 +166,14 @@ class MakefileBuilder(makefile.MakefileBuilder):
 
     def edit(self, pkg, spec, prefix):
         makefile_inc = []
-        cflags = ["-O3", "-DCOMMON_RANDOM_FIXED_SEED", "-DSCOTCH_DETERMINISTIC", "-DSCOTCH_RENAME"]
+        cflags = ["-O3", "-DSCOTCH_RENAME"]
+
+        if "determinism=FIXED_SEED" in self.spec:
+            cflags.append("-DCOMMON_RANDOM_FIXED_SEED")
+
+        if "determinism=FULL" in self.spec:
+            cflags.append("-DCOMMON_RANDOM_FIXED_SEED")
+            cflags.append("-DSCOTCH_DETERMINISTIC")
 
         # SCOTCH_Num typedef: size of integers in arguments
         # SCOTCH_Idx typedef: indices for addressing

tplMirror/scotch-v7.0.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21f48ac85c7991a5eb5fae9232dd68584556ccc500f85e2ebd6b5b275617e11a
+size 7788948