cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update for openmpi to 4.0.3.

Browse Source 
Changelog available at:
https://raw.githubusercontent.com/open-mpi/ompi/v4.0.x/NEWS

GDS patches have been merged upstream to the embedded PMIx component and the
config logic was subsequently fixed (hash remains the only working GDS).

Bump SHARED_LIBS where necessary.
This commit is contained in:
martin 2020-03-06 06:59:33 +00:00
parent a10c15cd3c
commit a9dbb77f7c
5 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/openmpi/Makefile
View File

@ -1,22 +1,21 @@
# $OpenBSD: Makefile,v 1.30 2020/01/28 13:50:08 martin Exp $
# $OpenBSD: Makefile,v 1.31 2020/03/06 06:59:33 martin Exp $
COMMENT = open source MPI-3.1 implementation
V = 4.0.2
V = 4.0.3
DISTNAME = openmpi-$V
REVISION = 0
SHARED_LIBS += mca_common_dstore 0.0 # 1.1
SHARED_LIBS += mca_common_dstore 1.0 # 1.2
SHARED_LIBS += mca_common_monitoring 0.0 # 60.0
SHARED_LIBS += mca_common_ompio 0.0 # 60.2
SHARED_LIBS += mca_common_ompio 1.0 # 60.3
SHARED_LIBS += mca_common_sm 2.0 # 60.0
SHARED_LIBS += mpi 2.0 # 60.2
SHARED_LIBS += mpi 3.0 # 60.3
SHARED_LIBS += mpi_mpifh 0.0 # 60.2
SHARED_LIBS += mpi_usempi_ignore_tkr 0.0 # 60.0
SHARED_LIBS += mpi_usempif08 0.0 # 60.1
SHARED_LIBS += mpi_usempif08 1.0 # 61.0
SHARED_LIBS += ompitrace 0.0 # 60.0
SHARED_LIBS += open-pal 2.0 # 60.2
SHARED_LIBS += open-rte 2.0 # 60.2
SHARED_LIBS += open-pal 3.0 # 60.3
SHARED_LIBS += open-rte 3.0 # 60.3
CATEGORIES = devel

4
devel/openmpi/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openmpi-4.0.2.tar.gz) = ZigFhw6GoUceWXObDDTG+QBODHoi2waFYtU4jsRCGQQ=
SIZE (openmpi-4.0.2.tar.gz) = 17373487
SHA256 (openmpi-4.0.3.tar.gz) = Y0a/l2ABrSdMfgGNbMNckru5Qm2Pd1T6wAoX6lrI7rw=
SIZE (openmpi-4.0.3.tar.gz) = 17418534

20
devel/openmpi/patches/patch-opal_mca_pmix_pmix3x_pmix_src_mca_gds_ds12_gds_ds12_lock_pthread_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-opal_mca_pmix_pmix3x_pmix_src_mca_gds_ds12_gds_ds12_lock_pthread_c,v 1.1 2019/12/22 15:47:36 martin Exp $
Index: opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds12/gds_ds12_lock_pthread.c
--- opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds12/gds_ds12_lock_pthread.c.orig
+++ opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds12/gds_ds12_lock_pthread.c
@@ -132,12 +132,14 @@ pmix_status_t pmix_gds_ds12_lock_init(pmix_common_dsto
PMIX_ERROR_LOG(rc);
goto error;
}
+#ifdef HAVE_PTHREAD_SHARED
if (0 != pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
pthread_rwlockattr_destroy(&attr);
rc = PMIX_ERR_INIT;
PMIX_ERROR_LOG(rc);
goto error;
}
+#endif
#ifdef HAVE_PTHREAD_SETKIND
if (0 != pthread_rwlockattr_setkind_np(&attr,
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)) {

21
devel/openmpi/patches/patch-opal_mca_pmix_pmix3x_pmix_src_mca_gds_ds21_gds_ds21_lock_pthread_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-opal_mca_pmix_pmix3x_pmix_src_mca_gds_ds21_gds_ds21_lock_pthread_c,v 1.1 2019/12/22 15:47:36 martin Exp $
Index: opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds21/gds_ds21_lock_pthread.c
--- opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds21/gds_ds21_lock_pthread.c.orig
+++ opal/mca/pmix/pmix3x/pmix/src/mca/gds/ds21/gds_ds21_lock_pthread.c
@@ -182,12 +182,15 @@ pmix_status_t pmix_gds_ds21_lock_init(pmix_common_dsto
PMIX_ERROR_LOG(rc);
goto error;
}
+
+#ifdef HAVE_PTHREAD_MUTEXATTR_SETPSHARED
if (0 != pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
pthread_mutexattr_destroy(&attr);
rc = PMIX_ERR_INIT;
PMIX_ERROR_LOG(rc);
goto error;
}
+#endif
segment_hdr_t *seg_hdr = (segment_hdr_t*)lock_item->seg_desc->seg_info.seg_base_addr;
seg_hdr->num_locks = local_size;

5
devel/openmpi/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2020/01/28 13:50:08 martin Exp $
@comment $OpenBSD: PLIST,v 1.8 2020/03/06 06:59:33 martin Exp $
bin/aggregate_profile.pl
bin/mpiCC
bin/mpic++
@ -389,9 +389,6 @@ lib/pmix/mca_bfrops_v3.la
lib/pmix/mca_gds_ds12.a
lib/pmix/mca_gds_ds12.la
@so lib/pmix/mca_gds_ds12.so
lib/pmix/mca_gds_ds21.a
lib/pmix/mca_gds_ds21.la
@so lib/pmix/mca_gds_ds21.so
lib/pmix/mca_gds_hash.a
lib/pmix/mca_gds_hash.la
@so lib/pmix/mca_gds_hash.so