From f588c35d02f2458add865821523953ad9e747031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= Date: Thu, 6 Feb 2020 13:21:20 +0100 Subject: [PATCH] modified: o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb modified: o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb modified: o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb modified: o/OpenMPI/OpenMPI-3.1.5.eb modified: o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb --- o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb | 10 ++++++++-- o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb | 11 +++++++++-- o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb | 1 - o/OpenMPI/OpenMPI-3.1.5.eb | 10 ++++++++-- o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb | 10 ++++++++-- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb b/o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb index fc74e496..97c197ac 100644 --- a/o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb +++ b/o/OpenMPI/OpenMPI-3.1.4-GCC-8.3.0-2.32.eb @@ -51,9 +51,15 @@ sanity_check_paths = { x for x in [ "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], } -modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', +import os +if os.environ.get("CLUSTERNAME") in ["BARBORA"]: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', 'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24', 'OMPI_MCA_orte_base_help_aggregate': '0', - } + } +else: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0', + 'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8', + } moduleclass = 'mpi' diff --git a/o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb b/o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb index 8389a720..2b265384 100644 --- a/o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb +++ b/o/OpenMPI/OpenMPI-3.1.4-PGI-19.7-GCC-8.2.0-2.31.1.eb @@ -65,8 +65,15 @@ sanity_check_commands = [ ('mpifort --version | grep pgfortran', ''), ] -modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0', +import os +if os.environ.get("CLUSTERNAME") in ["BARBORA"]: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', + 'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24', + 'OMPI_MCA_orte_base_help_aggregate': '0', + } +else: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0', 'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8', - } + } moduleclass = 'mpi' diff --git a/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb b/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb index 65af25c6..29cc26b5 100644 --- a/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb +++ b/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb @@ -49,5 +49,4 @@ else: 'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8', } - moduleclass = 'mpi' diff --git a/o/OpenMPI/OpenMPI-3.1.5.eb b/o/OpenMPI/OpenMPI-3.1.5.eb index db9d01d5..ad22f7bb 100644 --- a/o/OpenMPI/OpenMPI-3.1.5.eb +++ b/o/OpenMPI/OpenMPI-3.1.5.eb @@ -38,9 +38,15 @@ sanity_check_paths = { x for x in [ "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], } -modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', +import os +if os.environ.get("CLUSTERNAME") in ["BARBORA"]: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', 'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24', 'OMPI_MCA_orte_base_help_aggregate': '0', - } + } +else: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0', + 'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8', + } moduleclass = 'mpi' diff --git a/o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb b/o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb index fa9c6531..a78cbf94 100644 --- a/o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb +++ b/o/OpenMPI/OpenMPI-4.0.2-GCC-8.3.0-2.32.eb @@ -47,9 +47,15 @@ sanity_check_paths = { x for x in [ "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], } -modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', +import os +if os.environ.get("CLUSTERNAME") in ["BARBORA"]: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0', 'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24', 'OMPI_MCA_orte_base_help_aggregate': '0', - } + } +else: + modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0', + 'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8', + } moduleclass = 'mpi'