Merge pull request #17 from gvallee/fix/mvapich_support

Fix issues created by Ben's PR
gvallee · Mar 8, 2023 · f890c4a · f890c4a
2 parents 382ab4f + 717348b
commit f890c4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkg/jm/jobmgr_slurm.go b/pkg/jm/jobmgr_slurm.go
@@ -19,7 +19,6 @@ import (
 	"github.com/gvallee/go_exec/pkg/advexec"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/network"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/openmpi"
-    "github.com/gvallee/go_hpc_jobmgr/internal/pkg/mvapich2"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/slurm"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/mpi"

diff --git a/pkg/mpi/mpi.go b/pkg/mpi/mpi.go
@@ -61,9 +61,8 @@ func GetMpirunArgs(myHostMPICfg *implem.Info, app *app.Info, sysCfg *sys.Config,
 	switch myHostMPICfg.ID {
 	case implem.OMPI:
 		extraArgs = append(extraArgs, openmpi.GetExtraMpirunArgs(sysCfg, netCfg, mpirunArgs)...)
-        break
-    case implem.MVAPICH2:
-        extraArgs = append(extraArgs, mvapich2.GetExtraMpirunArgs(sysCfg, netCfg, mpirunArgs)...)
+	case implem.MVAPICH2:
+		extraArgs = append(extraArgs, mvapich2.GetExtraMpirunArgs(sysCfg, netCfg, mpirunArgs)...)
 	}
 
 	return extraArgs, nil