Fix running w/ --no-mpi & Tests delete p_all,D,...

Author: henryleberre

toolchain/mfc/run/engines.py

@@ -57,6 +57,7 @@ def __init__(self) -> None:
 
     def _init(self) -> None:
         self.mpibin = mpi_bins.get_binary()
+
         # If using MPI, we don't know yet whether this engine works
         self.bKnowWorks = not ARG("mpi")
 

toolchain/mfc/run/mpi_bins.py

@@ -4,7 +4,7 @@
 from ..state import ARG
 
 # Note: This file is now only used when running
-#       in serial mode.
+#       in -e interactive mode.
 
 @dataclasses.dataclass
 class MPIBinary:
@@ -18,6 +18,17 @@ def gen_params(self) -> typing.List[str]:
         raise common.MFCException(f"MPIBinary::gen_params <{self.name}> not implemented.")
 
 
+class NOMPIBIN(MPIBinary):
+    def __init__(self):
+        super().__init__("N/A", "N/A")
+
+    def is_present(self) -> bool:
+        return not ARG("mpi")
+
+    def gen_params(self) -> typing.List[str]:
+        return []
+
+
 class JSRUN(MPIBinary):
     def __init__(self):
         super().__init__("IBM's JSRUN", "jsrun")
@@ -83,7 +94,7 @@ def gen_params(self) -> str:
 
 
 # In descending order of priority (if no override present)
-BINARIES: list = [ JSRUN(), SRUN(), MPIRUN(), MPIEXEC() ]
+BINARIES: list = [ JSRUN(), SRUN(), MPIRUN(), MPIEXEC(), NOMPIBIN() ]
 
 def get_binary(exclude: typing.List[str] = None) -> MPIBinary:
     if exclude is None:

toolchain/mfc/test/case.py

@@ -124,7 +124,10 @@ def get_uuid(self) -> str:
     def get_dirpath(self):
         return os.path.join(common.MFC_TESTDIR, self.get_uuid())
 
-    def create_directory(self, filename: str):
+    def create_directory(self, filename: str, delete=None):
+        if delete is None:
+            delete = False
+
         dirpath = self.get_dirpath()
 
         content = f"""\
@@ -135,6 +138,11 @@ def create_directory(self, filename: str):
 print(json.dumps({self.gen_json_dict_str()}))
 """
 
+        if delete:
+            common.delete_directory(os.path.join(dirpath, "D"))
+            common.delete_directory(os.path.join(dirpath, "p_all"))
+            common.delete_directory(os.path.join(dirpath, "silo_hdf5"))
+
         common.create_directory(dirpath)
 
         common.file_write(f"{dirpath}/{filename}.py", content)

toolchain/mfc/test/test.py

@@ -133,7 +133,7 @@ def handle_case(test: TestCase):
         else:
             tol = 1e-12
 
-        test.create_directory("case_pre_sim")
+        test.create_directory("case_pre_sim", delete=True)
         cmd = test.run("case_pre_sim", ["pre_process", "simulation"])
 
         out_filepath = os.path.join(test.get_dirpath(), "out_pre_sim.txt")