aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/make
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-01 15:48:56 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-01 15:48:56 +0100
commit555fbf3c1cf5176caf33dd66e2a26a8cabf72522 (patch)
tree3c2d04522fe590a83551ab81255b8d2b45742cb5 /reproduce/software/make
parenta32e83209c0b86b2bf1cb530b55df319a927b7b1 (diff)
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.
Diffstat (limited to 'reproduce/software/make')
-rw-r--r--reproduce/software/make/python.mk15
1 files changed, 3 insertions, 12 deletions
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