From e4547982b3653d2df4649213ef3fe001c8a56fdc Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 12 Dec 2022 10:50:41 -0700 Subject: allow esmf to use parallelio without mpi (#34182) * allow esmf to use parallelio without mpi * add hash for 8.4.0 * spack no longer sets arch to cray --- var/spack/repos/builtin/packages/esmf/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index c7c9b4bb03..885ca3817e 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -24,6 +24,7 @@ class Esmf(MakefilePackage): # Develop is a special name for spack and is always considered the newest version version("develop", branch="develop") # generate chksum with spack checksum esmf@x.y.z + version("8.4.0", sha256="28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f") version( "8.3.1", sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d", @@ -245,7 +246,8 @@ class Esmf(MakefilePackage): ####### # ESMF_OS must be set for Cray systems - if "platform=cray" in self.spec: + # But spack no longer gives arch == cray + if self.compiler.name == "cce" or "^cray-mpich" in self.spec: os.environ["ESMF_OS"] = "Unicos" ####### @@ -326,7 +328,7 @@ class Esmf(MakefilePackage): ############## # ParallelIO # ############## - if "+parallelio" in spec and "+mpi" in spec: + if "+parallelio" in spec: os.environ["ESMF_PIO"] = "external" os.environ["ESMF_PIO_LIBPATH"] = spec["parallelio"].prefix.lib os.environ["ESMF_PIO_INCLUDE"] = spec["parallelio"].prefix.include -- cgit v1.2.3-60-g2f50