summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2018-06-06 22:38:36 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2018-06-06 15:38:36 -0500
commit0495b5474b4595849fea92e518a2971941c2cd20 (patch)
treed8ab94059929780c5e1268bbcdc92e561c71bc40 /var
parent8b261506cb71fda70187677a285e434f84f55840 (diff)
downloadspack-0495b5474b4595849fea92e518a2971941c2cd20.tar.gz
spack-0495b5474b4595849fea92e518a2971941c2cd20.tar.bz2
spack-0495b5474b4595849fea92e518a2971941c2cd20.tar.xz
spack-0495b5474b4595849fea92e518a2971941c2cd20.zip
ADIOS: Serial API with Parallel Lib (#8409)
Provides a patch for the fix in https://github.com/ornladios/ADIOS/pull/182 Installed ADIOS MPI-enabled libraries are with that able to also perform serial I/O without the need to start the whole app via `mpiexec`.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/adios/nompi.patch16
-rw-r--r--var/spack/repos/builtin/packages/adios/package.py3
2 files changed, 19 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/adios/nompi.patch b/var/spack/repos/builtin/packages/adios/nompi.patch
new file mode 100644
index 0000000000..2d00b29924
--- /dev/null
+++ b/var/spack/repos/builtin/packages/adios/nompi.patch
@@ -0,0 +1,16 @@
+diff --git a/src/core/adios_internals_mxml.c b/src/core/adios_internals_mxml.c
+index 513fd45c..b9296050 100644
+--- a/src/core/adios_internals_mxml.c
++++ b/src/core/adios_internals_mxml.c
+@@ -2173,8 +2173,9 @@ int adios_parse_config (const char * config, MPI_Comm comm)
+ char * buffer = NULL;
+ //#if HAVE_MPI
+ int buffer_size = 0;
+- int rank;
+- MPI_Comm_rank (comm, &rank);
++ int rank = 0;
++ if (comm != MPI_COMM_NULL)
++ MPI_Comm_rank (comm, &rank);
+ init_comm = comm;
+ if (rank == 0)
+ {
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index 3fabaff020..2ebd1c31e1 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -121,6 +121,9 @@ class Adios(AutotoolsPackage):
# https://github.com/ornladios/ADIOS/commit/3b21a8a41509
# https://github.com/spack/spack/issues/1683
patch('adios_1100.patch', when='@:1.10.0^hdf5@1.10:')
+ # Fix ADIOS <=1.13.1 serial compile against parallel library
+ # https://github.com/ornladios/ADIOS/pull/182
+ patch('nompi.patch', when='@1.10.0:1.13.1')
def validate(self, spec):
"""Checks if incompatible variants have been activated at the same time