Add mpich vs openMPI option in debian and rpm workflows

KhiopsML · Apr 9, 2024 · d9120cd · d9120cd
1 parent 5f9972c
commit d9120cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml
@@ -2,6 +2,13 @@
 name: DEB Packages
 on:
   workflow_dispatch:
+    inputs:
+      mpi_implementation:
+        description: mpi implementation
+        type: choice
+        options: 
+          - mpich
+          - openmpi
   pull_request:
     paths:
       - '**CMakeLists.txt'
@@ -35,8 +42,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
+          update-alternatives --set mpi /usr/bin/mpicc.${{ github.event.inputs.mpi_implementation }}
+          update-alternatives --set mpirun /usr/bin/mpirun.${{ github.event.inputs.mpi_implementation }}
           cmake --preset linux-gcc-release -DBUILD_JARS=ON
       - name: Build Khiops binaries
         run: |

diff --git a/.github/workflows/pack-rpm.yml b/.github/workflows/pack-rpm.yml
@@ -2,6 +2,11 @@
 name: RPM Packages
 on:
   workflow_dispatch:
+    inputs:
+      mpi_implementation:
+        description: mpi implementation
+        type: choice
+        options: [mpich, openmpi]
   pull_request:
     paths: ['**CMakeLists.txt', '**.cmake', .github/workflows/pack-rpm.yml]
   push:
@@ -36,13 +41,12 @@ jobs:
         run: |
           source /etc/profile.d/modules.sh
           module unload mpi
-          module load mpi/openmpi-x86_64
+          module load mpi/${{ github.event.inputs.mpi_implementation }}-x86_64
           cmake --preset linux-gcc-release -DBUILD_JARS=ON
       - name: Build Khiops binaries
         run: |
           cmake --build --preset linux-gcc-release --parallel \
-            --target MODL MODL_Coclustering \
-            KhiopsNativeInterface norm_jar khiops_jar
+            --target MODL MODL_Coclustering KhiopsNativeInterface norm_jar khiops_jar
       - name: Build package with CPack
         run: cd build/linux-gcc-release && cpack -G RPM
       - name: Rename packages with codename