From cc3dcc4368b07a8af3032d04db8eea83c50f3ac3 Mon Sep 17 00:00:00 2001
From: Jian Sun <sunjian@ucar.edu>
Date: Wed, 20 Dec 2023 10:53:24 -0700
Subject: [PATCH 1/3] use the system-wide mpi wrapper script to handle MPI-only
 and hybrid MPI/OpenMP configurations automatically

---
 machines/derecho/config_machines.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
index 633fe74d..974208d3 100644
--- a/machines/derecho/config_machines.xml
+++ b/machines/derecho/config_machines.xml
@@ -21,12 +21,7 @@
     <MPI_GPU_WRAPPER_SCRIPT>get_local_rank</MPI_GPU_WRAPPER_SCRIPT>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
-      <executable>mpiexec</executable>
-      <arguments>
-        <arg name="label"> --label</arg>
-        <arg name="buffer"> --line-buffer</arg>
-        <arg name="num_tasks" > -n {{ total_tasks }}</arg>
-      </arguments>
+      <executable>mpibind</executable>
     </mpirun>
     <module_system type="module" allow_error="true">
       <init_path lang="perl">$ENV{LMOD_ROOT}/lmod/init/perl</init_path>

From 30a8f2885c63d68d92c81b19cd2372cab8f2886d Mon Sep 17 00:00:00 2001
From: Jian Sun <sunjian@ucar.edu>
Date: Fri, 5 Jan 2024 09:22:48 -0700
Subject: [PATCH 2/3] add back the MPI debug flags and updated temporary
 mpibind script path

---
 machines/derecho/config_machines.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
index 974208d3..56c56ca8 100644
--- a/machines/derecho/config_machines.xml
+++ b/machines/derecho/config_machines.xml
@@ -21,7 +21,12 @@
     <MPI_GPU_WRAPPER_SCRIPT>get_local_rank</MPI_GPU_WRAPPER_SCRIPT>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
-      <executable>mpibind</executable>
+      <executable>/glade/work/rory/mpibind/mpibind</executable>
+      <arguments>
+        <arg name="label"> --label</arg>
+	<arg name="buffer"> --line-buffer</arg>
+	<arg name="separator"> -- </arg>
+      </arguments>
     </mpirun>
     <module_system type="module" allow_error="true">
       <init_path lang="perl">$ENV{LMOD_ROOT}/lmod/init/perl</init_path>

From 8793c520d224c133116a74b9429c49aba9308e73 Mon Sep 17 00:00:00 2001
From: Jian Sun <sunjian@ucar.edu>
Date: Fri, 5 Jan 2024 11:04:03 -0700
Subject: [PATCH 3/3] update to env script

---
 machines/derecho/config_machines.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
index 56c56ca8..6f9d6fd6 100644
--- a/machines/derecho/config_machines.xml
+++ b/machines/derecho/config_machines.xml
@@ -21,7 +21,7 @@
     <MPI_GPU_WRAPPER_SCRIPT>get_local_rank</MPI_GPU_WRAPPER_SCRIPT>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
-      <executable>/glade/work/rory/mpibind/mpibind</executable>
+      <executable>mpibind</executable>
       <arguments>
         <arg name="label"> --label</arg>
 	<arg name="buffer"> --line-buffer</arg>