From 555fbf3c1cf5176caf33dd66e2a26a8cabf72522 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Thu, 1 Aug 2019 15:48:56 +0100
Subject: Updated version of mpi4py doesn't conflict with OpenMPI

Until now, in version 3.0.1, mpi4py couldn't be built with the most recent
version of OpenMPI. However, after trying the next version (3.0.2), I
noticed that it builds successfully without a problem.
---
 .file-metadata                                      | Bin 6402 -> 6349 bytes
 reproduce/software/config/installation/checksums.mk |   2 +-
 reproduce/software/config/installation/versions.mk  |   2 +-
 reproduce/software/make/python.mk                   |  15 +++------------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.file-metadata b/.file-metadata
index 585574b..a6a476c 100644
Binary files a/.file-metadata and b/.file-metadata differ
diff --git a/reproduce/software/config/installation/checksums.mk b/reproduce/software/config/installation/checksums.mk
index 880c11b..c51784a 100644
--- a/reproduce/software/config/installation/checksums.mk
+++ b/reproduce/software/config/installation/checksums.mk
@@ -138,7 +138,7 @@ jeepney-checksum = 43083994a7c6af84a5a68d3ff8f6dc4d9129ce9fa55517838fb62d9f62bb7
 keyring-checksum = 3863f2cd89131d7e927e55691b4eb4b7c2599af189525293d0948aef5215efbbbd74d45db3cd4885ba5b18a79f0fa0b0edc3783a020a6702f6a6fb7ed86b2cf2
 kiwisolver-checksum = 80ed3d7429a2ed4944aa09766bebac2709a3a0e0a184ff414f04bf3c7ec3034ea7d0f70dff319922b870dedaf13d64fc87eff86a82e720ec93a2510885ad738d
 matplotlib-checksum = 00ff7b389b29cb1609822baca2c7ff8bdf4381f42210c037190fe4a1fc1fdb6002a4bdd353d18df91f6730a9b007b1313253b01f73db73a6d65276414fe6a4b9
-mpi4py-checksum = 8a9c2adc573fcb85e0f0ac9b3cd810017dafbc91ff3b2cfca6046ec4fd188bc99a29bebed5b8cd050babfa9dba4aa5b03ac6650bf92a2f9d8ca73c4fea3440be
+mpi4py-checksum = 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
 mpmath-checksum = 58c69a801f65d73cc0eeb0d2c79277ed638568c656e7213d06ab4709c218aac908b2752377139010bed0e91bbfff01d129c60835ff0a928ba1185aded6de7c0a
 numpy-checksum = 5edd460c0948f424d8deb72f44a33db8ac6a973859b25c824533330dccb4f844197a437e945cd382760bbb6983fd120b08c949ac437973a915246024a8ebc911
 pip-checksum = c6e13da3a57462371d32982c80575c5181592f5c6a8e70d60ec879e689442f4ad468e7aef97eb58c9da50a5a770385aa35e701eefd713a8e9fafeb12e11d956b
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index bfeaf7c..cc6bcae 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -133,7 +133,7 @@ jeepney-version = 0.4
 keyring-version = 18.0.0
 kiwisolver-version = 1.0.1
 matplotlib-version = 3.0.2
-mpi4py-version = 3.0.1
+mpi4py-version = 3.0.2
 mpmath-version = 1.1.0
 numpy-version = 1.16.2
 pip-version = 19.0.2
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk
index bc2995f..d0c9a45 100644
--- a/reproduce/software/make/python.mk
+++ b/reproduce/software/make/python.mk
@@ -171,7 +171,7 @@ $(pytarballs): $(tdir)/%:
 	elif [ $$n = keyring        ]; then h=15/88/c6ce9509438bc02d54cf214923cfba814412f90c31c95028af852b19f9b2; c=$(keyring-checksum)
 	elif [ $$n = kiwisolver     ]; then h=31/60/494fcce70d60a598c32ee00e71542e52e27c978e5f8219fae0d4ac6e2864; c=$(kiwisolver-checksum)
 	elif [ $$n = matplotlib     ]; then h=89/0c/653aec68e9cfb775c4fbae8f71011206e5e7fe4d60fcf01ea1a9d3bc957f; c=$(matplotlib-checksum)
-	elif [ $$n = mpi            ]; then h=55/a2/c827b196070e161357b49287fa46d69f25641930fd5f854722319d431843; c=$(mpi4py-checksum)
+	elif [ $$n = mpi            ]; then h=04/f5/a615603ce4ab7f40b65dba63759455e3da610d9a155d4d4cece1d8fd6706; c=$(mpi4py-checksum)
 	elif [ $$n = mpmath         ]; then h=ca/63/3384ebb3b51af9610086b23ea976e6d27d6d97bf140a76a365bd77a3eb32; c=$(mpmath-checksum)
 	elif [ $$n = numpy          ]; then h=cf/8d/6345b4f32b37945fedc1e027e83970005fc9c699068d2f566b82826515f2; c=$(numpy-checksum)
 	elif [ $$n = pip            ]; then h=4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af; c=$(pip-checksum)
@@ -378,11 +378,11 @@ $(ipydir)/h5py: $(tdir)/h5py-$(h5py-version).tar.gz \
                 $(ipydir)/pypkgconfig \
                 $(ipydir)/setuptools \
                 $(ipydir)/cython \
+                $(ipydir)/mpi4py \
                 $(ipydir)/numpy \
                 $(ibidir)/hdf5 \
                 $(ipydir)/six
-                #$(ipydir)/mpi4py # AFTER its problem is fixed.
-        #export HDF5_MPI=ON;       # AFTER its problem is fixed.
+	export HDF5_MPI=ON; \
 	export HDF5_DIR=$(ildir); \
 	$(call pybuild, tar xf, $<, h5py-$(h5py-version), ,\
 	                h5py $(h5py-version))
@@ -429,15 +429,6 @@ $(ipydir)/matplotlib: $(tdir)/matplotlib-$(matplotlib-version).tar.gz \
 	&& cp $(dtexdir)/matplotlib.tex $(ictdir)/ \
 	&& echo "Matplotlib $(matplotlib-version) \citep{matplotlib2007}" > $@
 
-# Currently mpi4py doesn't build because of some conflict with OpenMPI:
-#
-#  In file included from src/mpi4py.MPI.c:591,
-#                  from src/MPI.c:4:
-#  src/mpi4py.MPI.c: In function '__pyx_f_6mpi4py_3MPI_del_Datatype':
-#  src/mpi4py.MPI.c:15094:36: error: expected expression before '_Static_assert'
-#  __pyx_t_1 = (((__pyx_v_ob[0]) == MPI_UB) != 0);
-#
-# But atleast on my system it fails.
 $(ipydir)/mpi4py: $(tdir)/mpi4py-$(mpi4py-version).tar.gz    \
                   $(ipydir)/setuptools \
                   $(ibidir)/openmpi
-- 
cgit v1.2.1