diff --git a/CMakeLists.txt b/CMakeLists.txt index b7033af0..bd496662 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -983,7 +983,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}" ) @@ -1009,7 +1009,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} diff --git a/docker/Stanford/Dockerfile b/docker/Stanford/Dockerfile index 07489b10..38119c16 100644 --- a/docker/Stanford/Dockerfile +++ b/docker/Stanford/Dockerfile @@ -49,8 +49,6 @@ RUN yum install -y \ make \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ autoconf-2.69 \ diff --git a/docker/TotalEnergies/Dockerfile b/docker/TotalEnergies/Dockerfile index 2c796542..6c5b6e58 100644 --- a/docker/TotalEnergies/Dockerfile +++ b/docker/TotalEnergies/Dockerfile @@ -38,8 +38,6 @@ RUN yum install --disablerepo=intel-mkl-repo -y \ make \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ autoconf \ diff --git a/docker/TotalEnergies/Pangea3-base.Dockerfile b/docker/TotalEnergies/Pangea3-base.Dockerfile index d3510d82..5cd04e28 100644 --- a/docker/TotalEnergies/Pangea3-base.Dockerfile +++ b/docker/TotalEnergies/Pangea3-base.Dockerfile @@ -16,9 +16,6 @@ RUN dnf install -y \ make \ bc \ file \ - # Scotch deps \ - bison \ - flex \ # vtk deps \ patch && \ git-lfs install #&& alternatives --set python /usr/bin/python3 diff --git a/docker/TotalEnergies/Pangea3.Dockerfile b/docker/TotalEnergies/Pangea3.Dockerfile index bfad0260..eee5ee68 100644 --- a/docker/TotalEnergies/Pangea3.Dockerfile +++ b/docker/TotalEnergies/Pangea3.Dockerfile @@ -16,6 +16,7 @@ RUN dnf clean all && \ dnf -y install \ autoconf \ automake \ + gettext-devel \ libtool \ bzip2 \ unzip diff --git a/docker/pangea-spack.yaml b/docker/pangea-spack.yaml index b1b3b49e..5cac83b6 100644 --- a/docker/pangea-spack.yaml +++ b/docker/pangea-spack.yaml @@ -25,9 +25,6 @@ spack: target: ppc64le modules: [] environment: - set: # Needed for scotch - BISON: bison - FLEX: flex prepend_path: LD_LIBRARY_PATH: /data_local/sw/lsf/10.1/linux3.10-glibc2.17-ppc64le/lib extra_rpaths: [] @@ -89,11 +86,6 @@ spack: - spec: automake@1.16.1 prefix: /usr buildable: false - bison: - externals: - - spec: bison@3.0.4 - prefix: /usr - buildable: false bzip2: externals: - spec: bzip2@1.0.6 @@ -109,11 +101,6 @@ spack: - spec: cuda@11.5.0 +allow-unsupported-compilers prefix: /data_local/sw/cuda/11.5.0 buildable: false - flex: - externals: - - spec: flex@2.6.1+lex - prefix: /usr - buildable: false gettext: externals: - spec: gettext@0.19.8.1 diff --git a/docker/pecan-spack.yaml b/docker/pecan-spack.yaml index 2551f134..b5b25ce0 100644 --- a/docker/pecan-spack.yaml +++ b/docker/pecan-spack.yaml @@ -15,10 +15,6 @@ spack: compilers:: # Pecan CPU/GPU compiler - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -92,12 +88,6 @@ spack: externals: - spec: automake@1.16.5 prefix: /usr - bison: - version: [3.8.2] - buildable: false - externals: - - spec: bison@3.8.2 - prefix: /usr cmake: version: [3.28.3] buildable: false @@ -109,12 +99,6 @@ spack: externals: - spec: cuda@11.5.1 +allow-unsupported-compilers prefix: /hrtc/apps/cuda/11.5.119/x86_64/centos7 - flex: - version: [2.6.4] - buildable: false - externals: - - spec: flex@2.6.4 - prefix: /usr # Lock down blas, lapack implementation intel-mkl: diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml index 605b9775..2656286b 100644 --- a/docker/rocky-spack.yaml +++ b/docker/rocky-spack.yaml @@ -14,10 +14,6 @@ spack: compilers:: - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -32,10 +28,6 @@ spack: spec: clang@17.0.6 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -109,12 +101,6 @@ spack: externals: - spec: automake@1.16.5 prefix: /usr - bison: - version: [3.8.2] - buildable: false - externals: - - spec: bison@3.8.2 - prefix: /usr cmake: version: [3.28.6] buildable: false @@ -128,12 +114,6 @@ spack: prefix: /usr/local/cuda - spec: cuda@12.6.3%clang@17.0.6 +allow-unsupported-compilers prefix: /usr/local/cuda - flex: - version: [2.6.4] - buildable: false - externals: - - spec: flex@2.6.4 - prefix: /usr m4: buildable: false externals: diff --git a/docker/spack.yaml b/docker/spack.yaml index 0bef799b..b9d26023 100644 --- a/docker/spack.yaml +++ b/docker/spack.yaml @@ -14,10 +14,6 @@ spack: compilers:: - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: {} modules: [] @@ -30,10 +26,6 @@ spack: spec: clang@15 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: {} modules: [] @@ -46,10 +38,6 @@ spack: spec: clang@10 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -64,10 +52,6 @@ spack: spec: gcc@12 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -82,10 +66,6 @@ spack: spec: gcc@11 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -100,10 +80,6 @@ spack: spec: gcc@10 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -118,10 +94,6 @@ spack: spec: gcc@9 target: x86_64 - compiler: - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] flags: cflags: -pthread @@ -195,12 +167,6 @@ spack: externals: - spec: automake@1.16.5 prefix: /usr - bison: - version: [3.8.2] - buildable: false - externals: - - spec: bison@3.8.2 - prefix: /usr cmake: version: [3.28.3] buildable: false @@ -212,12 +178,6 @@ spack: externals: - spec: cuda@11.8.0 +allow-unsupported-compilers prefix: /usr/local/cuda - flex: - version: [2.6.4] - buildable: false - externals: - - spec: flex@2.6.4 - prefix: /usr findutils: version: [4.7.0] buildable: false diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml index 6e4439df..195b1fbb 100644 --- a/docker/stanford-spack.yaml +++ b/docker/stanford-spack.yaml @@ -28,10 +28,6 @@ spack: cflags: -pthread cxxflags: -pthread modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] packages: @@ -92,13 +88,6 @@ spack: - spec: automake@1.13.4 prefix: /usr - bison: - version: [3.0.4] - buildable: false - externals: - - spec: bison@3.0.4 - prefix: /usr - cmake: buildable: false externals: @@ -117,12 +106,6 @@ spack: # - spec: diffutils@3.3 # prefix: /usr - flex: - buildable: false - externals: - - spec: flex@2.5.37 - prefix: /usr - #gettext: # buildable: false # externals: diff --git a/docker/tpl-centos-gcc-cuda.Dockerfile b/docker/tpl-centos-gcc-cuda.Dockerfile index 1414fe42..08033dbb 100644 --- a/docker/tpl-centos-gcc-cuda.Dockerfile +++ b/docker/tpl-centos-gcc-cuda.Dockerfile @@ -66,8 +66,6 @@ RUN yum install -y \ make \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ autoconf \ diff --git a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile index a761b40e..3f32fdcc 100644 --- a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile @@ -51,8 +51,6 @@ RUN dnf clean all && \ tbb-devel \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ autoconf \ diff --git a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile index a63229a6..4a3f6ab9 100644 --- a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile @@ -49,8 +49,6 @@ RUN dnf clean all && \ tbb-devel \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ autoconf \ diff --git a/docker/tpl-ubuntu-clang-cuda.Dockerfile b/docker/tpl-ubuntu-clang-cuda.Dockerfile index b2764e0c..6c70fabb 100644 --- a/docker/tpl-ubuntu-clang-cuda.Dockerfile +++ b/docker/tpl-ubuntu-clang-cuda.Dockerfile @@ -50,8 +50,6 @@ RUN apt-get install -y --no-install-recommends \ libtbb-dev \ bc \ file \ - bison \ - flex \ patch \ ca-certificates \ git diff --git a/docker/tpl-ubuntu-clang.Dockerfile b/docker/tpl-ubuntu-clang.Dockerfile index d4bb74ce..98a5d24f 100644 --- a/docker/tpl-ubuntu-clang.Dockerfile +++ b/docker/tpl-ubuntu-clang.Dockerfile @@ -60,8 +60,6 @@ RUN apt-get install -y --no-install-recommends \ make \ bc \ file \ - bison \ - flex \ # GEOS patches some tpl. Remove when it's not the case anymore. patch \ # `ca-certificates` needed by `git` to download spack repo. diff --git a/docker/tpl-ubuntu-gcc.Dockerfile b/docker/tpl-ubuntu-gcc.Dockerfile index 5560da55..beb456ad 100644 --- a/docker/tpl-ubuntu-gcc.Dockerfile +++ b/docker/tpl-ubuntu-gcc.Dockerfile @@ -96,8 +96,6 @@ RUN apt-get install -y --no-install-recommends \ make \ bc \ file \ - bison \ - flex \ # GEOS patches some tpl. Remove when it's not the case anymore. patch \ # `ca-certificates` needed by `git` to download spack repo. diff --git a/scripts/pygeosx_configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/pygeosx_configs/blueos_3_ppc64le_ib_p9/spack.yaml index 565a1207..b6883458 100644 --- a/scripts/pygeosx_configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/pygeosx_configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -115,16 +115,6 @@ spack: externals: - spec: libtool@2.4.2 prefix: /usr - bison: - buildable: False - externals: - - spec: bison@3.0.4 - prefix: /usr - flex: - buildable: False - externals: - - spec: flex@2.5.37 - prefix: /usr tk: buildable: False externals: diff --git a/scripts/pygeosx_configs/toss_4_x86_64_ib/spack.yaml b/scripts/pygeosx_configs/toss_4_x86_64_ib/spack.yaml index 0fb9dc34..fc3071a3 100644 --- a/scripts/pygeosx_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/pygeosx_configs/toss_4_x86_64_ib/spack.yaml @@ -120,16 +120,6 @@ spack: externals: - spec: libtool@2.4.6 prefix: /usr - bison: - buildable: False - externals: - - spec: bison@3.0.4 - prefix: /usr - flex: - buildable: False - externals: - - spec: flex@2.6.1 - prefix: /usr tk: buildable: False externals: diff --git a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml index 071cebbb..f47d2ab5 100644 --- a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -51,10 +51,6 @@ spack: operating_system: rhel7 target: ppc64le modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: clang@13.0.1 @@ -67,10 +63,6 @@ spack: operating_system: rhel7 target: ppc64le modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: gcc@8.3.1 @@ -85,10 +77,6 @@ spack: operating_system: rhel7 target: ppc64le modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: gcc@12.2.1 @@ -103,10 +91,6 @@ spack: operating_system: rhel7 target: ppc64le modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] packages: @@ -234,11 +218,6 @@ spack: externals: - spec: libtool@2.4.2 prefix: /usr - flex: - buildable: False - externals: - - spec: flex@2.5.37 - prefix: /usr gettext: buildable: False externals: diff --git a/scripts/spack_configs/darwin/packages.yaml b/scripts/spack_configs/darwin/packages.yaml index 5b05bd37..eb3f3a8e 100644 --- a/scripts/spack_configs/darwin/packages.yaml +++ b/scripts/spack_configs/darwin/packages.yaml @@ -61,18 +61,6 @@ packages: # - spec: py-sphinx@1.6.3 # prefix: /collab/usr/gapps/python/build/spack-toss3.2/opt/spack/linux-rhel7-x86_64/gcc-4.9.3/python-2.7.14-7rci3jkmuht2uiwp433afigveuf4ocnu/ # - # bison: - # buildable: False - # externals: - # - spec: bison@3.0.4 - # prefix: /usr/bin/ - # - # flex: - # buildable: False - # externals: - # - spec: flex@2.5.37 - # prefix: /usr/bin/ - # # bzip2: # buildable: False # externals: diff --git a/scripts/spack_configs/macOS/spack.yaml b/scripts/spack_configs/macOS/spack.yaml index 2731500d..3449563f 100644 --- a/scripts/spack_configs/macOS/spack.yaml +++ b/scripts/spack_configs/macOS/spack.yaml @@ -29,10 +29,6 @@ spack: operating_system: sequoia target: aarch64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: apple-clang@17.0.0 @@ -50,10 +46,6 @@ spack: operating_system: sequoia target: aarch64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] packages: @@ -170,11 +162,6 @@ spack: externals: - spec: gettext@0.23.1 prefix: /opt/homebrew/opt/gettext - flex: - buildable: False - externals: - - spec: flex@2.6.4 - prefix: /opt/homebrew/opt/flex addr2line: buildable: False diff --git a/scripts/spack_configs/pangea-3/spack.yaml b/scripts/spack_configs/pangea-3/spack.yaml index 4c94e8a7..05d7977e 100644 --- a/scripts/spack_configs/pangea-3/spack.yaml +++ b/scripts/spack_configs/pangea-3/spack.yaml @@ -42,10 +42,6 @@ spack: operating_system: rhel8 target: ppc64le modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex prepend_path: # Needed for caliper LD_LIBRARY_PATH: /data_local/sw/lsf/10.1/linux3.10-glibc2.17-ppc64le/lib extra_rpaths: [] @@ -114,11 +110,6 @@ spack: - spec: berkeley-db@18.1.40 prefix: /data_local/sw/spack/0.22.1/opt/spack/linux-rhel8-power9le/gcc-8.4.1/berkeley-db-18.1.40-y53coeam7ym7i2wnyzv3j52t6agjfuhh buildable: false - bison: - externals: - - spec: bison@3.8.2 - prefix: /data_local/sw/spack/0.22.1/opt/spack/linux-rhel8-power9le/gcc-8.4.1/bison-3.8.2-wwemfpkqdr7voqfkbu4qfs5xjzwf7anj - buildable: false cmake: externals: - spec: cmake@3.27.9 @@ -163,11 +154,6 @@ spack: # spec of system packages to reuse # bin - flex: - externals: - - spec: flex@2.6.1+lex - prefix: /usr - buildable: false git: externals: - spec: git@2.27.0+tcltk diff --git a/scripts/spack_configs/pangea-4/spack.yaml b/scripts/spack_configs/pangea-4/spack.yaml index 9408984c..0d41ec97 100644 --- a/scripts/spack_configs/pangea-4/spack.yaml +++ b/scripts/spack_configs/pangea-4/spack.yaml @@ -41,10 +41,6 @@ spack: operating_system: rhel8 target: x86_64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] ############# @@ -152,21 +148,11 @@ spack: - spec: gmp@6.2.1 prefix: /lustre/p4scratch/data_local/sw/RHEL8/spack-0.21.0/opt/gcc-12.1/gmp-6.2.1-pwaztmh buildable: false - bison: - externals: - - spec: bison@3.8.2 - prefix: /lustre/p4scratch/data_local/sw/RHEL8/spack-0.21.0/opt/gcc-12.1/bison-3.8.2-2ym7ugj - buildable: false #### # spec of system packages to reuse # bin - flex: - externals: - - spec: flex@2.6.1+lex - prefix: /usr - buildable: false git: externals: - spec: git@2.39.3~tcltk diff --git a/scripts/spack_configs/pine/spack.yaml b/scripts/spack_configs/pine/spack.yaml index d7b68204..ab0d9113 100644 --- a/scripts/spack_configs/pine/spack.yaml +++ b/scripts/spack_configs/pine/spack.yaml @@ -39,10 +39,6 @@ spack: operating_system: rocky9 target: x86_64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] ############# @@ -102,11 +98,6 @@ spack: #### # spec of spack packages to reuse - bison: - externals: - - spec: bison@3.8.2 - prefix: /hrtc/apps/devtools/spack/PINE/linux-rocky9-zen4/gcc-11.4.1/bison-3.8.2-ws5cszsf5536mcdqj3zbt7uynp6ho756/ - buildable: false gmp: externals: - spec: gmp@6.3.0 @@ -141,11 +132,6 @@ spack: #### # spec of system packages to reuse # bin - flex: - externals: - - spec: flex@2.6.4+lex - prefix: /usr - buildable: false git: externals: - spec: git@2.39.3~tcltk diff --git a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml index 7b9ef71e..20e1f635 100644 --- a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml @@ -48,10 +48,6 @@ spack: operating_system: rhel8 target: x86_64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: gcc@12.1.1 @@ -63,10 +59,6 @@ spack: operating_system: rhel8 target: x86_64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] - compiler: spec: gcc@12noAVX @@ -80,10 +72,6 @@ spack: operating_system: rhel8 target: x86_64 modules: [] - environment: - set: # Needed for scotch - BISON: bison - FLEX: flex extra_rpaths: [] packages: @@ -221,8 +209,3 @@ spack: externals: - spec: gettext@0.19.8.1 prefix: /usr/bin/ - flex: - buildable: False - externals: - - spec: flex@2.6.1 - prefix: /usr diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index c86d0584..5196f4ab 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/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") diff --git a/scripts/spack_packages/packages/scotch/package.py b/scripts/spack_packages/packages/scotch/package.py index 726aae57..c79025a8 100644 --- a/scripts/spack_packages/packages/scotch/package.py +++ b/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 diff --git a/tplMirror/scotch-v7.0.7.tar.gz b/tplMirror/scotch-v7.0.7.tar.gz deleted file mode 100644 index 58c7a1b7..00000000 --- a/tplMirror/scotch-v7.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5 -size 7708868 diff --git a/tplMirror/scotch-v7.0.8.tar.gz b/tplMirror/scotch-v7.0.8.tar.gz new file mode 100644 index 00000000..2715c604 --- /dev/null +++ b/tplMirror/scotch-v7.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21f48ac85c7991a5eb5fae9232dd68584556ccc500f85e2ebd6b5b275617e11a +size 7788948