Merge pull request #406 from GEOS-ESM/bugfix/ompi-mpirun

sdrabenh · web-flow · commit 3d61da411a67 · 2026-03-12T15:11:25.000-04:00
Fix for Open MPI 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix for Open MPI calls in `esma_mpirun` from Open MPI 5 testing
+
 ### Removed
 
 ### Deprecated
diff --git a/GMAO_etc/esma_mpirun b/GMAO_etc/esma_mpirun
@@ -331,12 +331,10 @@ sub get_xtraflags {
     if ($mpi_type eq "openmpi") {
 
        if ($siteID eq "gmao") {
-          $xtraflags .= " -oversubscribe";
+          $xtraflags .= " --oversubscribe";
        }
        if ($perhost) {
-          $xtraflags .= " -map-by ppr:$perhost:node -bind-to core";
-       } else {
-          $xtraflags .= " -map-by node -bind-to core";
+          $xtraflags .= " --map-by ppr:$perhost:node --bind-to core";
        }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -331,12 +331,10 @@ sub get_xtraflags {`
`331`	`331`	`if ($mpi_type eq "openmpi") {`
`332`	`332`
`333`	`333`	`if ($siteID eq "gmao") {`
`334`		`- $xtraflags .= " -oversubscribe";`
	`334`	`+ $xtraflags .= " --oversubscribe";`
`335`	`335`	`}`
`336`	`336`	`if ($perhost) {`
`337`		`- $xtraflags .= " -map-by ppr:$perhost:node -bind-to core";`
`338`		`- } else {`
`339`		`- $xtraflags .= " -map-by node -bind-to core";`
	`337`	`+ $xtraflags .= " --map-by ppr:$perhost:node --bind-to core";`
`340`	`338`	`}`
`341`	`339`
`342`	`340`	`}`