Run both Khiops and Khiops Coclustering with MPI

closes #380

Author: popescu-v

khiops/core/internals/runner.py

@@ -1119,9 +1119,8 @@ def raw_run(self, tool_name, command_line_args=None, use_mpi=True, trace=False):
             )
 
         # Build command line arguments
-        # Nota: Khiops Coclustering is executed without MPI
         khiops_process_args = []
-        if tool_name == "khiops" and use_mpi:
+        if use_mpi:
             khiops_process_args += self._mpi_command_args
         khiops_process_args += [self._tool_path(tool_name)]
         if command_line_args:

tests/test_khiops_integrations.py

@@ -4,8 +4,10 @@
 # which is available at https://spdx.org/licenses/BSD-3-Clause-Clear.html or         #
 # see the "LICENSE.md" file for more details.                                        #
 ######################################################################################
-"""Tests for executing fit multiple times on multi-table data"""
+"""Various integration tests"""
 
+import contextlib
+import io
 import os
 import platform
 import shutil
@@ -15,6 +17,7 @@
 import unittest
 
 import khiops.core as kh
+import khiops.core.internals.filesystems as fs
 from khiops.core.exceptions import KhiopsEnvironmentError
 from khiops.core.internals.runner import KhiopsLocalRunner
 from khiops.extras.docker import KhiopsDockerRunner
@@ -208,6 +211,53 @@ def test_runner_environment_initialization(self):
 
         self.assertEqual(env_khiops_api_mode, "true")
 
+    def test_khiops_and_khiops_coclustering_are_run_with_mpi(self):
+        """Test that MODL and MODL_Coclustering are run with MPI"""
+
+        # Get current runner
+        runner = kh.get_runner()
+
+        # Get path to the Iris dataset
+        iris_data_dir = fs.get_child_path(runner.samples_dir, "Iris")
+
+        quote = '"' if platform.system() == "Windows" else "'"
+
+        # Run Khiops through an API function and test its stdout
+        with contextlib.redirect_stdout(io.StringIO()) as khiops_stdout:
+            kh.check_database(
+                fs.get_child_path(iris_data_dir, "Iris.kdic"),
+                "Iris",
+                fs.get_child_path(iris_data_dir, "Iris.txt"),
+                trace=True,
+            )
+        expected_khiops_command = (
+            f"{' '.join(runner.mpi_command_args)} {runner.khiops_path}"
+        )
+        self.assertTrue(
+            expected_khiops_command in khiops_stdout.getvalue().replace(quote, "")
+        )
+
+        # Run Khiops Coclustering through an API function and test its stdout
+        with (
+            contextlib.redirect_stdout(io.StringIO()) as khiops_coclustering_stdout,
+            tempfile.TemporaryDirectory() as temp_dir,
+        ):
+            kh.train_coclustering(
+                fs.get_child_path(iris_data_dir, "Iris.kdic"),
+                "Iris",
+                fs.get_child_path(iris_data_dir, "Iris.txt"),
+                ["SepalLength", "PetalLength"],
+                fs.get_child_path(temp_dir, "IrisCoclusteringResults.khcj"),
+                trace=True,
+            )
+        expected_khiops_coclustering_command = (
+            f"{' '.join(runner.mpi_command_args)} {runner.khiops_coclustering_path}"
+        )
+        self.assertTrue(
+            expected_khiops_coclustering_command
+            in khiops_coclustering_stdout.getvalue().replace(quote, "")
+        )
+
 
 class KhiopsMultitableFitTests(unittest.TestCase):
     """Test if Khiops estimator can be fitted on multi-table data"""