switch to OpenMPI

KhiopsML · Mar 25, 2024 · 192a662 · 192a662
1 parent cd44ed3
commit 192a662
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/build-linux-pack-containers.yml b/.github/workflows/build-linux-pack-containers.yml
@@ -38,7 +38,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: ./packaging/dockerfiles/Dockerfile.${{ matrix.os }}
-          tags: ghcr.io/${{ env.GH_REPOSITORY }}/khiopsdev-${{ matrix.os }}:latest
+          tags: ghcr.io/${{ env.GH_REPOSITORY }}/khiopsdev-new-${{ matrix.os }}:latest
           push: true
       - name: Display the image digest
         run: echo ${{ steps.docker-build.outputs.digest }}
diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [debian10, debian11, debian12, ubuntu22.04, ubuntu20.04]
     container:
-      image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
+      image: ghcr.io/khiopsml/khiops/khiopsdev-new-${{ matrix.os }}:latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -35,6 +35,8 @@ jobs:
           echo "VERSION_CODENAME=$VERSION_CODENAME" >> "$GITHUB_ENV"
       - name: Configure CMake
         run: |
+          update-alternatives -set mpi /usr/bin/mpicc.openmpi
+          update-alternatives -set mpirun /usr/bin/mpirun.openmpi
           cmake --preset linux-gcc-release -DBUILD_JARS=ON
       - name: Build Khiops binaries
         run: |
@@ -120,7 +122,7 @@ jobs:
       matrix:
         os: [debian10, debian11, debian12, ubuntu22.04, ubuntu20.04]
     container:
-      image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
+      image: ghcr.io/khiopsml/khiops/khiopsdev-new-${{ matrix.os }}:latest
     steps:
       - name: Put OS info on the environment
         run: |

diff --git a/.github/workflows/pack-rpm.yml b/.github/workflows/pack-rpm.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         os: [rocky8, rocky9]
     container:
-      image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
+      image: ghcr.io/khiopsml/khiops/khiopsdev-new-${{ matrix.os }}:latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -35,7 +35,8 @@ jobs:
       - name: Configure CMake
         run: |
           source /etc/profile.d/modules.sh
-          module load mpi/mpich-x86_64
+          module unload mpi
+          module load mpi/openmpi-x86_64
           echo "MPI_SUFFIX=$MPI_SUFFIX" >> "$GITHUB_ENV"
           cmake --preset linux-gcc-release -DBUILD_JARS=ON
       - name: Build Khiops binaries
@@ -114,7 +115,7 @@ jobs:
       matrix:
         os: [rocky8, rocky9]
     container:
-      image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
+      image: ghcr.io/khiopsml/khiops/khiopsdev-new-${{ matrix.os }}:latest
     steps:
       - name: Put OS info on the environment
         run: |

diff --git a/packaging/dockerfiles/Dockerfile.debian10 b/packaging/dockerfiles/Dockerfile.debian10
@@ -14,6 +14,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/dockerfiles/Dockerfile.debian11 b/packaging/dockerfiles/Dockerfile.debian11
@@ -14,6 +14,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/dockerfiles/Dockerfile.debian12 b/packaging/dockerfiles/Dockerfile.debian12
@@ -15,6 +15,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/dockerfiles/Dockerfile.rocky8 b/packaging/dockerfiles/Dockerfile.rocky8
@@ -13,6 +13,8 @@ RUN true \
   gcc-c++ \
   java-17-openjdk-devel \
   mpich-devel \
+  openmpi \
+  openmpi-devel \
   nano \
   ninja-build \
   rpm-build \

diff --git a/packaging/dockerfiles/Dockerfile.rocky9 b/packaging/dockerfiles/Dockerfile.rocky9
@@ -12,6 +12,8 @@ RUN true \
   gcc-c++ \
   java-17-openjdk-devel \
   mpich-devel \
+  openmpi \
+  openmpi-devel \
   nano \
   ninja-build \
   rpm-build \

diff --git a/packaging/dockerfiles/Dockerfile.ubuntu18.04 b/packaging/dockerfiles/Dockerfile.ubuntu18.04
@@ -15,6 +15,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/dockerfiles/Dockerfile.ubuntu20.04 b/packaging/dockerfiles/Dockerfile.ubuntu20.04
@@ -15,6 +15,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/dockerfiles/Dockerfile.ubuntu22.04 b/packaging/dockerfiles/Dockerfile.ubuntu22.04
@@ -15,6 +15,8 @@ RUN true \
   devscripts \
   fakeroot \
   libmpich-dev \
+  openmpi-bin \
+  libopenmpi-dev \
   nano \
   ninja-build \
   curl \

diff --git a/packaging/linux/common/khiops_coclustering b/packaging/linux/common/khiops_coclustering
@@ -17,10 +17,10 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$KHIOPS_JAVA_PATH
 if [[  $# -eq 0  ]]; then
     # run without parameters
     # run and save scenario and log files in directory KHIOPS_LAST_RUN_DIR
-    mpiexec -n 1 MODL_Coclustering -o "${KHIOPS_LAST_RUN_DIR}"/scenario._kh -e "${KHIOPS_LAST_RUN_DIR}"/log.txt
+    MODL_Coclustering -o "${KHIOPS_LAST_RUN_DIR}"/scenario._kh -e "${KHIOPS_LAST_RUN_DIR}"/log.txt
 else
     # run with parameters
-    mpiexec -n 1 MODL_Coclustering "$@"
+    MODL_Coclustering "$@"
 fi
 
 exit $?