Skip to content

Commit f1681ac

Browse files
ggouaillardetggouaillardet
authored
Merge pull request #6608 from ggouaillardet/topic/pmix_refresh
PMIx refresh
2 parents 9a9d106 + 562809f commit f1681ac

Some content is hidden

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

61 files changed

+1822
-389
lines changed

‎.gitignore

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,8 @@ opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
382382
opal/mca/pmix/pmix*/pmix/src/include/frameworks.h
383383
opal/mca/pmix/pmix*/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
384384
opal/mca/pmix/pmix*/pmix/config/autogen_found_items.m4
385+
opal/mca/pmix/pmix*/pmix/config/mca_library_paths.txt
386+
opal/mca/pmix/pmix*/pmix/config/test-driver
385387
opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h
386388
opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h.in
387389
opal/mca/pmix/pmix*/pmix/include/pmix_common.h
@@ -400,6 +402,23 @@ opal/mca/pmix/pmix*/pmix/examples/jctrl
400402
opal/mca/pmix/pmix*/pmix/examples/pub
401403
opal/mca/pmix/pmix*/pmix/examples/server
402404
opal/mca/pmix/pmix*/pmix/examples/tool
405+
opal/mca/pmix/pmix*/pmix/test/run_tests00.pl
406+
opal/mca/pmix/pmix*/pmix/test/run_tests01.pl
407+
opal/mca/pmix/pmix*/pmix/test/run_tests02.pl
408+
opal/mca/pmix/pmix*/pmix/test/run_tests03.pl
409+
opal/mca/pmix/pmix*/pmix/test/run_tests04.pl
410+
opal/mca/pmix/pmix*/pmix/test/run_tests05.pl
411+
opal/mca/pmix/pmix*/pmix/test/run_tests06.pl
412+
opal/mca/pmix/pmix*/pmix/test/run_tests07.pl
413+
opal/mca/pmix/pmix*/pmix/test/run_tests08.pl
414+
opal/mca/pmix/pmix*/pmix/test/run_tests09.pl
415+
opal/mca/pmix/pmix*/pmix/test/run_tests10.pl
416+
opal/mca/pmix/pmix*/pmix/test/run_tests11.pl
417+
opal/mca/pmix/pmix*/pmix/test/run_tests12.pl
418+
opal/mca/pmix/pmix*/pmix/test/run_tests13.pl
419+
opal/mca/pmix/pmix*/pmix/test/run_tests14.pl
420+
opal/mca/pmix/pmix*/pmix/test/run_tests15.pl
421+
403422

404423
opal/mca/pmix/ext4x/ext4x.c
405424
opal/mca/pmix/ext4x/ext4x.h

‎opal/mca/pmix/pmix4x/pmix/LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights
4747
reserved.
4848
Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
4949
Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
50+
Copyright (c) 2019 Amazon.com, Inc. or its affiliates. All Rights
51+
reserved.
5052

5153
$COPYRIGHT$
5254

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
1414
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2019 Amazon.com, Inc. or its affiliates. All Rights
16+
# reserved.
1517
# $COPYRIGHT$
1618
#
1719
# Additional copyrights may follow
@@ -25,6 +27,7 @@ ACLOCAL_AMFLAGS = -I ./config
2527

2628
SUBDIRS = config contrib include src etc bindings
2729

30+
AM_DISTCHECK_CONFIGURE_FLAGS = --disable-dlopen
2831

2932
headers =
3033
sources =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ greek=a1
3030
# command, or with the date (if "git describe" fails) in the form of
3131
# "date<date>".
3232

33-
repo_rev=git2531c0c3
33+
repo_rev=gitbde4a8a5
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="Apr 09, 2019"
47+
date="Apr 23, 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/autogen.pl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
55
# Copyright (c) 2013 Mellanox Technologies, Inc.
66
# All rights reserved.
7-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
7+
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
88
# Copyright (c) 2015 Research Organization for Information Science
99
# and Technology (RIST). All rights reserved.
1010
# Copyright (c) 2015 IBM Corporation. All rights reserved.
@@ -37,6 +37,9 @@
3737
# Sanity check file
3838
my $topdir_file = "include/pmix.h";
3939
my $dnl_line = "dnl ---------------------------------------------------------------------------";
40+
# The text file we'll write at the end that will contain
41+
# all the mca component directory paths
42+
my $mca_library_paths_file = "config/mca_library_paths.txt";
4043

4144
# Data structures to fill up with all the stuff we find
4245
my $mca_found;
@@ -137,6 +140,9 @@ sub mca_process_component {
137140
push(@{$mca_found->{$framework}->{"components"}},
138141
$found_component);
139142

143+
# save the directory for later to create the paths
144+
# to all the component libraries
145+
push(@subdirs, $cdir);
140146
}
141147

142148
##############################################################################
@@ -723,6 +729,15 @@ sub in_tarball {
723729
print M4 $m4;
724730
close(M4);
725731

732+
# Remove the old library path file and write the new one
733+
verbose "==> Writing txt file with all the mca component paths\n";
734+
unlink($mca_library_paths_file);
735+
open(M4, ">$mca_library_paths_file") ||
736+
my_die "Cannot open $mca_library_paths_file";
737+
my $paths = join(":", @subdirs);
738+
print M4 $paths;
739+
close(M4);
740+
726741
# Run autoreconf
727742
verbose "==> Running autoreconf\n";
728743
my $cmd = "autoreconf -ivf --warnings=all,no-obsolete,no-override -I config";

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ EXTRA_DIST = \
4343
pmix_search_libs.m4 \
4444
pmix_setup_cc.m4 \
4545
pmix_setup_libevent.m4 \
46-
pmix_mca_priority_sort.pl
46+
pmix_mca_priority_sort.pl \
47+
mca_library_paths.txt
4748

4849

4950
maintainer-clean-local:

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

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,32 @@ AC_DEFUN([PMIX_SETUP_CORE],[
859859
AC_SUBST(pmixlibdir)
860860
AC_SUBST(pmixincludedir)
861861

862+
############################################################################
863+
# setup "make check"
864+
############################################################################
865+
PMIX_BUILT_TEST_PREFIX=$PMIX_top_builddir
866+
AC_SUBST(PMIX_BUILT_TEST_PREFIX)
867+
# expose the mca component library paths in the build system
868+
pathfile=$PMIX_top_srcdir/config/mca_library_paths.txt
869+
PMIX_COMPONENT_LIBRARY_PATHS=`cat $pathfile`
870+
AC_SUBST(PMIX_COMPONENT_LIBRARY_PATHS)
871+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests00.pl], [chmod +x test/run_tests00.pl])
872+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests01.pl], [chmod +x test/run_tests01.pl])
873+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests02.pl], [chmod +x test/run_tests02.pl])
874+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests03.pl], [chmod +x test/run_tests03.pl])
875+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests04.pl], [chmod +x test/run_tests04.pl])
876+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests05.pl], [chmod +x test/run_tests05.pl])
877+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests06.pl], [chmod +x test/run_tests06.pl])
878+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests07.pl], [chmod +x test/run_tests07.pl])
879+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests08.pl], [chmod +x test/run_tests08.pl])
880+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests09.pl], [chmod +x test/run_tests09.pl])
881+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests10.pl], [chmod +x test/run_tests10.pl])
882+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests11.pl], [chmod +x test/run_tests11.pl])
883+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests12.pl], [chmod +x test/run_tests12.pl])
884+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests13.pl], [chmod +x test/run_tests13.pl])
885+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests14.pl], [chmod +x test/run_tests14.pl])
886+
AC_CONFIG_FILES(pmix_config_prefix[test/run_tests15.pl], [chmod +x test/run_tests15.pl])
887+
862888
############################################################################
863889
# final output
864890
############################################################################
@@ -920,7 +946,7 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
920946
AC_ARG_ENABLE([embedded-mode],
921947
[AC_HELP_STRING([--enable-embedded-mode],
922948
[Using --enable-embedded-mode causes PMIx to skip a few configure checks and install nothing. It should only be used when building PMIx within the scope of a larger package.])])
923-
AS_IF([test ! -z "$enable_embedded_mode" && test "$enable_embedded_mode" = "yes"],
949+
AS_IF([test "$enable_embedded_mode" = "yes"],
924950
[pmix_mode=embedded
925951
pmix_install_primary_headers=no
926952
AC_MSG_RESULT([yes])],
@@ -1207,6 +1233,24 @@ if test "$WANT_PYTHON_BINDINGS" = "1"; then
12071233
fi
12081234
fi
12091235

1236+
# see if they want to disable non-RTLD_GLOBAL dlopen
1237+
AC_MSG_CHECKING([if want to support dlopen of non-global namespaces])
1238+
AC_ARG_ENABLE([nonglobal-dlopen],
1239+
AC_HELP_STRING([--enable-nonglobal-dlopen],
1240+
[enable non-global dlopen (default: enabled)]))
1241+
if test "$enable_nonglobal_dlopen" == "no"; then
1242+
AC_MSG_RESULT([no])
1243+
pmix_need_libpmix=0
1244+
else
1245+
AC_MSG_RESULT([yes])
1246+
pmix_need_libpmix=1
1247+
fi
1248+
1249+
# if someone enables embedded mode but doesn't want to install the
1250+
# devel headers, then default nonglobal-dlopen to false
1251+
AS_IF([test -z "$enable_nonglobal_dlopen" && test "x$pmix_mode" = "xembedded" && test $WANT_INSTALL_HEADERS -eq 0 && test $pmix_need_libpmix -eq 1],
1252+
[pmix_need_libpmix=0])
1253+
12101254
])dnl
12111255

12121256
# This must be a standalone routine so that it can be called both by
@@ -1222,6 +1266,7 @@ AC_DEFUN([PMIX_DO_AM_CONDITIONALS],[
12221266
AM_CONDITIONAL([WANT_PRIMARY_HEADERS], [test "x$pmix_install_primary_headers" = "xyes"])
12231267
AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
12241268
AM_CONDITIONAL(WANT_PMI_BACKWARD, test "$WANT_PMI_BACKWARD" = 1)
1269+
AM_CONDITIONAL(NEED_LIBPMIX, [test "$pmix_need_libpmix" = "1"])
12251270
])
12261271
pmix_did_am_conditionals=yes
12271272
])dnl

‎opal/mca/pmix/pmix4x/pmix/contrib/make_dist_tarball

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2008-2018 Cisco Systems, Inc. All rights reserved
14-
# Copyright (c) 2015 Intel, Inc. All rights reserved.
14+
# Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2019 Amazon.com, Inc. or its affiliates. All Rights
16+
# reserved.
1517
# $COPYRIGHT$
1618
#
1719
# Additional copyrights may follow
@@ -108,14 +110,6 @@ if test "$LIBEVENT" != ""; then
108110
config_args="--with-libevent=$LIBEVENT $config_args"
109111
fi
110112

111-
# if config_args isn't empty, then add that to the distcheck_flags
112-
# (because we'll assumedly need those to run configure under "make
113-
# distcheck").
114-
if test "$config_args" != ""; then
115-
echo "*** Adding to distcheck_flags: $config_args"
116-
distcheck_flags="$distcheck_flags AM_DISTCHECK_CONFIGURE_FLAGS=\"$config_args\""
117-
fi
118-
119113
export DISTCHECK_CONFIGURE_FLAGS=$config_args
120114

121115
#

‎opal/mca/pmix/pmix4x/pmix/src/include/pmix_globals.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ typedef uint8_t pmix_cmd_t;
121121
/* provide a "pretty-print" function for cmds */
122122
const char* pmix_command_string(pmix_cmd_t cmd);
123123

124+
/* provide a hook to init tool data */
125+
PMIX_EXPORT extern pmix_status_t pmix_tool_init_info(void);
126+
124127
/* define a set of flags to direct collection
125128
* of data during operations */
126129
typedef enum {

‎opal/mca/pmix/pmix4x/pmix/src/mca/base/help-pmix-mca-base.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2008-2019 Cisco Systems, Inc. All rights reserved
1414
# Copyright (c) 2018 Intel, Inc. All rights reserved.
1515
# $COPYRIGHT$
1616
#
@@ -60,3 +60,12 @@ all components *except* a and b", while "c,d" specifies the inclusive
6060
behavior and means "use *only* components c and d."
6161

6262
You cannot mix inclusive and exclusive behavior.
63+
#
64+
[failed to add component dir]
65+
The pmix_mca_base_component_path MCA variable was used to add paths to
66+
search for PMIX components. At least one directory failed to add
67+
properly:
68+
69+
%s
70+
71+
Check to make sure that this directory exists, is readable, etc.

‎opal/mca/pmix/pmix4x/pmix/src/mca/base/pmix_mca_base_component_repository.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2008-2019 Cisco Systems, Inc. All rights reserved
1414
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
18-
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
18+
* Copyright (c) 2016-2019 Intel, Inc. All rights reserved.
1919
* $COPYRIGHT$
2020
*
2121
* Additional copyrights may follow
@@ -43,6 +43,7 @@
4343
#include "pmix_common.h"
4444
#include "src/class/pmix_hash_table.h"
4545
#include "src/util/basename.h"
46+
#include "src/util/show_help.h"
4647

4748
#if PMIX_HAVE_PDL_SUPPORT
4849

@@ -220,8 +221,13 @@ int pmix_mca_base_component_repository_add (const char *path)
220221
dir = pmix_mca_base_system_default_path;
221222
}
222223

223-
if (0 != pmix_pdl_foreachfile(dir, process_repository_item, NULL)) {
224-
break;
224+
if (0 != pmix_pdl_foreachfile(dir, process_repository_item, NULL) &&
225+
!(0 == strcmp(dir, pmix_mca_base_system_default_path) || 0 == strcmp(dir, pmix_mca_base_user_default_path))) {
226+
// It is not an error if a directory fails to add (e.g.,
227+
// if it doesn't exist). But we should warn about it as
228+
// it is something related to "show_load_errors"
229+
pmix_show_help("help-pmix-mca-base.txt",
230+
"failed to add component dir", true, dir);
225231
}
226232
} while (NULL != (dir = strtok_r (NULL, sep, &ctx)));
227233

‎opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v12/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ mcacomponentdir = $(pmixlibdir)
5151
mcacomponent_LTLIBRARIES = $(component)
5252
mca_bfrops_v12_la_SOURCES = $(component_sources)
5353
mca_bfrops_v12_la_LDFLAGS = -module -avoid-version
54+
if NEED_LIBPMIX
55+
mca_bfrops_v12_la_LIBADD = $(top_builddir)/src/libpmix.la
56+
endif
5457

5558
noinst_LTLIBRARIES = $(lib)
5659
libmca_bfrops_v12_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v20/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ mcacomponentdir = $(pmixlibdir)
5151
mcacomponent_LTLIBRARIES = $(component)
5252
mca_bfrops_v20_la_SOURCES = $(component_sources)
5353
mca_bfrops_v20_la_LDFLAGS = -module -avoid-version
54+
if NEED_LIBPMIX
55+
mca_bfrops_v20_la_LIBADD = $(top_builddir)/src/libpmix.la
56+
endif
5457

5558
noinst_LTLIBRARIES = $(lib)
5659
libmca_bfrops_v20_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v21/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ mcacomponentdir = $(pmixlibdir)
4444
mcacomponent_LTLIBRARIES = $(component)
4545
mca_bfrops_v21_la_SOURCES = $(component_sources)
4646
mca_bfrops_v21_la_LDFLAGS = -module -avoid-version
47+
if NEED_LIBPMIX
48+
mca_bfrops_v21_la_LIBADD = $(top_builddir)/src/libpmix.la
49+
endif
4750

4851
noinst_LTLIBRARIES = $(lib)
4952
libmca_bfrops_v21_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v3/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ mcacomponentdir = $(pmixlibdir)
4444
mcacomponent_LTLIBRARIES = $(component)
4545
mca_bfrops_v3_la_SOURCES = $(component_sources)
4646
mca_bfrops_v3_la_LDFLAGS = -module -avoid-version
47+
if NEED_LIBPMIX
48+
mca_bfrops_v3_la_LIBADD = $(top_builddir)/src/libpmix.la
49+
endif
4750

4851
noinst_LTLIBRARIES = $(lib)
4952
libmca_bfrops_v3_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v4/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ mcacomponentdir = $(pmixlibdir)
4444
mcacomponent_LTLIBRARIES = $(component)
4545
mca_bfrops_v4_la_SOURCES = $(component_sources)
4646
mca_bfrops_v4_la_LDFLAGS = -module -avoid-version
47+
if NEED_LIBPMIX
48+
mca_bfrops_v4_la_LIBADD = $(top_builddir)/src/libpmix.la
49+
endif
4750

4851
noinst_LTLIBRARIES = $(lib)
4952
libmca_bfrops_v4_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/gds/ds12/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ mcacomponent_LTLIBRARIES = $(component)
6464
mca_gds_ds12_la_SOURCES = $(component_sources)
6565
mca_gds_ds12_la_LDFLAGS = -module -avoid-version \
6666
$(PMIX_TOP_BUILDDIR)/src/mca/common/dstore/libmca_common_dstore.la
67+
if NEED_LIBPMIX
68+
mca_gds_ds12_la_LIBADD = $(top_builddir)/src/libpmix.la
69+
endif
6770

6871
noinst_LTLIBRARIES = $(lib)
6972
libmca_gds_ds12_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/gds/ds21/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ mcacomponent_LTLIBRARIES = $(component)
5656
mca_gds_ds21_la_SOURCES = $(component_sources)
5757
mca_gds_ds21_la_LDFLAGS = -module -avoid-version \
5858
$(PMIX_TOP_BUILDDIR)/src/mca/common/dstore/libmca_common_dstore.la
59+
if NEED_LIBPMIX
60+
mca_gds_ds21_la_LIBADD = $(top_builddir)/src/libpmix.la
61+
endif
5962

6063
noinst_LTLIBRARIES = $(lib)
6164
libmca_gds_ds21_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/gds/hash/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ mcacomponent_LTLIBRARIES = $(component)
4949
mca_gds_hash_la_SOURCES = $(component_sources)
5050
mca_gds_hash_la_LIBADD = $(gds_hash_LIBS)
5151
mca_gds_hash_la_LDFLAGS = -module -avoid-version $(gds_hash_LDFLAGS)
52+
if NEED_LIBPMIX
53+
mca_gds_hash_la_LIBADD += $(top_builddir)/src/libpmix.la
54+
endif
5255

5356
noinst_LTLIBRARIES = $(lib)
5457
libmca_gds_hash_la_SOURCES = $(lib_sources)

‎opal/mca/pmix/pmix4x/pmix/src/mca/gds/hash/gds_hash.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,6 @@ static pmix_status_t hash_fetch(const pmix_proc_t *proc,
13011301
val = NULL;
13021302
rc = pmix_hash_fetch(ht, PMIX_RANK_WILDCARD, NULL, &val);
13031303
if (PMIX_SUCCESS != rc) {
1304-
PMIX_ERROR_LOG(rc);
13051304
if (NULL != val) {
13061305
PMIX_VALUE_RELEASE(val);
13071306
}
@@ -1315,7 +1314,6 @@ static pmix_status_t hash_fetch(const pmix_proc_t *proc,
13151314
if (PMIX_DATA_ARRAY != val->type ||
13161315
NULL == val->data.darray ||
13171316
PMIX_INFO != val->data.darray->type) {
1318-
PMIX_ERROR_LOG(PMIX_ERR_INVALID_VAL);
13191317
PMIX_VALUE_RELEASE(val);
13201318
return PMIX_ERR_INVALID_VAL;
13211319
}

0 commit comments

Comments
 (0)