[Debian-astro-commits] [gyoto] 04/04: Improve the MPI tests to not freeze the machine. They still fail in a chroot though as they rely on a loopback interface.

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit f5183686b05ccb07e68fb6d0fdcc411edb285a63
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Sat May 23 19:18:07 2015 +0200

    Improve the MPI tests to not freeze the machine. They still fail in a chroot though as they rely on a loopback interface.
---
 debian/control                |  5 ++++-
 debian/tests/control          | 19 ++++++++-----------
 debian/tests/gyoto-mpi        |  2 +-
 debian/tests/python-gyoto-mpi |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 8e720aa..36dd86c 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Homepage: http://gyoto.obspm.fr
 Package: gyoto
 Architecture: linux-any hurd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: mpi-default-bin
 Description: General relativistic ray-tracing
  Gyoto is a framework for computing geodesics in curved
  space-times. The gyoto utility program uses this framework to compute
@@ -35,6 +36,8 @@ Description: General relativistic ray-tracing
  More complex uses of the Gyoto framework can be achieved using the
  yorick-gyoto, python-gyoto or python3-gyoto packages. Gyoto can be
  extended with plug-ins (see libgyoto2-dev).
+ .
+ MPI parallelization requires the mpi-default-bin package.
 
 Package: libgyoto2
 Architecture: any
@@ -49,7 +52,7 @@ Description: General relativistic geodesic integration and ray-tracing
  yorick-gyoto, python-gyoto and python3-gyoto respectively). Gyoto can
  be extended with plug-ins (see libgyoto2-dev).
  .
- MPI parallelization requires the gyoto package.
+ MPI parallelization requires the gyoto and mpi-default-bin packages.
 
 Package: gyoto-dbg
 Architecture: any
diff --git a/debian/tests/control b/debian/tests/control
index 8d6a603..570b8c5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,18 +1,14 @@
-Tests: gyoto
-Depends: gyoto
+Tests: gyoto gyoto-mpi
+Depends: gyoto, openmpi-bin
 Restrictions: allow-stderr
 
-Tests: gyoto-mpi
-Depends: gyoto
-Restrictions: isolation-container allow-stderr
-
 Tests: yorick-gyoto
 Depends: yorick-gyoto
 Restrictions: allow-stderr
 
-Tests: yorick-gyoto-mpi
-Depends: yorick-gyoto, gyoto
-Restrictions: isolation-container allow-stderr
+Test-Command: orterun --mca btl_tcp_if_include lo /usr/bin/yorick -i debian/tests/yorick-gyoto-mpi
+Depends: yorick-gyoto, gyoto, openmpi-bin
+Restrictions: allow-stderr
 
 Tests: python-gyoto
 Depends: python-gyoto, python3-gyoto,
@@ -26,5 +22,6 @@ Depends: python-gyoto, python3-gyoto, gyoto,
 	 python-all, python3-all,
 	 python-numpy, python3-numpy,
 	 python-matplotlib, python3-matplotlib,
-	 python-mpi4py, python3-mpi4py
-Restrictions: isolation-container allow-stderr
+	 python-mpi4py, python3-mpi4py,
+	 openmpi-bin
+Restrictions: allow-stderr
diff --git a/debian/tests/gyoto-mpi b/debian/tests/gyoto-mpi
index e7b0bd3..4e8d370 100755
--- a/debian/tests/gyoto-mpi
+++ b/debian/tests/gyoto-mpi
@@ -6,7 +6,7 @@ BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar
 GYOTO="/usr/bin/gyoto --nprocesses=4 --nthreads=1 --resolution=32"
 
 for base in ${BASE_NAMES} ; do
-    mpirun ${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}-mpi.fits ;
+    orterun --mca btl_tcp_if_include lo ${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}-mpi.fits ;
 done
 
 exit 0
diff --git a/debian/tests/python-gyoto-mpi b/debian/tests/python-gyoto-mpi
index fd30e37..2a2a45e 100755
--- a/debian/tests/python-gyoto-mpi
+++ b/debian/tests/python-gyoto-mpi
@@ -10,7 +10,7 @@ cd ${ADTTMP}/python
 echo "backend : PDF" > matplotlibrc
 
 for python in `pyversions -s` `py3versions -s` ; do
-    mpirun $python ${SRC_ROOT}/python/example-mpi.py ;
+    orterun --mca btl_tcp_if_include lo $python ${SRC_ROOT}/python/example-mpi.py ;
 done
 
 exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git