fixed stuff

Author: Mohammed Said Hamed Humaid Al-Mahrouqi

docs/documentation/testing.md

@@ -16,7 +16,7 @@ A test is considered passing when our error tolerances are met in order to maint
 - `--percent` (`%`) to specify a percentage of the test suite to select at random and test
 - `--max-attempts` (`-m`) the maximum number of attempts to make on a test before considering it failed
 - `--no-examples` skips the testing of cases in the examples folder
-- `--rdma-mpi` (`-r`) runs additional tests where RDMA MPI is enabled.
+- `--rdma-mpi` runs additional tests where RDMA MPI is enabled.
 
 To specify a computer, pass the `-c` flag to `./mfc.sh run` like so:
 ```shell

toolchain/mfc/args.py

@@ -80,7 +80,7 @@ def add_common_arguments(p, mask = None):
     test.add_argument("-a", "--test-all",     action="store_true",     default=False,     help="Run the Post Process Tests too.")
     test.add_argument("-%", "--percent",      type=int,                default=100,       help="Percentage of tests to run.")
     test.add_argument("-m", "--max-attempts", type=int,                default=1,         help="Maximum number of attempts to run a test.")
-    test.add_argument("-r", "--rdma-mpi",     action="store_true",     default=False,     help="Enable RDMA MPI for tests")
+    test.add_argument(      "--rdma-mpi",     action="store_true",     default=False,     help="Run tests with RDMA MPI enabled")
     test.add_argument(      "--no-build",     action="store_true",     default=False,     help="(Testing) Do not rebuild MFC.")
     test.add_argument(      "--no-examples",  action="store_true",     default=False,     help="Do not test example cases." )
     test.add_argument("--case-optimization",  action="store_true",     default=False,     help="(GPU Optimization) Compile MFC targets with some case parameters hard-coded.")

toolchain/mfc/test/case.py

@@ -124,7 +124,7 @@ def __init__(self, trace: str, mods: dict, ppn: int = None, override_tol: float
         self.override_tol = override_tol
         super().__init__({**BASE_CFG.copy(), **mods})
 
-    def run(self, targets: List[Union[str, MFCTarget]], gpus: Set[int]) -> subprocess.CompletedProcess:
+    def run(self, targets: List[Union[str, MFCTarget]], gpus: Set[int], rdma_mpi: bool = False) -> subprocess.CompletedProcess:
         if gpus is not None and len(gpus) != 0:
             gpus_select = ["--gpus"] + [str(_) for _ in gpus]
         else:
@@ -134,7 +134,6 @@ def run(self, targets: List[Union[str, MFCTarget]], gpus: Set[int]) -> subproces
         tasks             = ["-n", str(self.ppn)]
         jobs              = ["-j", str(ARG("jobs"))] if ARG("case_optimization") else []
         case_optimization = ["--case-optimization"]  if ARG("case_optimization") else []
-        rdma_mpi_args     = ["--rdma-mpi"]           if ARG("rdma_mpi")          else []
 
         if self.params.get("bubbles_lagrange", 'F') == 'T':
             input_bubbles_lagrange(self)
@@ -145,9 +144,9 @@ def run(self, targets: List[Union[str, MFCTarget]], gpus: Set[int]) -> subproces
 
         command = [
             mfc_script, "run", filepath, "--no-build", *tasks, *case_optimization,
-            *jobs, "-t", *target_names, *gpus_select, *rdma_mpi_args, *ARG("--")
+            *jobs, "-t", *target_names, *gpus_select, *ARG("--")
         ]
-
+        
         return common.system(command, print_cmd=False, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     def get_trace(self) -> str:

toolchain/mfc/test/test.py

@@ -69,11 +69,6 @@ def __filter(cases_) -> typing.List[TestCase]:
             if any(label in case.trace for label in skip):
                 cases.remove(case)
 
-    for case in cases[:]:
-        if ARG("rdma_mpi") and case.ppn <= 1:
-            cases.remove(case)
-            skipped_cases.append(case)
-
     if ARG("no_examples"):
         cases = [case for case in cases if not "Example" in case.trace]
 
@@ -189,8 +184,7 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
         cons.print(f"  [bold magenta]{case.get_uuid()}[/bold magenta]     SKIP     {case.trace}")
         return
 
-    if ARG("rdma_mpi"):
-        cmd = case.run([PRE_PROCESS, SIMULATION], gpus=devices)
+    if "RDMA MPI" in case.trace:
         cmd = case.run([PRE_PROCESS, SIMULATION], gpus=devices, rdma_mpi=True)
     else:
         cmd = case.run([PRE_PROCESS, SIMULATION], gpus=devices)