hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow esmf to use parallelio without mpi (#34182)

Browse source 
* allow esmf to use parallelio without mpi
* add hash for 8.4.0
* spack no longer sets arch to cray
This commit is contained in:
Jim Edwards 2022-12-12 10:50:41 -07:00 committed by GitHub
parent 80722fbaa3
commit e4547982b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/esmf/package.py
View file

@ -24,6 +24,7 @@ class Esmf(MakefilePackage):
# Develop is a special name for spack and is always considered the newest version # Develop is a special name for spack and is always considered the newest version
version("develop", branch="develop") version("develop", branch="develop")
# generate chksum with spack checksum esmf@x.y.z # generate chksum with spack checksum esmf@x.y.z
version("8.4.0", sha256="28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f")
version( version(
"8.3.1", "8.3.1",
sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d", sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d",
@ -245,7 +246,8 @@ def edit(self, spec, prefix):
####### #######
# ESMF_OS must be set for Cray systems # 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" os.environ["ESMF_OS"] = "Unicos"
####### #######
@ -326,7 +328,7 @@ def edit(self, spec, prefix):
############## ##############
# ParallelIO # # ParallelIO #
############## ##############
if "+parallelio" in spec and "+mpi" in spec: if "+parallelio" in spec:
os.environ["ESMF_PIO"] = "external" os.environ["ESMF_PIO"] = "external"
os.environ["ESMF_PIO_LIBPATH"] = spec["parallelio"].prefix.lib os.environ["ESMF_PIO_LIBPATH"] = spec["parallelio"].prefix.lib
os.environ["ESMF_PIO_INCLUDE"] = spec["parallelio"].prefix.include os.environ["ESMF_PIO_INCLUDE"] = spec["parallelio"].prefix.include