Skip to content

Commit 2ce9680

Browse files
rhc54rhc54
authored
Merge pull request #6267 from rhc54/topic/pmix4
Update to latest PMIx master (v4.0)
2 parents 78e9d01 + 1e70ea7 commit 2ce9680

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1753
-767
lines changed

‎opal/mca/pmix/pmix4x/configure.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
16+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2016 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# $COPYRIGHT$
@@ -53,14 +53,14 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
5353
opal_pmix_pmix4x_timing_flag=--disable-pmix-timing
5454
fi
5555

56-
opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\""
56+
opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
5757
AS_IF([test "$enable_debug" = "yes"],
5858
[opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args"
5959
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
6060
[opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args"
6161
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
6262
AC_MSG_CHECKING([if want to install standalone libpmix])
63-
AS_IF([test "$enable_install_libpmix" == "yes"],
63+
AS_IF([test "$enable_install_libpmix" = "yes"],
6464
[AC_MSG_RESULT([yes])],
6565
[AC_MSG_RESULT([no])
6666
opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"])

‎opal/mca/pmix/pmix4x/pmix/VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ release=0
2323
# The only requirement is that it must be entirely printable ASCII
2424
# characters and have no white space.
2525

26-
greek=
26+
greek=a1
2727

2828
# If repo_rev is empty, then the repository version number will be
2929
# obtained during "make dist" via the "git describe --tags --always"
3030
# command, or with the date (if "git describe" fails) in the form of
3131
# "date<date>".
3232

33-
repo_rev=gitfae0ee7d
33+
repo_rev=gitb5863c9c
3434

3535
# If tarball_version is not empty, it is used as the version string in
3636
# the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
4444

4545
# The date when this release was created
4646

47-
date="Dec 28, 2018"
47+
date="Jan 10, 2019"
4848

4949
# The shared library version of each of PMIx's public libraries.
5050
# These versions are maintained in accordance with the "Library

‎opal/mca/pmix/pmix4x/pmix/config/pmix.m4‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
1717
dnl reserved.
1818
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
1919
dnl Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
20-
dnl Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
20+
dnl Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
2121
dnl Copyright (c) 2015-2017 Research Organization for Information Science
2222
dnl and Technology (RIST). All rights reserved.
2323
dnl Copyright (c) 2016 Mellanox Technologies, Inc.
@@ -415,7 +415,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
415415
crt_externs.h signal.h \
416416
ioLib.h sockLib.h hostLib.h limits.h \
417417
sys/statfs.h sys/statvfs.h \
418-
netdb.h ucred.h zlib.h sys/auxv.h])
418+
netdb.h ucred.h zlib.h sys/auxv.h \
419+
sys/sysctl.h])
419420

420421
AC_CHECK_HEADERS([sys/mount.h], [], [],
421422
[AC_INCLUDES_DEFAULT

‎opal/mca/pmix/pmix4x/pmix/config/pmix_check_os_flavors.m4‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dnl -*- shell-script -*-
22
dnl
33
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
4-
dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
4+
dnl Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
55
dnl Copyright (c) 2014 Research Organization for Information Science
66
dnl and Technology (RIST). All rights reserved.
77
dnl
@@ -57,6 +57,13 @@ AC_DEFUN([PMIX_CHECK_OS_FLAVORS],
5757
[$pmix_have_solaris],
5858
[Whether or not we have solaris])
5959

60+
AS_IF([test "$pmix_found_apple" = "yes"],
61+
[pmix_have_apple=1],
62+
[pmix_have_apple=0])
63+
AC_DEFINE_UNQUOTED([PMIX_HAVE_APPLE],
64+
[$pmix_have_apple],
65+
[Whether or not we have apple])
66+
6067
# check for sockaddr_in (a good sign we have TCP)
6168
AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
6269
AC_CHECK_TYPES([struct sockaddr_in],

‎opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4‎

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
5-
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
5+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
66
# $COPYRIGHT$
77
#
88
# Additional copyrights may follow
@@ -13,6 +13,43 @@
1313
# MCA_hwloc_CONFIG([action-if-found], [action-if-not-found])
1414
# --------------------------------------------------------------------
1515
AC_DEFUN([PMIX_HWLOC_CONFIG],[
16+
AC_ARG_WITH([hwloc-header],
17+
[AC_HELP_STRING([--with-hwloc-header=HEADER],
18+
[The value that should be included in C files to include hwloc.h])])
19+
20+
AC_ARG_ENABLE([embedded-hwloc],
21+
[AC_HELP_STRING([--enable-embedded-hwloc],
22+
[Enable use of locally embedded hwloc])])
23+
24+
AS_IF([test "$enable_embedded_hwloc" = "yes"],
25+
[_PMIX_HWLOC_EMBEDDED_MODE],
26+
[_PMIX_HWLOC_EXTERNAL])
27+
28+
AC_MSG_CHECKING([hwloc header])
29+
AC_DEFINE_UNQUOTED([PMIX_HWLOC_HEADER], [$PMIX_HWLOC_HEADER],
30+
[Location of hwloc.h])
31+
AC_MSG_RESULT([$PMIX_HWLOC_HEADER])
32+
33+
AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support],
34+
[Whether or not we have hwloc support])
35+
36+
PMIX_SUMMARY_ADD([[External Packages]],[[HWLOC]], [pmix_hwloc], [$pmix_hwloc_support_will_build ($pmix_hwloc_source)])
37+
])
38+
39+
AC_DEFUN([_PMIX_HWLOC_EMBEDDED_MODE],[
40+
AC_MSG_CHECKING([for hwloc])
41+
AC_MSG_RESULT([assumed available (embedded mode)])
42+
43+
AS_IF([test -z "$with_hwloc_header" || test "$with_hwloc_header" = "yes"],
44+
[PMIX_HWLOC_HEADER="<hwloc.h>"],
45+
[PMIX_HWLOC_HEADER="$with_hwloc_header"])
46+
47+
pmix_hwloc_support=1
48+
pmix_hwloc_source=embedded
49+
pmix_hwloc_support_will_build=yes
50+
])
51+
52+
AC_DEFUN([_PMIX_HWLOC_EXTERNAL],[
1653
PMIX_VAR_SCOPE_PUSH([pmix_hwloc_dir pmix_hwloc_libdir pmix_hwloc_standard_lib_location pmix_hwloc_standard_header_location])
1754

1855
AC_ARG_WITH([hwloc],
@@ -62,18 +99,13 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
6299
[$pmix_hwloc_libdir],
63100
[pmix_hwloc_support=1],
64101
[pmix_hwloc_support=0])
65-
if test $pmix_hwloc_support = "1"; then
66-
LIBS="$LIBS -lhwloc"
67-
PMIX_EMBEDDED_LIBS="$PMIX_EMBEDDED_LIBS -lhwloc"
68-
if test "$pmix_hwloc_standard_header_location" != "yes"; then
69-
PMIX_EMBEDDED_CPPFLAGS="$PMIX_EMBEDDED_CPPFLAGS $pmix_hwloc_CPPFLAGS"
70-
CPPFLAGS="$CPPFLAGS $pmix_hwloc_CPPFLAGS"
71-
fi
72-
if test "$pmix_hwloc_standard_lib_location" != "yes"; then
73-
PMIX_EMBEDDED_LDFLAGS="$PMIX_EMBEDDED_LDFLAGS $pmix_hwloc_LDFLAGS"
74-
LDFLAGS="$LDFLAGS $pmix_hwloc_LDFLAGS"
75-
fi
76-
fi
102+
103+
AS_IF([test "$pmix_hwloc_standard_header_location" != "yes"],
104+
[PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_hwloc_CPPFLAGS)])
105+
106+
AS_IF([test "$pmix_hwloc_standard_lib_location" != "yes"],
107+
[PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_hwloc_LIBS)
108+
PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_hwloc_LDFLAGS)])
77109
fi
78110

79111
if test ! -z "$with_hwloc" && test "$with_hwloc" != "no" && test "$pmix_hwloc_support" != "1"; then
@@ -98,11 +130,16 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
98130
AC_MSG_CHECKING([will hwloc support be built])
99131
if test "$pmix_hwloc_support" != "1"; then
100132
AC_MSG_RESULT([no])
133+
pmix_hwloc_source=none
134+
pmix_hwloc_support_will_build=no
101135
else
102136
AC_MSG_RESULT([yes])
137+
pmix_hwloc_source=$pmix_hwloc_dir
138+
pmix_hwloc_support_will_build=yes
103139
fi
104140

105-
AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support],
106-
[Whether or not we have hwloc support])
141+
# Set output variables
142+
PMIX_HWLOC_HEADER="<hwloc.h>"
143+
107144
PMIX_VAR_SCOPE_POP
108145
])dnl

‎opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
5-
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
5+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
66
# Copyright (c) 2017 Research Organization for Information Science
77
# and Technology (RIST). All rights reserved.
88
# $COPYRIGHT$
@@ -35,6 +35,8 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
3535
AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER],
3636
[Location of event2/thread.h])
3737
AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER])
38+
39+
PMIX_SUMMARY_ADD([[External Packages]],[[Libevent]], [pmix_libevent], [yes ($pmix_libevent_source)])
3840
])
3941

4042
AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
@@ -47,6 +49,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
4749
[PMIX_EVENT_HEADER="$with_libevent_header"
4850
PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
4951

52+
pmix_libevent_source=embedded
5053
])
5154

5255
AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
@@ -138,6 +141,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
138141
# Set output variables
139142
PMIX_EVENT_HEADER="<event.h>"
140143
PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
144+
pmix_libevent_source=$pmix_event_dir
141145

142146
PMIX_VAR_SCOPE_POP
143147
])dnl

‎opal/mca/pmix/pmix4x/pmix/contrib/pmix.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2013 Mellanox Technologies, Inc.
1414
# All rights reserved.
15-
# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
1616
# Copyright (c) 2015 Research Organization for Information Science
1717
# and Technology (RIST). All rights reserved.
1818
# $COPYRIGHT$
@@ -192,7 +192,7 @@
192192

193193
Summary: An extended/exascale implementation of PMI
194194
Name: %{?_name:%{_name}}%{!?_name:pmix}
195-
Version: 4.0.0
195+
Version: 4.0.0a1
196196
Release: 1%{?dist}
197197
License: BSD
198198
Group: Development/Libraries

‎opal/mca/pmix/pmix4x/pmix/examples/Makefile.am‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
# All rights reserved.
1212
# Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
14-
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
14+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1515
# $COPYRIGHT$
1616
#
1717
# Additional copyrights may follow
1818
#
1919
# $HEADER$
2020
#
21+
headers = examples.h
2122

2223
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
2324

@@ -28,64 +29,64 @@ if !WANT_HIDDEN
2829
noinst_PROGRAMS += server
2930
endif
3031

31-
client_SOURCES = client.c
32+
client_SOURCES = client.c examples.h
3233
client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
3334
client_LDADD = $(top_builddir)/src/libpmix.la
3435

35-
client2_SOURCES = client2.c
36+
client2_SOURCES = client2.c examples.h
3637
client2_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
3738
client2_LDADD = $(top_builddir)/src/libpmix.la
3839

39-
debugger_SOURCES = debugger.c
40+
debugger_SOURCES = debugger.c examples.h
4041
debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
4142
debugger_LDADD = $(top_builddir)/src/libpmix.la
4243

43-
debuggerd_SOURCES = debuggerd.c
44+
debuggerd_SOURCES = debuggerd.c examples.h
4445
debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
4546
debuggerd_LDADD = $(top_builddir)/src/libpmix.la
4647

47-
alloc_SOURCES = alloc.c
48+
alloc_SOURCES = alloc.c examples.h
4849
alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
4950
alloc_LDADD = $(top_builddir)/src/libpmix.la
5051

51-
jctrl_SOURCES = jctrl.c
52+
jctrl_SOURCES = jctrl.c examples.h
5253
jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
5354
jctrl_LDADD = $(top_builddir)/src/libpmix.la
5455

55-
dmodex_SOURCES = dmodex.c
56+
dmodex_SOURCES = dmodex.c examples.h
5657
dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
5758
dmodex_LDADD = $(top_builddir)/src/libpmix.la
5859

59-
dynamic_SOURCES = dynamic.c
60+
dynamic_SOURCES = dynamic.c examples.h
6061
dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
6162
dynamic_LDADD = $(top_builddir)/src/libpmix.la
6263

63-
fault_SOURCES = fault.c
64+
fault_SOURCES = fault.c examples.h
6465
fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
6566
fault_LDADD = $(top_builddir)/src/libpmix.la
6667

67-
pub_SOURCES = pub.c
68+
pub_SOURCES = pub.c examples.h
6869
pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
6970
pub_LDADD = $(top_builddir)/src/libpmix.la
7071

71-
pubi_SOURCES = pubi.c
72+
pubi_SOURCES = pubi.c examples.h
7273
pubi_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
7374
pubi_LDADD = $(top_builddir)/src/libpmix.la
7475

75-
tool_SOURCES = tool.c
76+
tool_SOURCES = tool.c examples.h
7677
tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
7778
tool_LDADD = $(top_builddir)/src/libpmix.la
7879

79-
group_SOURCES = group.c
80+
group_SOURCES = group.c examples.h
8081
group_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
8182
group_LDADD = $(top_builddir)/src/libpmix.la
8283

83-
asyncgroup_SOURCES = asyncgroup.c
84+
asyncgroup_SOURCES = asyncgroup.c examples.h
8485
asyncgroup_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
8586
asyncgroup_LDADD = $(top_builddir)/src/libpmix.la
8687

8788
if !WANT_HIDDEN
88-
server_SOURCES = server.c
89+
server_SOURCES = server.c examples.h
8990
server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
9091
server_LDADD = $(top_builddir)/src/libpmix.la
9192
endif

0 commit comments

Comments
 (0)