diff --git a/mpi4py.spec b/mpi4py.spec index 8ef94aa..8d1ddc4 100644 --- a/mpi4py.spec +++ b/mpi4py.spec @@ -281,14 +281,16 @@ mv build mpich # test openmpi? %if 0%{?OPENMPI} %{_openmpi_load} +mv openmpi build PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -np 1 python2 test/runtests.py + mpiexec -np 1 python2 test/runtests.py -v --no-threads %if 0%{?FULLTESTS} PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -np 5 python2 test/runtests.py + mpiexec -np 5 python2 test/runtests.py -v --no-threads PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -np 8 python2 test/runtests.py + mpiexec -np 8 python2 test/runtests.py -v --no-threads %endif +mv build openmpi %{_openmpi_unload} %endif @@ -296,14 +298,16 @@ PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ %if 0%{?MPICH} %if %{with_mpich} %{_mpich_load} +mv mpich build PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -np 1 python2 test/runtests.py + mpiexec -np 1 python2 test/runtests.py -v %if 0%{?FULLTESTS} PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -np 5 python2 test/runtests.py + mpiexec -np 5 python2 test/runtests.py -v PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -np 8 python2 test/runtests.py + mpiexec -np 8 python2 test/runtests.py -v %endif +mv mpich build %{_mpich_unload} %endif %endif @@ -312,6 +316,7 @@ PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ # test openmpi? %if 0%{?OPENMPI} %{_openmpi_load} +mv openmpi build PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \ mpiexec -np 1 python3 test/runtests.py %if 0%{?FULLTESTS} @@ -320,6 +325,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \ PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \ mpiexec -np 8 python3 test/runtests.py %endif +mv build openmpi %{_openmpi_unload} %endif @@ -327,6 +333,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \ %if 0%{?MPICH} %if %{with_mpich} %{_mpich_load} +mv mpich build PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich \ mpiexec -np 1 python3 test/runtests.py %if 0%{?FULLTESTS} @@ -335,6 +342,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich \ PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich \ mpiexec -np 8 python3 test/runtests.py %endif +mv mpich build %{_mpich_unload} %endif %endif # mpich disable