Use absolute path to mpiexec in khiops_env on all UNIX installations

closes #392
KhiopsML · Oct 7, 2024 · efd6d04 · efd6d04
1 parent 88104c0
commit efd6d04
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/packaging/install.cmake b/packaging/install.cmake
@@ -72,7 +72,6 @@ if(UNIX)
     set(KHIOPS_PATH "$(get_script_dir)")
     set(KHIOPS_COCLUSTERING_PATH "$(get_script_dir)")
     set(GET_PROC_NUMBER_PATH "$(get_script_dir)")
-    set(KHIOPS_MPI_PATH "$(get_script_dir)") # We use mpiexec in conda's bin directory
     set(IS_CONDA_VAR "\n# Inside conda environment\nexport _IS_CONDA=true")
   else()
     if(IS_FEDORA_LIKE)
@@ -82,7 +81,6 @@ if(UNIX)
     endif(IS_FEDORA_LIKE)
     set(KHIOPS_COCLUSTERING_PATH "/usr/bin/")
     set(GET_PROC_NUMBER_PATH "/usr/bin/")
-    set(KHIOPS_MPI_PATH "") # We use mpiexec given by the PATH
 
     configure_file(${PROJECT_SOURCE_DIR}/packaging/linux/common/khiops_env/use_environment_module.sh.in
                    ${TMP_DIR}/use_environment_module.sh @ONLY NEWLINE_STYLE UNIX)

diff --git a/packaging/linux/common/khiops_env/khiops_env.in b/packaging/linux/common/khiops_env/khiops_env.in
@@ -76,7 +76,7 @@ fi
 
 if command -v mpiexec &>/dev/null; then
     KHIOPS_MPI_ERROR=""
-    KHIOPS_MPI_COMMAND="@KHIOPS_MPI_PATH@mpiexec $MPI_EXTRA_FLAGS @KHIOPS_MPI_EXTRA_FLAG@ @MPIEXEC_NUMPROC_FLAG@ $KHIOPS_PROC_NUMBER"
+    KHIOPS_MPI_COMMAND="$(type -P mpiexec) $MPI_EXTRA_FLAGS @KHIOPS_MPI_EXTRA_FLAG@ @MPIEXEC_NUMPROC_FLAG@ $KHIOPS_PROC_NUMBER"
 else
     KHIOPS_MPI_ERROR="We didn't find mpiexec in the regular path. Parallel computation is unavailable: Khiops is launched in serial"
     KHIOPS_MPI_COMMAND=""