Skip to content

Commit 1811ead

Browse files
bosilcabosilca
committed
Merge branch 'master' into topic/dynamic_memcpy_chunks
2 parents 5e5efd0 + 53cd31e commit 1811ead

File tree

132 files changed

+8164
-3421
lines changed

Some content is hidden

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

132 files changed

+8164
-3421
lines changed

‎opal/include/opal/sys/atomic_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ static inline int
495495
opal_atomic_trylock(opal_atomic_lock_t *lock)
496496
{
497497
int32_t unlocked = OPAL_ATOMIC_LOCK_UNLOCKED;
498-
bool ret = opal_atomic_compare_exchange_strong_32 (&lock->u.lock, &unlocked, OPAL_ATOMIC_LOCK_LOCKED);
498+
bool ret = opal_atomic_compare_exchange_strong_acq_32 (&lock->u.lock, &unlocked, OPAL_ATOMIC_LOCK_LOCKED);
499499
return (ret == false) ? 1 : 0;
500500
}
501501

‎opal/mca/hwloc/base/hwloc_base_util.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved
1414
* Copyright (c) 2012-2017 Los Alamos National Security, LLC.
1515
* 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-2017 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19-
* Copyright (C) 2018 Mellanox Technologies, Ltd.
19+
* Copyright (C) 2018 Mellanox Technologies, Ltd.
2020
* All rights reserved.
2121
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
2222
* Copyright (c) 2019 IBM Corporation. All rights reserved.
@@ -1858,8 +1858,9 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
18581858
hwloc_obj_t root = NULL;
18591859
int depth;
18601860
unsigned i;
1861-
#endif
1861+
#else
18621862
unsigned distances_nr = 0;
1863+
#endif
18631864

18641865
for (device_obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_OS_DEVICE, 0); device_obj; device_obj = hwloc_get_next_osdev(topo, device_obj)) {
18651866
if (device_obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS
@@ -1890,7 +1891,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
18901891

18911892
/* find distance matrix for all numa nodes */
18921893
#if HWLOC_API_VERSION < 0x20000
1893-
distances = hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
1894+
distances = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
18941895
if (NULL == distances) {
18951896
/* we can try to find distances under group object. This info can be there. */
18961897
depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);

‎opal/mca/pmix/ext3x/ext3x_client.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Copyright (c) 2018 The University of Tennessee and The University
1212
* of Tennessee Research Foundation. All rights
1313
* reserved.
14+
* Copyright (c) 2019 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -102,11 +103,6 @@ int ext3x_client_init(opal_list_t *ilist)
102103
ninfo = 0;
103104
}
104105

105-
/* check for direct modex use-case */
106-
if (opal_pmix_base_async_modex && !opal_pmix_collect_all_data) {
107-
opal_setenv("PMIX_MCA_gds", "hash", true, &environ);
108-
}
109-
110106
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
111107
rc = PMIx_Init(&mca_pmix_ext3x_component.myproc, pinfo, ninfo);
112108
if (NULL != pinfo) {

‎opal/mca/pmix/ext3x/ext3x_server_south.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2018 The University of Tennessee and The University
1313
* of Tennessee Research Foundation. All rights
1414
* reserved.
15+
* Copyright (c) 2019 IBM Corporation. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -133,11 +134,6 @@ int ext3x_server_init(opal_pmix_server_module_t *module,
133134
}
134135
}
135136

136-
/* check for direct modex use-case */
137-
if (opal_pmix_base_async_modex && !opal_pmix_collect_all_data) {
138-
opal_setenv("PMIX_MCA_gds", "hash", true, &environ);
139-
}
140-
141137
/* insert ourselves into our list of jobids - it will be the
142138
* first, and so we'll check it first */
143139
job = OBJ_NEW(opal_ext3x_jobid_trkr_t);

‎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=gita1212af2
33+
repo_rev=git0c93c13f
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="Feb 04, 2019"
47+
date="Mar 19, 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/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
1+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
22
# Copyright (c) 2016 Research Organization for Information Science
33
# and Technology (RIST). All rights reserved.
44
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
@@ -42,7 +42,6 @@ EXTRA_DIST = \
4242
pmix.m4 \
4343
pmix_search_libs.m4 \
4444
pmix_setup_cc.m4 \
45-
pmix_setup_zlib.m4 \
4645
pmix_setup_libevent.m4 \
4746
pmix_mca_priority_sort.pl
4847

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ 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.
2020
dnl Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
21-
dnl Copyright (c) 2015-2017 Research Organization for Information Science
22-
dnl and Technology (RIST). All rights reserved.
21+
dnl Copyright (c) 2015-2019 Research Organization for Information Science
22+
dnl and Technology (RIST). All rights reserved.
2323
dnl Copyright (c) 2016 Mellanox Technologies, Inc.
2424
dnl All rights reserved.
2525
dnl
@@ -120,9 +120,11 @@ AC_DEFUN([PMIX_SETUP_CORE],[
120120
pmixmajor=${PMIX_MAJOR_VERSION}L
121121
pmixminor=${PMIX_MINOR_VERSION}L
122122
pmixrelease=${PMIX_RELEASE_VERSION}L
123+
pmixnumeric=$(printf 0x%4.4x%2.2x%2.2x $PMIX_MAJOR_VERSION $PMIX_MINOR_VERSION $PMIX_RELEASE_VERSION)
123124
AC_SUBST(pmixmajor)
124125
AC_SUBST(pmixminor)
125126
AC_SUBST(pmixrelease)
127+
AC_SUBST(pmixnumeric)
126128
AC_CONFIG_FILES(pmix_config_prefix[include/pmix_version.h])
127129

128130
PMIX_GREEK_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --greek`"
@@ -414,7 +416,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
414416
time.h unistd.h dirent.h \
415417
crt_externs.h signal.h \
416418
ioLib.h sockLib.h hostLib.h limits.h \
417-
sys/statfs.h sys/statvfs.h \
419+
sys/fcntl.h sys/statfs.h sys/statvfs.h \
418420
netdb.h ucred.h zlib.h sys/auxv.h \
419421
sys/sysctl.h])
420422

@@ -752,10 +754,24 @@ AC_DEFUN([PMIX_SETUP_CORE],[
752754
##################################
753755
# Libevent
754756
##################################
755-
pmix_show_title "Libevent"
757+
pmix_show_title "Event libraries"
756758

759+
PMIX_LIBEV_CONFIG
757760
PMIX_LIBEVENT_CONFIG
758761

762+
AS_IF([test $pmix_libevent_support -eq 1 && test $pmix_libev_support -eq 1],
763+
[AC_MSG_WARN([Both libevent and libev support have been specified.])
764+
AC_MSG_WARN([Only one can be configured against at a time. Please])
765+
AC_MSG_WARN([remove one from the configure command line.])
766+
AC_MSG_ERROR([Cannot continue])])
767+
768+
AS_IF([test $pmix_libevent_support -eq 0 && test $pmix_libev_support -eq 0],
769+
[AC_MSG_WARN([Either libevent or libev support is required, but neither])
770+
AC_MSG_WARN([was found. Please use the configure options to point us])
771+
AC_MSG_WARN([to where we can find one or the other library])
772+
AC_MSG_ERROR([Cannot continue])])
773+
774+
759775
##################################
760776
# HWLOC
761777
##################################
@@ -764,13 +780,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
764780
PMIX_HWLOC_CONFIG
765781

766782

767-
##################################
768-
# ZLIB COMPRESSION
769-
##################################
770-
pmix_show_title "ZLIB"
771-
772-
PMIX_ZLIB_CONFIG
773-
774783
##################################
775784
# MCA
776785
##################################
@@ -874,6 +883,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
874883
pmix_config_prefix[src/tools/pmix_info/Makefile]
875884
pmix_config_prefix[src/tools/plookup/Makefile]
876885
pmix_config_prefix[src/tools/pps/Makefile]
886+
pmix_config_prefix[src/tools/pattrs/Makefile]
877887
)
878888

879889
# publish any embedded flags so external wrappers can use them

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

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
14-
dnl Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
14+
dnl Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1515
dnl $COPYRIGHT$
1616
dnl
1717
dnl Additional copyrights may follow
@@ -262,11 +262,6 @@ AC_DEFUN([PMIX_MCA],[
262262
[MCA_pmix_]mca_framework[_CONFIG](mca_framework),
263263
[MCA_CONFIGURE_FRAMEWORK(mca_framework, 1)])])])
264264

265-
# note that mca_wrapper_extra_* is a running list, and we take checkpoints at the end of our project
266-
pmix_mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags"
267-
pmix_mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags"
268-
pmix_mca_wrapper_extra_libs="$mca_wrapper_extra_libs"
269-
270265
AC_SUBST(MCA_pmix_FRAMEWORKS)
271266
AC_SUBST(MCA_pmix_FRAMEWORKS_SUBDIRS)
272267
AC_SUBST(MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
@@ -622,14 +617,6 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
622617
AC_MSG_WARN([MCA component configure script told me to abort])
623618
AC_MSG_ERROR([cannot continue])
624619
fi
625-
626-
m4_foreach(flags, [LDFLAGS, LIBS],
627-
[[line="`$GREP WRAPPER_EXTRA_]flags[= $infile | cut -d= -f2-`"]
628-
eval "line=$line"
629-
if test -n "$line"; then
630-
$2[_]$3[_WRAPPER_EXTRA_]flags[="$line"]
631-
fi
632-
])dnl
633620
fi
634621

635622
MCA_PROCESS_COMPONENT($1, $component, $2, $3, $4, $5, $compile_mode)
@@ -754,38 +741,6 @@ AC_MSG_ERROR([*** $1 component $2 was supposed to be direct-called, but
754741
*** Aborting])
755742
fi
756743
fi
757-
758-
# if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
759-
# WRAPPER_EXTRA_LIBS. If the component doesn't specify it's
760-
# WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
761-
# component didn't have it's own configure script (in which case,
762-
# we know it didn't set LDFLAGS and LIBS because it can't) Don't
763-
# have to do this if the component is building dynamically,
764-
# because it will link against these (without a dependency from
765-
# libmpi.so to these flags)
766-
if test "$7" = "static"; then
767-
AS_LITERAL_IF([$2],
768-
[m4_foreach(flags, [LDFLAGS, LIBS],
769-
[AS_IF([test "$$1_$2_WRAPPER_EXTRA_]flags[" = ""],
770-
[PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_]flags)],
771-
[PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_WRAPPER_EXTRA_]flags)])
772-
])],
773-
[m4_foreach(flags, [LDFLAGS, LIBS],
774-
[[str="line=\$$1_$2_WRAPPER_EXTRA_]flags["]
775-
eval "$str"
776-
PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$line])])])
777-
fi
778-
779-
# if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script
780-
# component can never be used in a STOP_AT_FIRST framework, we
781-
# don't have to implement the else clause in the literal check...
782-
AS_LITERAL_IF([$2],
783-
[AS_IF([test "$$1_$2_WRAPPER_EXTRA_CPPFLAGS" != ""],
784-
[m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
785-
AS_IF([test "$7" = "static" && test "$stop_at_first" = "1"],
786-
[AS_IF([test "$with_devel_headers" = "yes"],
787-
[PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$1_$2_WRAPPER_EXTRA_CPPFLAGS])])],
788-
[AC_MSG_WARN([ignoring $1_$2_WRAPPER_EXTRA_CPPFLAGS ($$1_$2_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])])
789744
])
790745

791746

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
1616
dnl reserved.
1717
dnl Copyright (c) 2015-2019 Research Organization for Information Science
1818
dnl and Technology (RIST). All rights reserved.
19-
dnl Copyright (c) 2018-2019 Intel, Inc. All rights reserved.
19+
dnl Copyright (c) 2018 Intel, Inc. All rights reserved.
2020
dnl $COPYRIGHT$
2121
dnl
2222
dnl Additional copyrights may follow

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
4+
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
5+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
6+
# Copyright (c) 2017-2019 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
8+
# $COPYRIGHT$
9+
#
10+
# Additional copyrights may follow
11+
#
12+
# $HEADER$
13+
#
14+
15+
# MCA_libev_CONFIG([action-if-found], [action-if-not-found])
16+
# --------------------------------------------------------------------
17+
AC_DEFUN([PMIX_LIBEV_CONFIG],[
18+
PMIX_VAR_SCOPE_PUSH([pmix_libev_dir pmix_libev_libdir pmix_libev_standard_header_location pmix_libev_standard_lib_location])
19+
20+
AC_ARG_WITH([libev],
21+
[AC_HELP_STRING([--with-libev=DIR],
22+
[Search for libev headers and libraries in DIR ])])
23+
PMIX_CHECK_WITHDIR([libev], [$with_libev], [include/event.h])
24+
25+
AC_ARG_WITH([libev-libdir],
26+
[AC_HELP_STRING([--with-libev-libdir=DIR],
27+
[Search for libev libraries in DIR ])])
28+
PMIX_CHECK_WITHDIR([libev-libdir], [$with_livev_libdir], [libev.*])
29+
30+
pmix_libev_support=0
31+
32+
AS_IF([test -n "$with_libev" && test "$with_libev" != "no"],
33+
[AC_MSG_CHECKING([for libev in])
34+
pmix_check_libev_save_CPPFLAGS="$CPPFLAGS"
35+
pmix_check_libeve_save_LDFLAGS="$LDFLAGS"
36+
pmix_check_libev_save_LIBS="$LIBS"
37+
if test "$with_libev" != "yes"; then
38+
pmix_libev_dir=$with_libev/include
39+
pmix_libev_standard_header_location=no
40+
pmix_libev_standard_lib_location=no
41+
AS_IF([test -z "$with_libev_libdir" || test "$with_libev_libdir" = "yes"],
42+
[if test -d $with_libev/lib; then
43+
pmix_libev_libdir=$with_libev/lib
44+
elif test -d $with_libev/lib64; then
45+
pmix_libev_libdir=$with_libev/lib64
46+
else
47+
AC_MSG_RESULT([Could not find $with_libev/lib or $with_libev/lib64])
48+
AC_MSG_ERROR([Can not continue])
49+
fi
50+
AC_MSG_RESULT([$pmix_libev_dir and $pmix_libev_libdir])],
51+
[AC_MSG_RESULT([$with_libev_libdir])])
52+
else
53+
AC_MSG_RESULT([(default search paths)])
54+
pmix_libev_standard_header_location=yes
55+
pmix_libev_standard_lib_location=yes
56+
fi
57+
AS_IF([test ! -z "$with_libev_libdir" && test "$with_libev_libdir" != "yes"],
58+
[pmix_libev_libdir="$with_libev_libdir"
59+
pmix_libev_standard_lib_location=no])
60+
61+
PMIX_CHECK_PACKAGE([pmix_libev],
62+
[event.h],
63+
[ev],
64+
[event_base_new],
65+
[],
66+
[$pmix_libev_dir],
67+
[$pmix_libev_libdir],
68+
[pmix_libev_support=1],
69+
[pmix_libev_support=0])
70+
CPPFLAGS="$pmix_check_libev_save_CPPFLAGS"
71+
LDFLAGS="$pmix_check_libev_save_LDFLAGS"
72+
LIBS="$pmix_check_libev_save_LIBS"])
73+
74+
AS_IF([test $pmix_libev_support -eq 1],
75+
[LIBS="$LIBS $pmix_libev_LIBS"
76+
77+
AS_IF([test "$pmix_libev_standard_header_location" != "yes"],
78+
[CPPFLAGS="$CPPFLAGS $pmix_libev_CPPFLAGS"])
79+
AS_IF([test "$pmix_libev_standard_lib_location" != "yes"],
80+
[LDFLAGS="$LDFLAGS $pmix_libev_LDFLAGS"])])
81+
82+
AC_MSG_CHECKING([will libev support be built])
83+
if test $pmix_libev_support -eq 1; then
84+
AC_MSG_RESULT([yes])
85+
PMIX_EVENT_HEADER="<event.h>"
86+
AC_DEFINE_UNQUOTED([PMIX_EVENT_HEADER], [$PMIX_EVENT_HEADER],
87+
[Location of event.h])
88+
PMIX_SUMMARY_ADD([[External Packages]],[[libev]],[libev],[$pmix_libev_dir])
89+
else
90+
AC_MSG_RESULT([no])
91+
fi
92+
93+
AC_DEFINE_UNQUOTED([PMIX_HAVE_LIBEV], [$pmix_libev_support], [Whether we are building against libev])
94+
95+
PMIX_VAR_SCOPE_POP
96+
])dnl

0 commit comments

Comments
 (0)