zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADIOS: Revert Patch (#8463)

Browse Source 
That patch is only a partial solution and does not solve the
issue. Revert is, unnecessary.
This commit is contained in:
Axel Huebl 2018-06-13 21:42:13 +02:00 committed by Adam J. Stewart
parent 6d4909d69b
commit 664f03e329
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/adios/nompi.patch
View File

@ -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)
{

3
var/spack/repos/builtin/packages/adios/package.py
View File

@ -121,9 +121,6 @@ class Adios(AutotoolsPackage):
# https://github.com/ornladios/ADIOS/commit/3b21a8a41509 # https://github.com/ornladios/ADIOS/commit/3b21a8a41509
# https://github.com/spack/spack/issues/1683 # https://github.com/spack/spack/issues/1683
patch('adios_1100.patch', when='@:1.10.0^hdf5@1.10:') 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): def validate(self, spec):
"""Checks if incompatible variants have been activated at the same time """Checks if incompatible variants have been activated at the same time