diff options
| author | Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> | 2023-02-16 11:02:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 11:02:54 +0100 |
| commit | f31e8adc6bcbc8efa279e701021b8586da89969e (patch) | |
| tree | 23c3898f0f968144c95e0bb7d8264d74d66a50b2 | |
| parent | a6731b732e385d9b0dd9d45cdbdfbfe93f3cd73f (diff) | |
| download | spack-f31e8adc6bcbc8efa279e701021b8586da89969e.tar.gz spack-f31e8adc6bcbc8efa279e701021b8586da89969e.tar.bz2 spack-f31e8adc6bcbc8efa279e701021b8586da89969e.tar.xz spack-f31e8adc6bcbc8efa279e701021b8586da89969e.zip | |
netcdf-c: add patch to enable '@4.9.0:~mpi+parallel-netcdf' (#35462)
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-c/4.9.0-no-mpi-yes-pnetcdf.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-c/package.py | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/netcdf-c/4.9.0-no-mpi-yes-pnetcdf.patch b/var/spack/repos/builtin/packages/netcdf-c/4.9.0-no-mpi-yes-pnetcdf.patch new file mode 100644 index 0000000000..de4b34c986 --- /dev/null +++ b/var/spack/repos/builtin/packages/netcdf-c/4.9.0-no-mpi-yes-pnetcdf.patch @@ -0,0 +1,11 @@ +--- a/libhdf5/hdf5internal.c ++++ b/libhdf5/hdf5internal.c +@@ -163,7 +163,7 @@ find_var_dim_max_length(NC_GRP_INFO_T *grp, int varid, int dimid, + if (var->dimids[d] == dimid) + *maxlen = *maxlen > h5dimlen[d] ? *maxlen : h5dimlen[d]; + +-#ifdef USE_PARALLEL ++#ifdef USE_PARALLEL4 + /* If we are doing parallel I/O in collective mode (with + * either pnetcdf or HDF5), then communicate with all + * other tasks in the collective and find out which has diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index a63b21a6d6..dd106fbc62 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -68,6 +68,9 @@ class NetcdfC(AutotoolsPackage): # See https://github.com/Unidata/netcdf-c/pull/2293 patch("4.8.1-no-strict-aliasing-config.patch", when="@4.8.1") + # See https://github.com/Unidata/netcdf-c/pull/2618 + patch("4.9.0-no-mpi-yes-pnetcdf.patch", when="@4.9.0: ~mpi+parallel-netcdf") + variant("mpi", default=True, description="Enable parallel I/O for netcdf-4") variant("parallel-netcdf", default=False, description="Enable parallel I/O for classic files") variant("hdf4", default=False, description="Enable HDF4 support") |