Skip to content

Commit 88b5ec3

Browse files
author
Ralph Castain
authored
Merge pull request #3664 from rhc54/topic/ext2
Get the pmix/ext2x component to work. Fix a minor problem in the libevent external component.
2 parents 1748440 + bd1793a commit 88b5ec3

File tree

10 files changed

+858
-615
lines changed

10 files changed

+858
-615
lines changed

‎opal/mca/event/external/event_external_component.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* reserved.
66
* Copyright (c) 2017 IBM Corporation. All rights reserved.
77
*
8+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
89
* $COPYRIGHT$
910
*
1011
* Additional copyrights may follow
@@ -86,7 +87,7 @@ static int event_external_register (void) {
8687
event_module_include = "poll";
8788
#endif
8889

89-
avail = opal_argv_join(all_available_eventops, ',');
90+
avail = opal_argv_join((char**)all_available_eventops, ',');
9091
asprintf( &help_msg,
9192
"Comma-delimited list of libevent subsystems "
9293
"to use (%s -- available on your platform)",

‎opal/mca/event/external/external.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
4-
* Copyright (c) 2015 Intel, Inc. All rights reserved.
4+
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
55
* Copyright (c) 2015-2017 Research Organization for Information Science
66
* and Technology (RIST). All rights reserved.
77
* Copyright (c) 2017 IBM Corporation. All rights reserved.
@@ -75,6 +75,8 @@ OPAL_DECLSPEC int opal_event_finalize(void);
7575

7676
#define opal_event_set(b, x, fd, fg, cb, arg) event_assign((x), (b), (fd), (fg), (event_callback_fn) (cb), (arg))
7777

78+
#define opal_event_assign(x, b, fd, fg, cb, arg) event_assign((x), (b), (fd), (fg), (event_callback_fn) (cb), (arg))
79+
7880
#define opal_event_add(ev, tv) event_add((ev), (tv))
7981

8082
#define opal_event_del(ev) event_del((ev))

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

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# All rights reserved.
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
15-
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
16+
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2016 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# $COPYRIGHT$
@@ -28,7 +28,59 @@
2828
AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
2929
AC_CONFIG_FILES([opal/mca/pmix/ext2x/Makefile])
3030

31-
# check to see
31+
OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_ext2x_save_CPPFLAGS opal_pmix_pmix2_save_CFLAGS opal_pmix_ext2x_save_LDFLAGS opal_pmix_ext2x_save_LIBS opal_pmix_ext2x_basedir opal_pmix_ext2x_args opal_pmix_ext2x_happy opal_pmix_ext2x_sm_flag pmix_ext2x_status_filename])
32+
33+
opal_pmix_ext2x_basedir=opal/mca/pmix/ext2x
34+
35+
opal_pmix_ext2x_save_CFLAGS=$CFLAGS
36+
opal_pmix_ext2x_save_CPPFLAGS=$CPPFLAGS
37+
opal_pmix_ext2x_save_LDFLAGS=$LDFLAGS
38+
opal_pmix_ext2x_save_LIBS=$LIBS
39+
40+
AC_ARG_ENABLE([pmix-dstore],
41+
[AC_HELP_STRING([--enable-pmix-dstore],
42+
[Enable PMIx shared memory data store (default: enabled)])])
43+
AC_MSG_CHECKING([if PMIx shared memory data store is enabled])
44+
if test "$enable_pmix_dstore" != "no"; then
45+
AC_MSG_RESULT([yes])
46+
opal_pmix_ext2x_sm_flag=--enable-dstore
47+
else
48+
AC_MSG_RESULT([no (disabled)])
49+
opal_pmix_ext2x_sm_flag=--disable-dstore
50+
fi
51+
52+
AC_ARG_ENABLE([pmix-timing],
53+
[AC_HELP_STRING([--enable-pmix-timing],
54+
[Enable PMIx timing measurements (default: disabled)])])
55+
AC_MSG_CHECKING([if PMIx timing is enabled])
56+
if test "$enable_pmix_timing" == "yes"; then
57+
AC_MSG_RESULT([yes])
58+
opal_pmix_ext2x_timing_flag=--enable-pmix-timing
59+
else
60+
AC_MSG_RESULT([no (disabled)])
61+
opal_pmix_ext2x_timing_flag=--disable-pmix-timing
62+
fi
63+
64+
opal_pmix_ext2x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX2X_ $opal_pmix_ext2x_sm_flag $opal_pmix_ext2x_timing_flag --without-tests-examples --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-mode"
65+
AS_IF([test "$enable_debug" = "yes"],
66+
[opal_pmix_ext2x_args="--enable-debug $opal_pmix_ext2x_args"
67+
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
68+
[opal_pmix_ext2x_args="--disable-debug $opal_pmix_ext2x_args"
69+
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
70+
AS_IF([test "$with_devel_headers" = "yes"],
71+
[opal_pmix_ext2x_args="--with-devel-headers $opal_pmix_ext2x_args"],
72+
[opal_pmix_ext2x_args=$opal_pmix_ext2x_args])
73+
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
74+
75+
OPAL_CONFIG_SUBDIR([$opal_pmix_ext2x_basedir/pmix],
76+
[$opal_pmix_ext2x_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
77+
[opal_pmix_ext2x_happy=1], [opal_pmix_ext2x_happy=0])
78+
79+
CFLAGS=$opal_pmix_ext2x_save_CFLAGS
80+
CPPFLAGS=$opal_pmix_ext2x_save_CPPFLAGS
81+
LDFLAGS=$opal_pmix_ext2x_save_LDFLAGS
82+
LIBS=$opal_pmix_ext2x_save_LIBS
83+
3284
# if we are linking to an external v2.x library. If not, then
3385
# do not use this component.
3486
AC_MSG_CHECKING([if external v2.x component is to be used])
@@ -45,16 +97,24 @@ AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
4597
pmix_ext2x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
4698
[AC_MSG_RESULT([no - disqualifying this component])
4799
opal_pmix_ext2x_happy=0])],
48-
[AC_MSG_RESULT([no - disqualifying this component])
49-
opal_pmix_ext2x_happy=0])
100+
[AC_MSG_RESULT([no])
101+
opal_pmix_ext2x_happy=0])
50102

51103
AC_SUBST([opal_pmix_ext2x_LIBS])
52104
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
53105
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
54106
AC_SUBST([opal_pmix_ext2x_DEPENDENCIES])
55107

108+
AC_MSG_CHECKING([PMIx extra wrapper CPPFLAGS])
109+
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_CPPFLAGS])
110+
AC_MSG_CHECKING([PMIx extra wrapper LDFLAGS])
111+
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LDFLAGS])
112+
AC_MSG_CHECKING([PMIx extra wrapper LIBS])
113+
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LIBS])
114+
56115
AS_IF([test $opal_pmix_ext2x_happy -eq 1],
57116
[$1],
58117
[$2])
59118

119+
OPAL_VAR_SCOPE_POP
60120
])dnl

0 commit comments

Comments
 (0)