fix tests

keisukefukuda · Jul 13, 2017 · 6688e5c · 6688e5c
1 parent 189c5a6
commit 6688e5c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/common.py b/common.py
@@ -483,8 +483,6 @@ def exec_(self, cmds):
 
             info = self.get_info(name)
 
-            # TODO(keisukefukuda): if MPICH/MVAPICH,
-            #                      add -x PATH, -x LD_LIBRARY_PATH
             # TODO(keisukefukuda): if hostfile is given, convert it
 
         except UnknownMPI:
@@ -511,14 +509,14 @@ def exec_(self, cmds):
         elif info['type'] in ['MPICH', 'MVAPICH']:
             cmds[:0] = ['-genvlist', 'PATH,LD_LIBRARY_PATH,PYTHONPATH']
 
-        print(info['type'])
+        # sys.stderr.write("{}\n".format(info['type']))
 
         mpiexec = os.path.realpath(
             os.path.join(self.prefix(name), 'bin', 'mpiexec'))
 
         cmds[:0] = [mpiexec]
 
-        print(' '.join(cmds))
+        # sys.stderr.write(' '.join(cmds) + "\n")
         p = Popen(cmds, env=envs)
         p.wait()
         exit(p.returncode)

diff --git a/init b/init
@@ -39,8 +39,8 @@ function mpienv() {
             {
                 eval $(env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
                            python $root/bin/use.py $*)
-                env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                           python $root/bin/use.py $*
+                #env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
+                #           python $root/bin/use.py $*
                 if [ -z "${BASH_VERSION:-}" -a ! -z "${ZSH_VERSION:-}" ]; then
                     rehash
                 fi

diff --git a/tests/test_main.sh b/tests/test_main.sh
@@ -155,29 +155,42 @@ test_info() {
 test_mpi4py() {
     export TMPDIR=/tmp
 
-    #install_mpich
-    #mpienv use --mpi4py mpich-3.2
-    install_ompi
-    mpienv use --mpi4py openmpi-2.1.1
-
-    mpienv exec -n 2 python -c "from mpi4py import MPI"
-    assertTrue $?
-
     local SCRIPT=$(mktemp)
     cat <<EOF >$SCRIPT
 from mpi4py import MPI
 import sys
-print(MPI.__file__)
+#print(MPI.__file__)
 comm = MPI.COMM_WORLD
 rank = comm.Get_rank()
 for i in range(0, comm.Get_size()):
     if i == rank:
         sys.stdout.write(str(rank))
         sys.stdout.flush()
     comm.barrier()
-
 EOF
+    # test mpich
+    install_mpich
+    echo "------------------"
+    mpienv use --mpi4py mpich-3.2
+    echo "------------------"
+    mpienv exec -n 2 python -c "from mpi4py import MPI"
+    echo "------------------"
+    assertTrue $?
     mpienv exec -n 2 python $SCRIPT
+    assertTrue $?
+    OUT=$(mpienv use --mpi4py mpich-3.2; mpienv exec -n 2 python $SCRIPT)
+    assertEquals "01" "$OUT"
+
+    # test Open MPI
+    install_ompi
+    mpienv use --mpi4py openmpi-2.1.1
+    mpienv exec -n 2 python -c "from mpi4py import MPI"
+    assertTrue $?
+    mpienv exec -n 2 python $SCRIPT
+    assertTrue $?
+    OUT=$(mpienv use --mpi4py openmpi-2.1.1; mpienv exec -n 2 python $SCRIPT)
+    assertEquals "01" "$OUT"
+
     rm -f ${SCRIPT}
 }