From 7fd4dee9624c51197d68e4f5ea6f4c44e21266f1 Mon Sep 17 00:00:00 2001 From: Timothy Brown Date: Fri, 27 Aug 2021 11:26:06 -0600 Subject: ESMF package: add version 8.1.1 (#25590) Also build with internal lapack library by default. --- var/spack/repos/builtin/packages/esmf/package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 c2c05c2423..a00e49ee90 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -18,12 +18,13 @@ class Esmf(MakefilePackage): homepage = "https://www.earthsystemcog.org/projects/esmf/" url = 'https://github.com/esmf-org/esmf/archive/ESMF_8_0_1.tar.gz' + version('8.1.1', sha256='58c2e739356f21a1b32673aa17a713d3c4af9d45d572f4ba9168c357d586dc75') version('8.0.1', sha256='9172fb73f3fe95c8188d889ee72fdadb4f978b1d969e1d8e401e8d106def1d84') version('8.0.0', sha256='051dca45f9803d7e415c0ea146df15ce487fb55f0fce18ca61d96d4dba0c8774') version('7.1.0r', sha256='ae9a5edb8d40ae97a35cbd4bd00b77061f995c77c43d36334dbb95c18b00a889') variant('mpi', default=True, description='Build with MPI support') - variant('lapack', default=True, description='Build with LAPACK support') + variant('external-lapack', default=False, description='Build with external LAPACK support') variant('netcdf', default=True, description='Build with NetCDF support') variant('pnetcdf', default=True, description='Build with pNetCDF support') variant('xerces', default=True, description='Build with Xerces support') @@ -36,7 +37,7 @@ class Esmf(MakefilePackage): # Optional dependencies depends_on('mpi', when='+mpi') - depends_on('lapack@3:', when='+lapack') + depends_on('lapack@3:', when='+external-lapack') depends_on('netcdf-c@3.6:', when='+netcdf') depends_on('netcdf-fortran@3.6:', when='+netcdf') depends_on('parallel-netcdf@1.2.0:', when='+pnetcdf') @@ -185,7 +186,7 @@ class Esmf(MakefilePackage): # LAPACK # ########## - if '+lapack' in spec: + if '+external-lapack' in spec: # A system-dependent external LAPACK/BLAS installation is used # to satisfy the external dependencies of the LAPACK-dependent # ESMF code. @@ -199,8 +200,7 @@ class Esmf(MakefilePackage): # to the application. os.environ['ESMF_LAPACK_LIBS'] = spec['lapack'].libs.link_flags # noqa else: - # Disables LAPACK-dependent code. - os.environ['ESMF_LAPACK'] = 'OFF' + os.environ['ESMF_LAPACK'] = 'internal' ########## # NetCDF # -- cgit v1.2.3-70-g09d2