Clean up and include pspmix for running OpenMPI with SLURM

Golden_Repo/juwelsbooster_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb

@@ -32,10 +32,6 @@ dependencies = [
     ('libevent', '2.1.12'),
 ]
 
-# Without this we might run into this https://github.com/open-mpi/ompi/issues/6058 for some reason. Observed with
-# 4.0.2, but not with 4.0.1
-#preconfigopts = "./autogen.pl --force && "
-
 configopts = '--enable-shared '
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-ucx=$EBROOTUCX '
@@ -60,31 +56,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-# To be added to the mpi-settings module:
-#modextravars = {
-#    'SLURM_MPI_TYPE': 'pspmix'
-#}
-#
-## Configure OpenMPI
-#postinstallcmds = [
-#    'echo "mca_base_component_show_load_errors = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_param_check = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_show_handle_leaks = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_warn_on_fork = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl = self,vader,openib" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl_openib_allow_ib = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl_openib_if_include = mlx5_0:1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "bml_r2_show_unreach_errors = 0" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll = ^ml" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll_hcoll_enable = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll_hcoll_np = 0" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "pml = ucx" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "osc = ^rdma" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_abort_print_stack = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_set_max_sys_limits = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_event_include = epoll" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#]
-
 # Add a family for our naming scheme
 modluafooter = '''
 family("mpi")

Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-default.eb

@@ -15,6 +15,7 @@ source_urls = []
 
 sources = []
 modextravars = {
+    'SLURM_MPI_TYPE': 'pspmix',
     'OMPI_MCA_mca_base_component_show_load_errors': '1',
     'OMPI_MCA_mpi_param_check': '1',
     'OMPI_MCA_mpi_show_handle_leaks': '1',

Golden_Repo/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb

@@ -32,10 +32,6 @@ dependencies = [
     ('libevent', '2.1.12'),
 ]
 
-# Without this we might run into this https://github.com/open-mpi/ompi/issues/6058 for some reason. Observed with
-# 4.0.2, but not with 4.0.1
-#preconfigopts = "./autogen.pl --force && "
-
 configopts = '--enable-shared '
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-ucx=$EBROOTUCX '
@@ -59,31 +55,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-# To be added to the mpi-settings module:
-#modextravars = {
-#    'SLURM_MPI_TYPE': 'pspmix'
-#}
-#
-## Configure OpenMPI
-#postinstallcmds = [
-#    'echo "mca_base_component_show_load_errors = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_param_check = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_show_handle_leaks = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "mpi_warn_on_fork = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl = self,vader,openib" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl_openib_allow_ib = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "btl_openib_if_include = mlx5_0:1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "bml_r2_show_unreach_errors = 0" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll = ^ml" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll_hcoll_enable = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "coll_hcoll_np = 0" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "pml = ucx" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "osc = ^rdma" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_abort_print_stack = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_set_max_sys_limits = 1" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#    'echo "opal_event_include = epoll" >> %(installdir)s/etc/openmpi-mca-params.conf',
-#]
-
 # Add a family for our naming scheme
 modluafooter = '''
 family("mpi")