From 269c5e22de1bdcb6296896c060eb6b8777af7ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franz=20P=C3=B6schel?= <franz.poeschel@gmail.com>
Date: Tue, 19 Nov 2024 17:59:20 +0100
Subject: [PATCH] Remove mpirun_workaround.sh (#1698)

Seems to no longer be necessary in the affected CI runs
---
 .github/workflows/linux.yml            |  3 +-
 .github/workflows/macos.yml            |  3 +-
 .github/workflows/mpirun_workaround.sh | 52 --------------------------
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100755 .github/workflows/mpirun_workaround.sh

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9592a71223..faad7cd9e0 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -328,8 +328,7 @@ jobs:
           -DopenPMD_USE_MPI=ON    \
           -DopenPMD_USE_HDF5=ON   \
           -DopenPMD_USE_ADIOS2=ON \
-          -DopenPMD_USE_INVASIVE_TESTS=ON \
-          -DMPIEXEC_EXECUTABLE=".github/workflows/mpirun_workaround.sh"
+          -DopenPMD_USE_INVASIVE_TESTS=ON
         cmake --build build --parallel 2
         cd build
         ctest --output-on-failure
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 782acf0bc0..b9b4523852 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -40,8 +40,7 @@ jobs:
           -DopenPMD_USE_MPI=ON    \
           -DopenPMD_USE_HDF5=ON   \
           -DopenPMD_USE_ADIOS2=ON \
-          -DopenPMD_USE_INVASIVE_TESTS=ON \
-          -DMPIEXEC_EXECUTABLE=".github/workflows/mpirun_workaround.sh"
+          -DopenPMD_USE_INVASIVE_TESTS=ON
         cmake --build build --parallel 3
         ctest --test-dir build --verbose
 
diff --git a/.github/workflows/mpirun_workaround.sh b/.github/workflows/mpirun_workaround.sh
deleted file mode 100755
index e953b34647..0000000000
--- a/.github/workflows/mpirun_workaround.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# mpiexec currently seems to have a bug where it tries to parse parameters
-# of the launched application when they start with a dash, e.g.
-# `mpiexec python ./openpmd-pipe --infile in.bp --outfile out.bp`
-# leads to:
-# >  An unrecognized option was included on the mpiexec command line:
-# >
-# >    Option: --infile
-# >
-# >  Please use the "mpiexec --help" command to obtain a list of all
-# >  supported options.
-#
-# This script provides a workaround by putting the called sub-command into
-# a script in a temporary file.
-
-ls="$(which ls)"
-mpiexec "$ls" -m \
-    && echo "MPIRUN WORKING AGAIN, PLEASE REMOVE WORKAROUND" >&2 \
-    && exit 1 \
-    || true
-
-mpirun_args=()
-
-script_file="$(mktemp)"
-
-cleanup() {
-    rm "$script_file"
-}
-trap cleanup EXIT
-
-while true; do
-    case "$1" in
-        -c | -np | --np | -n | --n )
-            mpirun_args+=("$1" "$2")
-            shift
-            shift
-            ;;
-        *)
-            break
-            ;;
-    esac
-done
-
-echo -e '#!/usr/bin/env bash\n' > "$script_file"
-for item in "$@"; do
-    echo -n "'$item' " >> "$script_file"
-done
-
-chmod +x "$script_file"
-
-mpirun "${mpirun_args[@]}" "$script_file"