Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ESMF and MAPL from spack develop as of 2024/06/28 #445

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Update ESMF and MAPL from spack develop as of 2024/06/28 #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1f8c00
ESMF: set ESMF_LAPACK_LIBPATH if +external-lapack (#44672)
nyetsche Jun 20, 2024
862f50a
mapl: add 2.47.0 (#44842)
mathomp4 Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions var/spack/repos/builtin/packages/esmf/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,8 @@ def setup_build_environment(self, env):
# ESMF code.
env.set("ESMF_LAPACK", "system")

# FIXME: determine whether or not we need to set this
# Specifies the path where the LAPACK library is located.
# env.set("ESMF_LAPACK_LIBPATH", spec["lapack"].prefix.lib)
env.set("ESMF_LAPACK_LIBPATH", spec["lapack"].prefix.lib)

# Specifies the linker directive needed to link the LAPACK library
# to the application.
Expand Down
12 changes: 11 additions & 1 deletion var/spack/repos/builtin/packages/mapl/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Mapl(CMakePackage):
version("develop", branch="develop")
version("main", branch="main")

version("2.47.0", sha256="66c862d2ab8bcd6969e9728091dbca54f1f420e97e41424c4ba93ef606088459")
version("2.46.2", sha256="6d397ad73042355967de8ef5b521d6135c004f96e93ae7b215f9ee325e75c6f0")
version("2.46.1", sha256="f3090281de6293b484259d58f852c45b98759de8291d36a4950e6d348ece6573")
version("2.46.0", sha256="726d9588b724bd43e5085d1a2f8d806d548f185ed6b22a1b13c0ed06212d7be2")
Expand Down Expand Up @@ -139,11 +140,17 @@ class Mapl(CMakePackage):

# Versions later than 3.14 remove FindESMF.cmake
# from ESMA_CMake.
resource(
name="esma_cmake",
git="https://github.com/GEOS-ESM/ESMA_cmake.git",
tag="v3.46.0",
when="@2.47:",
)
resource(
name="esma_cmake",
git="https://github.com/GEOS-ESM/ESMA_cmake.git",
tag="v3.45.2",
when="@2.45:",
when="@2.45:2.46",
)
resource(
name="esma_cmake",
Expand Down Expand Up @@ -338,6 +345,7 @@ def cmake_args(self):
# - Intel MPI --> intelmpi
# - MVAPICH --> mvapich
# - HPE MPT --> mpt
# - Cray MPICH --> mpich

if self.spec.satisfies("^mpich"):
args.append(self.define("MPI_STACK", "mpich"))
Expand All @@ -349,6 +357,8 @@ def cmake_args(self):
args.append(self.define("MPI_STACK", "mvapich"))
elif self.spec.satisfies("^mpt"):
args.append(self.define("MPI_STACK", "mpt"))
elif self.spec.satisfies("^cray-mpich"):
args.append(self.define("MPI_STACK", "mpich"))
else:
raise InstallError("Unsupported MPI stack")

Expand Down
Loading