From 0cd0cf1694fa8ea7003943505e93f699a7973d16 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 15 Jul 2015 09:06:40 +0200 Subject: [PATCH] revert #1785, patch is incomplete and causes segfaults --- .../o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb | 1 - .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb | 1 - .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb | 1 - .../o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb | 1 - .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb | 1 - .../easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb | 1 - .../o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb | 4 ---- .../OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb | 1 - .../easyconfigs/o/OpenMPI/OpenMPI-1.8.1-GCC-4.8.3.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.8.3-GCC-4.9.2.eb | 4 ---- .../OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb | 5 ----- .../easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.8.4.eb | 4 ---- .../easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.9.2.eb | 4 ---- .../OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb | 4 ---- .../OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb | 4 ---- .../o/OpenMPI/OpenMPI-1.8.5-GNU-4.9.2-2.25.eb | 4 ---- .../o/OpenMPI/openmpi-mca-params.conf-pre-1.8.6.patch | 9 --------- 27 files changed, 93 deletions(-) delete mode 100644 easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-pre-1.8.6.patch diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb index 4ed82a3c679b..d88a606fa087 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb @@ -20,10 +20,6 @@ dependencies = [('hwloc', '1.6')] # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mca_common_sm", "mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "otfaux", "otf", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb index 8196616926cb..b42d9a8b0334 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb index 765b625b39cc..fc479108fe13 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb index 2dafe6d37c43..8b588833b0c1 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb @@ -19,10 +19,6 @@ configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support configopts += '--disable-dlopen ' # statically link component, don't do dynamic loading -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb index b52aee2a7138..168f6f9d2368 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb index 27fe1fb0fc24..933369e32b80 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb @@ -24,10 +24,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb index 47f67c7470fd..ccbc9394ec9e 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb @@ -13,7 +13,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb index d4ff682ecaaf..ce23f5535501 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb @@ -13,7 +13,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb index 7bf566224c18..c6b40582c811 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb @@ -12,7 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb index ca196d7cca4e..2afbc4733e24 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb @@ -13,7 +13,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb index 77911abd5d25..8af372736a44 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb @@ -12,7 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb index d4c15d5bf5e8..2ae7377c3711 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb @@ -12,7 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-1.6.5-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb index f23bde1400b2..4fc8978e4dd5 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb @@ -20,10 +20,6 @@ dependencies = [('hwloc', '1.8.1')] # needed for --with-openib osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb index 403555039f96..0bb4349893a4 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb @@ -18,10 +18,6 @@ configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support dependencies = [('hwloc', '1.9')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb index 7ea527459f2c..e9f2f244ec12 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb @@ -20,10 +20,6 @@ dependencies = [('hwloc', '1.9')] # needed for --with-openib osdependencies = [('libibverbs-dev','libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb index 34b0c2b430f5..6687a0ffa048 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb @@ -23,10 +23,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb index dc5a005db0cb..10774dff41ae 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb @@ -12,7 +12,6 @@ sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', 'OpenMPI-%(version)s_common-cuda-lib.patch', 'OpenMPI-%(version)s-vt_cupti_events.patch', ] diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.1-GCC-4.8.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.1-GCC-4.8.3.eb index e03880908d72..eeb7c2fe8278 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.1-GCC-4.8.3.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.1-GCC-4.8.3.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-GCC-4.9.2.eb index f7b63ddff54e..a47fa4f0f1ba 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-GCC-4.9.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-GCC-4.9.2.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb index 713b0ea77b2b..c6c6f0c9abed 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb @@ -20,10 +20,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic dependencies = [('hwloc', '1.9')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb index 21b804f8c3d8..f5e9417cad30 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb @@ -11,7 +11,6 @@ toolchain = {'name': 'iccifort', 'version': '2013_sp1.4.211'} sources = [SOURCELOWER_TAR_GZ] source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] - configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs ' configopts += '--enable-mpirun-prefix-by-default ' # suppress failure modes in relation to mpirun path configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support @@ -22,10 +21,6 @@ dependencies = [('hwloc', '1.9')] # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.8.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.8.4.eb index 722d00ac9ac2..2eb439ac3492 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.8.4.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.8.4.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.9.2.eb index 97c6962989b3..e009a632591c 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.9.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-GCC-4.9.2.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb index 5f77464b2d97..780c3c78ba6d 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb @@ -22,10 +22,6 @@ dependencies = [('hwloc', '1.10.0')] # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb index d9c37cd00487..ca0afea9dc03 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb @@ -23,10 +23,6 @@ dependencies = [('hwloc', '1.10.0')] # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.5-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.5-GNU-4.9.2-2.25.eb index 06ce242b8bb4..095d22d991eb 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.5-GNU-4.9.2-2.25.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.5-GNU-4.9.2-2.25.eb @@ -21,10 +21,6 @@ configopts += '--disable-dlopen ' # statically link component, don't do dynamic # needed for --with-verbs osdependencies = [('libibverbs-dev', 'libibverbs-devel')] -patches = [ - 'openmpi-mca-params.conf-pre-1.8.6.patch', -] - libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"] sanity_check_paths = { 'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] + diff --git a/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-pre-1.8.6.patch b/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-pre-1.8.6.patch deleted file mode 100644 index 0d7989a78180..000000000000 --- a/easybuild/easyconfigs/o/OpenMPI/openmpi-mca-params.conf-pre-1.8.6.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- opal/etc/openmpi-mca-params.conf.orig 2015-06-05 16:21:25.535727000 +0200 -+++ opal/etc/openmpi-mca-params.conf 2015-06-08 10:36:05.387902000 +0200 -@@ -56,3 +56,6 @@ - - # See "ompi_info --param all all" for a full listing of Open MPI MCA - # parameters available and their default values. -+ -+# Fix bug in the initialization of the value when using the infiniband module. (ref: http://www.open-mpi.org/community/lists/users/2015/05/26913.php) -+btl_openib_memalign_threshold=12288