Merge branch 'main' into file_staging

Author: hategan

requirements.txt

@@ -1,4 +1,4 @@
-psutil >=5.9, <=6.1.1
+psutil >=5.9, <=7.0.0
 pystache>=0.6.0
 typeguard>=3.0.1
 packaging >= 24.0, <= 24.2

src/psij/launchers/scripts/mpi_launch.sh

@@ -6,15 +6,21 @@ _PSI_J_PROCESS_COUNT="$1"
 shift
 
 IS_OPENMPI=0
-if mpirun -version | grep "Open MPI" >/dev/null 2>&1; then
+IS_OPENMPI_5=0
+if mpirun -version | grep "(Open MPI) 5" >/dev/null 2>&1; then
+    IS_OPENMPI_5=1
+elif mpirun -version | grep "Open MPI" >/dev/null 2>&1; then
     IS_OPENMPI=1
 fi
 
 pre_launch
 
 set +e
-if [ "$IS_OPENMPI" == "1" ]; then
+if [ "$IS_OPENMPI_5" == "1" ]; then
+    # there is no -q parameter in OMPI 5
     mpirun --oversubscribe -n $_PSI_J_PROCESS_COUNT "$@" 1>$_PSI_J_STDOUT 2>$_PSI_J_STDERR <$_PSI_J_STDIN
+elif [ "$IS_OPENMPI" == "1" ]; then
+    mpirun --oversubscribe -q -n $_PSI_J_PROCESS_COUNT "$@" 1>$_PSI_J_STDOUT 2>$_PSI_J_STDERR <$_PSI_J_STDIN
 else
     mpirun -n $_PSI_J_PROCESS_COUNT "$@" 1>$_PSI_J_STDOUT 2>$_PSI_J_STDERR <$_PSI_J_STDIN
 fi

tests/test_executor.py

@@ -167,6 +167,8 @@ def test_list(execparams: ExecutorTestParams) -> None:
     assert job.native_id is not None
     ids = ex.list()
     assert job.native_id in ids
+    status = job.wait(timeout=_get_timeout(execparams))
+    assert_completed(job, status)
 
 
 def _get_batch_executors() -> List[str]: