diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2018-06-13 21:42:13 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-06-13 14:42:13 -0500 |
| commit | 664f03e32957041b28fc9b60e5cbb4729adc5cfc (patch) | |
| tree | 9fef63cfa9c6dba5b26fabc6e1180916f2bd5f6a | |
| parent | 6d4909d69b38bddf9c742ba2d16fea03c58adce3 (diff) | |
| download | spack-664f03e32957041b28fc9b60e5cbb4729adc5cfc.tar.gz spack-664f03e32957041b28fc9b60e5cbb4729adc5cfc.tar.bz2 spack-664f03e32957041b28fc9b60e5cbb4729adc5cfc.tar.xz spack-664f03e32957041b28fc9b60e5cbb4729adc5cfc.zip | |
ADIOS: Revert Patch (#8463)
That patch is only a partial solution and does not solve the
issue. Revert is, unnecessary.
| -rw-r--r-- | var/spack/repos/builtin/packages/adios/nompi.patch | 16 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/adios/package.py | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/var/spack/repos/builtin/packages/adios/nompi.patch b/var/spack/repos/builtin/packages/adios/nompi.patch deleted file mode 100644 index 2d00b29924..0000000000 --- a/var/spack/repos/builtin/packages/adios/nompi.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 2ebd1c31e1..3fabaff020 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -121,9 +121,6 @@ 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 |