diff --git a/.github/workflows/docker_build_tpls.yml b/.github/workflows/docker_build_tpls.yml index b4181e62..e96857a5 100644 --- a/.github/workflows/docker_build_tpls.yml +++ b/.github/workflows/docker_build_tpls.yml @@ -19,68 +19,72 @@ jobs: matrix: include: - - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3) - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 - TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile - DOCKER_ROOT_IMAGE: ubuntu:20.04 - DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=9" - RUNS_ON: ubuntu-latest - - name: Ubuntu (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 - TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile - DOCKER_ROOT_IMAGE: mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04 - DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=10" - RUNS_ON: ubuntu-latest - - name: Ubuntu (22.04, gcc 11.4.0, open-mpi 4.1.2) - DOCKER_ROOT_IMAGE: ubuntu:22.04 - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 - TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile - DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=11" - RUNS_ON: ubuntu-latest - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) - DOCKER_ROOT_IMAGE: ubuntu:22.04 - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 - TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile - DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=12" - RUNS_ON: ubuntu-latest - - name: Ubuntu (22.04, clang 15.0.7 + gcc 11.4.0, open-mpi 4.1.2) - DOCKER_ROOT_IMAGE: ubuntu:22.04 - DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15 - TPL_DOCKERFILE: docker/tpl-ubuntu-clang.Dockerfile - DOCKER_COMPILER_BUILD_ARG: "--build-arg CLANG_MAJOR_VERSION=15 --build-arg GCC_MAJOR_VERSION=11" - RUNS_ON: ubuntu-latest - - name: Ubuntu (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) - DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 - TPL_DOCKERFILE: docker/tpl-ubuntu-clang-cuda.Dockerfile - RUNS_ON: ubuntu-latest + # - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3) + # DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 + # TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile + # DOCKER_ROOT_IMAGE: ubuntu:20.04 + # DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=9" + # RUNS_ON: ubuntu-latest + # - name: Ubuntu (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces + # DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 + # TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile + # DOCKER_ROOT_IMAGE: mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04 + # DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=10" + # RUNS_ON: ubuntu-latest + # - name: Ubuntu (22.04, gcc 11.4.0, open-mpi 4.1.2) + # DOCKER_ROOT_IMAGE: ubuntu:22.04 + # DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 + # TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile + # DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=11" + # RUNS_ON: ubuntu-latest + # - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) + # DOCKER_ROOT_IMAGE: ubuntu:22.04 + # DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 + # TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile + # DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=12" + # RUNS_ON: ubuntu-latest + # - name: Ubuntu (22.04, clang 15.0.7 + gcc 11.4.0, open-mpi 4.1.2) + # DOCKER_ROOT_IMAGE: ubuntu:22.04 + # DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15 + # TPL_DOCKERFILE: docker/tpl-ubuntu-clang.Dockerfile + # DOCKER_COMPILER_BUILD_ARG: "--build-arg CLANG_MAJOR_VERSION=15 --build-arg GCC_MAJOR_VERSION=11" + # RUNS_ON: ubuntu-latest + # - name: Ubuntu (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) + # DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 + # TPL_DOCKERFILE: docker/tpl-ubuntu-clang-cuda.Dockerfile + # RUNS_ON: ubuntu-latest - name: Rockylinux (8, gcc 13.3, cuda 12.9.1) DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1 TPL_DOCKERFILE: docker/tpl-rockylinux-gcc-cuda-12.Dockerfile RUNS_ON: Runner_4core_16GB - - name: Rockylinux (8, clang 17.0.6, cuda 12.9.1) - DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1 - TPL_DOCKERFILE: docker/tpl-rockylinux-clang-cuda-12.Dockerfile + - name: Rockylinux_pygeosx (8, gcc 13.3, cuda 12.9.1) + DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1 + TPL_DOCKERFILE: docker/tpl-rockylinux-gcc-cuda-12-pygeosx.Dockerfile RUNS_ON: Runner_4core_16GB - - name: Pangea 3 (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10) - DOCKER_REPOSITORY: geosx/pangea3-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18 - TPL_DOCKERFILE: docker/TotalEnergies/Pangea3.Dockerfile - DOCKER_ROOT_IMAGE: 7g8efcehpff/pangea-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18:4 - HOST_ARCH: ppc64le - RUNS_ON: streak2 - - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11) - DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11 - TPL_DOCKERFILE: docker/Stanford/Dockerfile - DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1 - SPEC: "%gcc@10.1.0~pygeosx~openmp" - INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU - RUNS_ON: ubuntu-latest - - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 12.4.0, openblas 0.3.10, zlib 1.2.11) - DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11 - TPL_DOCKERFILE: docker/Stanford/Dockerfile - DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1 - SPEC: "%gcc@10.1.0~pygeosx~openmp cuda_arch=70 ^cuda@12.4.0+allow-unsupported-compilers" - INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU - RUNS_ON: ubuntu-latest + # - name: Rockylinux (8, clang 17.0.6, cuda 12.9.1) + # DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1 + # TPL_DOCKERFILE: docker/tpl-rockylinux-clang-cuda-12.Dockerfile + # RUNS_ON: Runner_4core_16GB + # - name: Pangea 3 (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10) + # DOCKER_REPOSITORY: geosx/pangea3-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18 + # TPL_DOCKERFILE: docker/TotalEnergies/Pangea3.Dockerfile + # DOCKER_ROOT_IMAGE: 7g8efcehpff/pangea-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18:4 + # HOST_ARCH: ppc64le + # RUNS_ON: streak2 + # - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11) + # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11 + # TPL_DOCKERFILE: docker/Stanford/Dockerfile + # DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1 + # SPEC: "%gcc@10.1.0~pygeosx~openmp" + # INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU + # RUNS_ON: ubuntu-latest + # - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 12.4.0, openblas 0.3.10, zlib 1.2.11) + # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11 + # TPL_DOCKERFILE: docker/Stanford/Dockerfile + # DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1 + # SPEC: "%gcc@10.1.0~pygeosx~openmp cuda_arch=70 ^cuda@12.4.0+allow-unsupported-compilers" + # INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU + # RUNS_ON: ubuntu-latest steps: - name: Checkout diff --git a/docker/rocky-pygeosx-spack.yaml b/docker/rocky-pygeosx-spack.yaml new file mode 100644 index 00000000..e3a2dab3 --- /dev/null +++ b/docker/rocky-pygeosx-spack.yaml @@ -0,0 +1,149 @@ +spack: + config: + install_tree: + root: $spack/.. + projections: + all: '{compiler.name}-{compiler.version}/{name}-{version}-{hash}' + misc_cache: $spack/../misc_cache + test_stage: $spack/../test_stage + build_stage:: + - $spack/../build_stage + + # Regular TPLs do not need views + view: false + + # Include shared variants and versions + include: + - ../defaults.yaml + - ../versions.yaml + + compilers:: + - compiler: + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: rocky8 + paths: + cc: /usr/bin/clang + cxx: /usr/bin/clang++ + f77: /usr/bin/gfortran + fc: /usr/bin/gfortran + spec: clang@17.0.6 + target: x86_64 + - compiler: + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: rocky8 + paths: + cc: /opt/rh/gcc-toolset-13/root/usr/bin/gcc + cxx: /opt/rh/gcc-toolset-13/root/usr/bin/g++ + f77: /opt/rh/gcc-toolset-13/root/usr/bin/gfortran + fc: /opt/rh/gcc-toolset-13/root/usr/bin/gfortran + spec: gcc@13.3.1 + target: x86_64 + + packages: + all: + target: [x86_64] + compiler: [gcc, clang] + providers: + blas: [netlib-lapack] + lapack: [netlib-lapack] + mpi: [openmpi] + + autoconf: + version: [2.69] + buildable: false + externals: + - spec: autoconf@2.69 + prefix: /usr + automake: + version: [1.16.1] + buildable: false + externals: + - spec: automake@1.16.1 + prefix: /usr + cmake: + version: [3.28.6] + buildable: false + externals: + - spec: cmake@3.28.6 + prefix: /usr/local + cuda: + buildable: False + externals: + - spec: cuda@12.9.1%gcc@13.3.1 +allow-unsupported-compilers + prefix: /usr/local/cuda + - spec: cuda@12.9.1%clang@17.0.6 +allow-unsupported-compilers + prefix: /usr/local/cuda + m4: + buildable: false + externals: + - spec: m4@1.4.18 + prefix: /usr + + # Spack may grab for mpi & we don't want to use them + mpi: + buildable: false + + netlib-lapack: + buildable: false + externals: + - spec: netlib-lapack@3.8.0 + prefix: /usr + netlib-blas: + buildable: false + externals: + - spec: netlib-blas@3.8.0 + prefix: /usr + openmpi: + externals: + - spec: openmpi@4.1.1 + prefix: /usr/lib64/openmpi + perl: + buildable: false + externals: + - spec: perl@5.26.3 + prefix: /usr + pkg-config: + buildable: false + externals: + - spec: pkg-config@1.4.2 + prefix: /usr + tar: + buildable: false + externals: + - spec: tar@1.34 + prefix: /usr + unzip: + buildable: false + externals: + - spec: unzip@6.0 + prefix: /usr + xz: + buildable: false + externals: + - spec: xz@5.2.5 + prefix: /usr + + # Pygeosx dependencies + openssl: + buildable: false + externals: + - spec: openssl@1.1.1 + prefix: /usr + tk: + buildable: false + externals: + - spec: tk@8.6.8 + prefix: /usr + tcl: + buildable: false + externals: + - spec: tcl@8.6.8 + prefix: /usr diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml index 94025319..a11b9dcd 100644 --- a/docker/rocky-spack.yaml +++ b/docker/rocky-spack.yaml @@ -118,7 +118,7 @@ spack: python: buildable: false externals: - - spec: python@3.6.8 + - spec: python@3.9.20 prefix: /usr tar: buildable: false diff --git a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile index bffe8879..d42d376c 100644 --- a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile @@ -16,7 +16,8 @@ RUN dnf clean all && \ which \ clang-17.0.6 \ gcc-gfortran \ - python3 \ + python3.9 \ + python3-pip \ zlib-devel \ tbb \ blas \ @@ -24,19 +25,17 @@ RUN dnf clean all && \ openmpi \ openmpi-devel \ # Additional spack dependencies - python3-pip \ unzip \ mpfr-devel \ bzip2 \ gnupg \ - xz \ - python3-virtualenv + xz RUN dnf config-manager --set-enabled & # Install clingo for Spack -RUN python3 -m pip install --upgrade pip && \ - python3 -m pip install clingo +RUN python3.9 -m pip install --upgrade pip && \ + python3.9 -m pip install clingo virtualenv RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-cmake.sh diff --git a/docker/tpl-rockylinux-gcc-cuda-12-pygeosx.Dockerfile b/docker/tpl-rockylinux-gcc-cuda-12-pygeosx.Dockerfile new file mode 100644 index 00000000..e70faa7d --- /dev/null +++ b/docker/tpl-rockylinux-gcc-cuda-12-pygeosx.Dockerfile @@ -0,0 +1,115 @@ +ARG TMP_DIR=/tmp +ARG SRC_DIR=$TMP_DIR/thirdPartyLibs +ARG BLD_DIR=$TMP_DIR/build + +FROM nvidia/cuda:12.9.1-devel-rockylinux8 AS tpl_toolchain_intersect_geosx_toolchain +ARG SRC_DIR + +ARG INSTALL_DIR +ENV GEOSX_TPL_DIR=$INSTALL_DIR + +# Installing dependencies +RUN dnf clean all && \ + dnf -y update && \ + dnf -y install \ + which \ + gcc-toolset-13 \ + python3.9 \ + python3-pip \ + python3-tkinter \ + zlib-devel \ + tbb \ + blas \ + lapack \ + openmpi \ + openmpi-devel \ + # Additional spack dependencies + unzip \ + mpfr-devel \ + bzip2 \ + gnupg \ + xz + +# Install clingo for Spack +RUN python3.9 -m pip install --upgrade pip && \ + python3.9 -m pip install clingo virtualenv + +# Custom install script for CMake or other tools +RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-cmake.sh + +# Installing TPL's +FROM tpl_toolchain_intersect_geosx_toolchain AS tpl_toolchain +ARG SRC_DIR +ARG BLD_DIR + +# Install additional required packages +RUN dnf clean all && \ + dnf -y update && \ + dnf -y install \ + tbb-devel \ + bc \ + file \ + patch \ + ca-certificates \ + autoconf \ + automake \ + m4 \ + git + +# Run uberenv +# Have to create install directory first for uberenv +# -k flag is to ignore SSL errors +RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \ + mkdir -p ${GEOSX_TPL_DIR} && \ +# Create symlink to openmpi include directory + ln -s /usr/include/openmpi-x86_64 /usr/lib64/openmpi/include && \ +# Create symlinks to blas/lapack libraries + ln -s /usr/lib64/libblas.so.3 /usr/lib64/libblas.so && \ + ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \ + ./scripts/uberenv/uberenv.py \ + --spec "%gcc@13.3.1+cuda~uncrustify~openmp cuda_arch=70 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \ + --spack-env-file=${SRC_DIR}/docker/rocky-pygeosx-spack.yaml \ + --project-json=./scripts/pygeosx_configs/pygeosx.json \ + --prefix ${GEOSX_TPL_DIR} \ + -k && \ +# Remove host-config generated for LvArray + rm lvarray* && \ +# Rename and copy spack-generated host-config to root directory + cp *.cmake /spack-generated.cmake && \ +# Remove extraneous spack files + cd ${GEOSX_TPL_DIR} && \ + rm -rf bin/ build_stage/ misc_cache/ spack/ spack_env/ .spack-db/ + +# Extract only TPL's from the previous stage +FROM tpl_toolchain_intersect_geosx_toolchain AS geosx_toolchain +ARG SRC_DIR + +COPY --from=tpl_toolchain $GEOSX_TPL_DIR $GEOSX_TPL_DIR + +# Extract the generated host-config +COPY --from=tpl_toolchain /spack-generated.cmake / + +# Final installation of packages and tools +RUN dnf clean all && \ + rm -rf /var/cache/dnf && \ + dnf -y install dnf-plugins-core && \ + dnf config-manager --set-enabled devel && \ + dnf -y update && \ + dnf -y install \ + openssh-clients \ + ca-certificates \ + curl \ + python3 \ + texlive \ + graphviz \ + ninja-build \ + git && \ +# Regenerate symlink to openmpi include directory + ln -s /usr/include/openmpi-x86_64 /usr/lib64/openmpi/include && \ +# Regenerate symlinks to blas/lapack libraries + ln -s /usr/lib64/libblas.so.3 /usr/lib64/libblas.so && \ + ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so + +# Install sccache +RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-sccache.sh +ENV SCCACHE=/opt/sccache/bin/sccache diff --git a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile index faf56712..beb0ba7b 100644 --- a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile @@ -14,7 +14,9 @@ RUN dnf clean all && \ dnf -y install \ which \ gcc-toolset-13 \ - python3 \ + python3.9 \ + python3-pip \ + python3-tkinter \ zlib-devel \ tbb \ blas \ @@ -22,17 +24,15 @@ RUN dnf clean all && \ openmpi \ openmpi-devel \ # Additional spack dependencies - python3-pip \ unzip \ mpfr-devel \ bzip2 \ gnupg \ - xz \ - python3-virtualenv + xz # Install clingo for Spack -RUN python3 -m pip install --upgrade pip && \ - python3 -m pip install clingo +RUN python3.9 -m pip install --upgrade pip && \ + python3.9 -m pip install clingo virtualenv # Custom install script for CMake or other tools RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-cmake.sh diff --git a/scripts/pygeosx_configs/defaults.yaml b/scripts/pygeosx_configs/defaults.yaml new file mode 100644 index 00000000..6b36e02e --- /dev/null +++ b/scripts/pygeosx_configs/defaults.yaml @@ -0,0 +1,16 @@ +#------------------------------------------------------------------------------------------------------------ +# SPDX-License-Identifier: LGPL-2.1-only +# +# Copyright (c) 2018-2020 Lawrence Livermore National Security LLC +# Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2018-2020 TotalEnergies +# Copyright (c) 2019- GEOSX Contributors +# All rights reserved +# +# See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details. +#------------------------------------------------------------------------------------------------------------ + +# +# This file lists the default package variants for geos's dependencies +# (empty for now - default variants defined in the package.py for geos) +# diff --git a/scripts/pygeosx_configs/pygeosx.json b/scripts/pygeosx_configs/pygeosx.json index 41b485dc..8f6a1a3f 100644 --- a/scripts/pygeosx_configs/pygeosx.json +++ b/scripts/pygeosx_configs/pygeosx.json @@ -4,7 +4,7 @@ "package_final_phase": "", "package_source_dir": "../..", "spack_url": "https://github.com/spack/spack", -"spack_commit": "e8658d6493887ef702dd38f0e9ee5870a1651c1e", +"spack_commit": "2bfcc69fa870d3c6919be87593f22647981b648a", "spack_configs_path": "scripts/pygeosx_configs", "spack_packages_path": "scripts/spack_packages/packages", "spack_concretizer": "clingo" diff --git a/scripts/pygeosx_configs/versions.yaml b/scripts/pygeosx_configs/versions.yaml new file mode 100644 index 00000000..37052ab1 --- /dev/null +++ b/scripts/pygeosx_configs/versions.yaml @@ -0,0 +1,55 @@ +#------------------------------------------------------------------------------------------------------------ +# SPDX-License-Identifier: LGPL-2.1-only +# +# Copyright (c) 2018-2020 Lawrence Livermore National Security LLC +# Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2018-2020 TotalEnergies +# Copyright (c) 2019- GEOSX Contributors +# All rights reserved +# +# See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details. +#------------------------------------------------------------------------------------------------------------ + +# +# This file lists the package versions for geos's dependencies +# +packages: + # v0.6.2 + blt: + require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" + + # master - 06/27/25 + hypre: + require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c" + + # v2025.0.3.0 + chai: + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" + + # v2025.0.3.0 + umpire: + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" + + # v2025.0.3.0 + raja: + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" + + # v2025.0.3.0 + camp: + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" + + # v2.12.0 + caliper: + require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" + + # v0.9.2 + conduit: + require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" + + # master - 04/12/20 + uncrustify: + require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" + + # master - 04/26/20 + superlu-dist: + require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" diff --git a/scripts/spack_packages/packages/pygeosx/package.py b/scripts/spack_packages/packages/pygeosx/package.py index aaa1ddc4..cb062442 100644 --- a/scripts/spack_packages/packages/pygeosx/package.py +++ b/scripts/spack_packages/packages/pygeosx/package.py @@ -12,14 +12,10 @@ class Pygeosx(BundlePackage): builds of python tend to be much slower). """ version('fakeversion') - - depends_on("py-numpy@1.21.0:1.23.4+blas+lapack") + depends_on('geosx') + depends_on('python@3.10:+shared+pic+tkinter') + depends_on("py-numpy@1.21.0:+blas+lapack") depends_on('py-mpi4py') - depends_on('py-virtualenv') - depends_on('python@3.10:+shared+pic+tkinter+optimizations') - depends_on("py-scipy") - depends_on("openblas") - depends_on("py-matplotlib") - depends_on("py-sphinx") - depends_on("py-sphinx-argparse") - depends_on("py-test") + # depends_on("openblas") + # depends_on("py-scipy") + # depends_on("py-matplotlib")