Merge pull request #120 from keisukefukuda/fix-119-assert-fails-if-mp…

…iexec-not-exist

Fix #119

mpienv/core.py

@@ -233,7 +233,11 @@ def add(self, target, name=None):
             # target seems to be prefix
             target = os.path.join(target, 'bin', 'mpiexec')
 
-        mpi = self.get_mpi_from_mpiexec(target)
+        try:
+            mpi = self.get_mpi_from_mpiexec(target)
+        except RuntimeError as e:
+            sys.stderr.write("Error: {}\n".format(e))
+            exit(1)
 
         if isinstance(mpi, BrokenMPI):
             sys.stderr.write("Cannot find MPI from {}. "

mpienv/mpibase.py

@@ -269,7 +269,7 @@ def lib_files(self):
     def libexec_files(self):
         assert False, "Must be overriden"
 
-    def _generate_exec_script(self, file_name, cmds, keep: bool):
+    def _generate_exec_script(self, file_name, cmds, keep):
         with open(file_name, 'w') as f:
             for shell in ['/bin/bash', '/bin/ash', '/bin/sh']:
                 if os.path.exists(shell):

mpienv/openmpi.py

@@ -19,7 +19,10 @@ class OpenMPI(mpibase.MpiBase):
     def __init__(self, mpiexec, conf, name=None):
         # `mpiexec` might be 'mpiexec' or 'mpiexec.ompi'
         mpicc = re.sub('mpiexec', 'mpicc', mpiexec)
-        assert os.path.exists(mpicc)
+
+        if not os.path.exists(mpicc):
+            raise RuntimeError("mpicc not found: {}".format(mpicc))
+
         prefix = os.path.abspath(
             os.path.join(os.path.dirname(mpiexec), os.path.pardir))
         ompi_info = os.path.join(prefix, 'bin', 'ompi_info')