From 7768b1feb2aaa91b8014ed43c75fa3ae764c625f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Mon, 9 Aug 2021 19:40:34 +0200 Subject: [PATCH 1/9] adding easyconfigs: OpenMPI-4.1.1-GCC-11.2.0.eb, PMIx-4.1.0-GCCcore-11.2.0.eb --- .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 42 +++++++++++++++++ .../p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb | 45 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb create mode 100644 easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb new file mode 100644 index 00000000000..a702b3a699e --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -0,0 +1,42 @@ +name = 'OpenMPI' +version = '4.1.1' + +homepage = 'https://www.open-mpi.org/' +description = """The Open MPI Project is an open source MPI-3 implementation.""" + +toolchain = {'name': 'GCC', 'version': '11.2.0'} + +source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] +sources = [SOURCELOWER_TAR_BZ2] +patches = [ + 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', + 'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch' +] +checksums = [ + 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda', # openmpi-4.1.1.tar.bz2 + # OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch + 'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e', + # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch + '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d', +] + +builddependencies = [ + ('pkg-config', '0.29.2'), +] + +dependencies = [ + ('zlib', '1.2.11'), + ('hwloc', '2.5.0'), + ('libevent', '2.1.12'), + ('UCX', '1.11.0'), + ('libfabric', '1.13.0'), + ('PMIx', '4.1.0'), +] + +# disable MPI1 compatibility for now, see what breaks... +# configopts = '--enable-mpi1-compatibility ' + +# to enable SLURM integration (site-specific) +# configopts += '--with-slurm --with-pmi=/usr/include/slurm --with-pmi-libdir=/usr' + +moduleclass = 'mpi' diff --git a/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb new file mode 100644 index 00000000000..f28081b4d11 --- /dev/null +++ b/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb @@ -0,0 +1,45 @@ +easyblock = 'ConfigureMake' + +name = 'PMIx' +version = '4.1.0' + +homepage = 'https://pmix.org/' +description = """Process Management for Exascale Environments +PMI Exascale (PMIx) represents an attempt to +provide an extended version of the PMI standard specifically designed +to support clusters up to and including exascale sizes. The overall +objective of the project is not to branch the existing pseudo-standard +definitions - in fact, PMIx fully supports both of the existing PMI-1 +and PMI-2 APIs - but rather to (a) augment and extend those APIs to +eliminate some current restrictions that impact scalability, and (b) +provide a reference implementation of the PMI-server that demonstrates +the desired level of scalability. +""" + +toolchain = {'name': 'GCCcore', 'version': '11.2.0'} +toolchainopts = {'pic': True} + +source_urls = ['https://github.com/openpmix/openpmix/releases/download/v%(version)s'] +sources = ['%(namelower)s-%(version)s.tar.bz2'] +checksums = ['145f05a6c621bfb3fc434776b615d7e6d53260cc9ba340a01f55b383e07c842e'] + +builddependencies = [('binutils', '2.37')] + +dependencies = [ + ('libevent', '2.1.12'), + ('zlib', '1.2.11'), + ('hwloc', '2.5.0'), +] + +configopts = ' --with-libevent=$EBROOTLIBEVENT --with-zlib=$EBROOTZLIB' +configopts += ' --with-hwloc=$EBROOTHWLOC' +configopts += ' --enable-pmix-binaries' + +buildopts = 'V=1' + +sanity_check_paths = { + 'files': ['bin/pevent', 'bin/plookup', 'bin/pmix_info', 'bin/pps'], + 'dirs': ['etc', 'include', 'lib', 'share'] +} + +moduleclass = 'lib' From c27d2a3933c46120f5ae00d00593abea526a6dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Tue, 10 Aug 2021 13:37:12 +0200 Subject: [PATCH 2/9] Update easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb Co-authored-by: Simon Branford <4967+branfosj@users.noreply.github.com> --- easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb index f28081b4d11..d36693b0c91 100644 --- a/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb +++ b/easybuild/easyconfigs/p/PMIx/PMIx-4.1.0-GCCcore-11.2.0.eb @@ -34,6 +34,7 @@ dependencies = [ configopts = ' --with-libevent=$EBROOTLIBEVENT --with-zlib=$EBROOTZLIB' configopts += ' --with-hwloc=$EBROOTHWLOC' configopts += ' --enable-pmix-binaries' +configopts += ' --disable-man-pages' buildopts = 'V=1' From f17c3d246a6fc5add6f6aadac2390d7b496a7a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 12 Aug 2021 16:33:54 +0200 Subject: [PATCH 3/9] Update easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb Co-authored-by: SebastianAchilles --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index a702b3a699e..7b66b43f294 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -6,7 +6,10 @@ description = """The Open MPI Project is an open source MPI-3 implementation.""" toolchain = {'name': 'GCC', 'version': '11.2.0'} -source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] +source_urls = [ + 'https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/', + 'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads', +] sources = [SOURCELOWER_TAR_BZ2] patches = [ 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', From f1dc0dbb3773a1e076974920b51d3576b4c65885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 12 Aug 2021 16:33:59 +0200 Subject: [PATCH 4/9] Update easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb Co-authored-by: SebastianAchilles --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index 7b66b43f294..c8466635cb3 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -14,6 +14,8 @@ sources = [SOURCELOWER_TAR_BZ2] patches = [ 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', 'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch' + '9212.patch', + '9213.patch', ] checksums = [ 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda', # openmpi-4.1.1.tar.bz2 From 3c4d39632612be7be3cf05063abb49682d40354d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 12 Aug 2021 16:34:05 +0200 Subject: [PATCH 5/9] Update easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb Co-authored-by: SebastianAchilles --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index c8466635cb3..5dd52256452 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -23,6 +23,8 @@ checksums = [ 'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e', # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d', + 'a85b09da354916c2a08c24922268e4f25352daf2787c7c90cd5d24ca4f8d892f', # 9212.patch + 'cd250609f2c7974774a4e8931873bc795c0769581f91530524df516490de4954', # 9213.patch ] builddependencies = [ From 7201b847f3a812e08a3e51526a2525a6a297b8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 12 Aug 2021 16:45:22 +0200 Subject: [PATCH 6/9] Update easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb Co-authored-by: SebastianAchilles --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index 5dd52256452..9a76b9a2f8e 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -13,7 +13,7 @@ source_urls = [ sources = [SOURCELOWER_TAR_BZ2] patches = [ 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', - 'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch' + 'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch', '9212.patch', '9213.patch', ] From fba59300df6a049d5932fcc878eff37cccd3d866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Sat, 14 Aug 2021 21:01:30 +0200 Subject: [PATCH 7/9] Include patches --- easybuild/easyconfigs/o/OpenMPI/9212.patch | 64 +++++++++++++++ easybuild/easyconfigs/o/OpenMPI/9213.patch | 79 +++++++++++++++++++ .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 5 +- 3 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 easybuild/easyconfigs/o/OpenMPI/9212.patch create mode 100644 easybuild/easyconfigs/o/OpenMPI/9213.patch diff --git a/easybuild/easyconfigs/o/OpenMPI/9212.patch b/easybuild/easyconfigs/o/OpenMPI/9212.patch new file mode 100644 index 00000000000..156d3d0a44b --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/9212.patch @@ -0,0 +1,64 @@ +From 8b07775d1002cc9be887c41768aea9ac896c5ecd Mon Sep 17 00:00:00 2001 +From: Ralph Castain +Date: Tue, 10 Aug 2021 08:38:15 -0700 +Subject: [PATCH] Use an OPAL-prefixed abstraction for PMIX_PACKAGE_RANK + +If someone configures against PMIx v4.1 or above, the configure +logic will correctly detect the presence of PMIX_PACKAGE_RANK. +However, the internal code only includes the opal/mca/pmix headers +and thus only the OPAL-prefixed PMIx abstractions are available. +Add an OPAL_PMIX_PACKAGE_RANK abstraction and update the common/ofi +code to use it. + +Signed-off-by: Ralph Castain +--- + opal/mca/common/ofi/common_ofi.c | 6 ++---- + opal/mca/pmix/pmix_types.h | 2 ++ + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/opal/mca/common/ofi/common_ofi.c b/opal/mca/common/ofi/common_ofi.c +index 12bed7eb6b8..769ecb75239 100644 +--- a/opal/mca/common/ofi/common_ofi.c ++++ b/opal/mca/common/ofi/common_ofi.c +@@ -312,19 +312,17 @@ static uint32_t get_package_rank(int32_t num_local_peers, uint16_t my_local_rank + char *local_peers = NULL; + char *locality_string = NULL; + char *mylocality = NULL; ++ uint16_t *package_rank_ptr; + + pname.jobid = OPAL_PROC_MY_NAME.jobid; + pname.vpid = OPAL_VPID_WILDCARD; + +-#if HAVE_DECL_PMIX_PACKAGE_RANK +- uint16_t *package_rank_ptr; + // Try to get the PACKAGE_RANK from PMIx +- OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_PACKAGE_RANK, ++ OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, OPAL_PMIX_PACKAGE_RANK, + &pname, &package_rank_ptr, OPAL_UINT16); + if (OPAL_SUCCESS == rc) { + return (uint32_t)*package_rank_ptr; + } +-#endif + + // Get the local peers + OPAL_MODEX_RECV_VALUE(rc, OPAL_PMIX_LOCAL_PEERS, +diff --git a/opal/mca/pmix/pmix_types.h b/opal/mca/pmix/pmix_types.h +index d2643b2e549..816e386cbf1 100644 +--- a/opal/mca/pmix/pmix_types.h ++++ b/opal/mca/pmix/pmix_types.h +@@ -2,6 +2,7 @@ + * Copyright (c) 2014-2018 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. ++ * Copyright (c) 2021 Nanook Consulting. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow +@@ -130,6 +131,7 @@ BEGIN_C_DECLS + #define OPAL_PMIX_NPROC_OFFSET "pmix.offset" // (uint32_t) starting global rank of this job + #define OPAL_PMIX_LOCAL_RANK "pmix.lrank" // (uint16_t) rank on this node within this job + #define OPAL_PMIX_NODE_RANK "pmix.nrank" // (uint16_t) rank on this node spanning all jobs ++#define OPAL_PMIX_PACKAGE_RANK "pmix.pkgrank" // (uint16_t) rank within this job on the package where this proc resides + #define OPAL_PMIX_LOCALLDR "pmix.lldr" // (uint64_t) opal_identifier of lowest rank on this node within this job + #define OPAL_PMIX_APPLDR "pmix.aldr" // (uint32_t) lowest rank in this app within this job + #define OPAL_PMIX_PROC_PID "pmix.ppid" // (pid_t) pid of specified proc diff --git a/easybuild/easyconfigs/o/OpenMPI/9213.patch b/easybuild/easyconfigs/o/OpenMPI/9213.patch new file mode 100644 index 00000000000..f74907f563a --- /dev/null +++ b/easybuild/easyconfigs/o/OpenMPI/9213.patch @@ -0,0 +1,79 @@ +From bd48a06e25c1058b7d3c3ba4414af388836c8219 Mon Sep 17 00:00:00 2001 +From: Ralph Castain +Date: Tue, 10 Aug 2021 13:01:11 -0700 +Subject: [PATCH] Protect the pmix3x component from a PMIx v4 attribute + +PMIx v4 introduced a new PMIX_TOPO2 attribute that takes a data type +unknown to PMIx 3. Unfortunately, that attribute can be provided by +the RM without our knowledge. We will update PMIx to try and detect +it and prevent it from slipping down to this level. Meantime, add +some simple protection here. + +Signed-off-by: Ralph Castain +--- + opal/mca/pmix/pmix3x/pmix3x.c | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/opal/mca/pmix/pmix3x/pmix3x.c b/opal/mca/pmix/pmix3x/pmix3x.c +index 90670f6adb6..3b2a5353cc6 100644 +--- a/opal/mca/pmix/pmix3x/pmix3x.c ++++ b/opal/mca/pmix/pmix3x/pmix3x.c +@@ -8,6 +8,7 @@ + * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2017 Los Alamos National Security, LLC. All rights + * reserved. ++ * Copyright (c) 2021 Nanook Consulting. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow +@@ -966,6 +967,7 @@ int pmix3x_value_unload(opal_value_t *kv, + opal_list_t *lt; + opal_value_t *ival; + size_t n; ++ pmix_info_t *iptr; + + switch(v->type) { + case PMIX_UNDEF: +@@ -1178,27 +1180,30 @@ int pmix3x_value_unload(opal_value_t *kv, + kv->data.pinfo.state = pmix3x_convert_state(v->data.pinfo->state); + break; + case PMIX_DATA_ARRAY: +- if (NULL == v->data.darray || NULL == v->data.darray->array) { ++ if (NULL == v->data.darray || NULL == v->data.darray->array || ++ PMIX_INFO != v->data.darray->type) { + kv->data.ptr = NULL; + break; + } + lt = OBJ_NEW(opal_list_t); + kv->type = OPAL_PTR; + kv->data.ptr = (void*)lt; ++ iptr = (pmix_info_t*)v->data.darray->array; + for (n=0; n < v->data.darray->size; n++) { ++ if (0 == strcmp("pmix.topo2", iptr[n].key)) { ++ /* we do not know (yet) how to convert the pmix.topo2 key from PMIx 4.0.0 ++ * but since we are not going to use it, simply ignore it and move on */ ++ continue; ++ } + ival = OBJ_NEW(opal_value_t); + opal_list_append(lt, &ival->super); +- /* handle the various types */ +- if (PMIX_INFO == v->data.darray->type) { +- pmix_info_t *iptr = (pmix_info_t*)v->data.darray->array; +- ival->key = strdup(iptr[n].key); +- rc = pmix3x_value_unload(ival, &iptr[n].value); +- if (OPAL_SUCCESS != rc) { +- OPAL_LIST_RELEASE(lt); +- kv->type = OPAL_UNDEF; +- kv->data.ptr = NULL; +- break; +- } ++ ival->key = strdup(iptr[n].key); ++ rc = pmix3x_value_unload(ival, &iptr[n].value); ++ if (OPAL_SUCCESS != rc) { ++ OPAL_LIST_RELEASE(lt); ++ kv->type = OPAL_UNDEF; ++ kv->data.ptr = NULL; ++ break; + } + } + break; diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index 9a76b9a2f8e..989f66906b9 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -6,10 +6,7 @@ description = """The Open MPI Project is an open source MPI-3 implementation.""" toolchain = {'name': 'GCC', 'version': '11.2.0'} -source_urls = [ - 'https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/', - 'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads', -] +source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads'] sources = [SOURCELOWER_TAR_BZ2] patches = [ 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', From c0c466175b7726f6c303ea21d06153f40671ac82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Wed, 18 Aug 2021 14:34:28 +0200 Subject: [PATCH 8/9] Rename patches --- .../easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 8 ++++---- ...2.patch => OpenMPI-4.1.1_opal-pmix-package-rank.patch} | 0 .../{9213.patch => OpenMPI-4.1.1_pmix3x-protection.patch} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename easybuild/easyconfigs/o/OpenMPI/{9212.patch => OpenMPI-4.1.1_opal-pmix-package-rank.patch} (100%) rename easybuild/easyconfigs/o/OpenMPI/{9213.patch => OpenMPI-4.1.1_pmix3x-protection.patch} (100%) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index 989f66906b9..ab6724331f4 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -11,8 +11,8 @@ sources = [SOURCELOWER_TAR_BZ2] patches = [ 'OpenMPI-4.1.1_fix-bufferoverflow-in-common_ofi.patch', 'OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch', - '9212.patch', - '9213.patch', + 'OpenMPI-4.1.1_opal-pmix-package-rank.patch', + 'OpenMPI-4.1.1_pmix3x-protection.patch', ] checksums = [ 'e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda', # openmpi-4.1.1.tar.bz2 @@ -20,8 +20,8 @@ checksums = [ 'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e', # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d', - 'a85b09da354916c2a08c24922268e4f25352daf2787c7c90cd5d24ca4f8d892f', # 9212.patch - 'cd250609f2c7974774a4e8931873bc795c0769581f91530524df516490de4954', # 9213.patch + 'a85b09da354916c2a08c24922268e4f25352daf2787c7c90cd5d24ca4f8d892f', # OpenMPI-4.1.1_opal-pmix-package-rank.patch + 'cd250609f2c7974774a4e8931873bc795c0769581f91530524df516490de4954', # OpenMPI-4.1.1_pmix3x-protection.patch ] builddependencies = [ diff --git a/easybuild/easyconfigs/o/OpenMPI/9212.patch b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch similarity index 100% rename from easybuild/easyconfigs/o/OpenMPI/9212.patch rename to easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch diff --git a/easybuild/easyconfigs/o/OpenMPI/9213.patch b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch similarity index 100% rename from easybuild/easyconfigs/o/OpenMPI/9213.patch rename to easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch From f7bb1468fe71c70c3faeaa1dc03388e8fd3489ed Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Aug 2021 14:49:00 +0200 Subject: [PATCH 9/9] add reference to PRs in Open MPI GitHub repository in patches for OpenMPI 4.1.1 --- easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 4 ++-- .../o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch | 2 ++ .../o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index ab6724331f4..ee8f19a6c14 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -20,8 +20,8 @@ checksums = [ 'a189d834506f3d7c31eda6aa184598a3631ea24a94bc551d5ed1f053772ca49e', # OpenMPI-4.0.6_remove-pmix-check-in-pmi-switch.patch '8acee6c9b2b4bf12873a39b85a58ca669de78e90d26186e52f221bb4853abc4d', - 'a85b09da354916c2a08c24922268e4f25352daf2787c7c90cd5d24ca4f8d892f', # OpenMPI-4.1.1_opal-pmix-package-rank.patch - 'cd250609f2c7974774a4e8931873bc795c0769581f91530524df516490de4954', # OpenMPI-4.1.1_pmix3x-protection.patch + '04353672cf7be031e5306c94068d7012d99e6cd94b69d93230797ffcd7f31903', # OpenMPI-4.1.1_opal-pmix-package-rank.patch + '384ef9f1fa803b0d71dae2ec0748d0f20295992437532afedf21478bda164ff8', # OpenMPI-4.1.1_pmix3x-protection.patch ] builddependencies = [ diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch index 156d3d0a44b..dbb0965eb44 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_opal-pmix-package-rank.patch @@ -1,3 +1,5 @@ +see https://github.com/open-mpi/ompi/pull/9212 + From 8b07775d1002cc9be887c41768aea9ac896c5ecd Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 10 Aug 2021 08:38:15 -0700 diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch index f74907f563a..6dd3bfb4109 100644 --- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch +++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.1_pmix3x-protection.patch @@ -1,3 +1,5 @@ +see https://github.com/open-mpi/ompi/pull/9213 + From bd48a06e25c1058b7d3c3ba4414af388836c8219 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 10 Aug 2021 13:01:11 -0700