Skip to content

Commit cced4fd

Browse files
committed
Sync to PMIx v2.1.0rc2
Signed-off-by: Boris Karasev <[email protected]>
1 parent 9885c21 commit cced4fd

File tree

27 files changed

+603
-249
lines changed

27 files changed

+603
-249
lines changed

opal/mca/pmix/pmix2x/pmix/VERSION

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

33-
repo_rev=git1617e76
33+
repo_rev=git9212bbc
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="Oct 31, 2017"
47+
date="Jan 16, 2018"
4848

4949
# The shared library version of each of PMIx's public libraries.
5050
# These versions are maintained in accordance with the "Library
@@ -75,6 +75,6 @@ date="Oct 31, 2017"
7575
# Version numbers are described in the Libtool current:revision:age
7676
# format.
7777

78-
libpmix_so_version=3:3:1
78+
libpmix_so_version=3:10:1
7979
libpmi_so_version=1:0:0
8080
libpmi2_so_version=1:0:0

opal/mca/pmix/pmix2x/pmix/etc/pmix-mca-params.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
13-
# Copyright (c) 2017 Intel, Inc. All rights reserved.
13+
# Copyright (c) 2017-2018 Intel, Inc. All rights reserved.
1414
# $COPYRIGHT$
1515
#
1616
# Additional copyrights may follow
@@ -53,7 +53,7 @@
5353
# directory. For example:
5454

5555
# Change component loading path
56-
# component_path = /usr/local/lib/pmix:~/my_pmix_components
56+
# mca_base_component_path = /usr/local/lib/pmix:~/my_pmix_components
5757

5858
# See "pinfo --param all all --level 9" for a full listing of PMIx
5959
# MCA parameters available and their default values.

opal/mca/pmix/pmix2x/pmix/include/pmi.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,8 @@
4848
#ifndef PMI_H
4949
#define PMI_H
5050

51-
#ifdef PMIX_HAVE_VISIBILITY
52-
#define PMIX_EXPORT __attribute__((__visibility__("default")))
53-
#else
54-
#define PMIX_EXPORT
55-
#endif
51+
/* Structure and constant definitions */
52+
#include <pmix_common.h>
5653

5754
/* prototypes for the PMI interface in MPICH2 */
5855

opal/mca/pmix/pmix2x/pmix/include/pmi2.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
#ifndef PMI2_H_INCLUDED
88
#define PMI2_H_INCLUDED
99

10-
#ifdef PMIX_HAVE_VISIBILITY
11-
#define PMIX_EXPORT __attribute__((__visibility__("default")))
12-
#else
13-
#define PMIX_EXPORT
14-
#endif
10+
/* Structure and constant definitions */
11+
#include <pmix_common.h>
1512

1613
#define PMI2_MAX_KEYLEN 64
1714
#define PMI2_MAX_VALLEN 1024

opal/mca/pmix/pmix2x/pmix/src/Makefile.am

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ nodist_headers =
4343
EXTRA_DIST =
4444
dist_pmixdata_DATA =
4545

46+
# place to capture sources for backward compatibility libs
47+
pmi1_sources =
48+
pmi2_sources =
49+
4650
libpmix_la_LIBADD = \
4751
mca/base/libpmix_mca_base.la \
4852
$(MCA_pmix_FRAMEWORK_LIBS) \
@@ -73,10 +77,15 @@ libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
7377

7478
if WANT_PMI_BACKWARD
7579
lib_LTLIBRARIES += libpmi.la libpmi2.la
76-
libpmi_la_SOURCES = $(headers) $(sources)
80+
libpmi_la_SOURCES = $(headers) $(sources) $(pmi1_sources)
7781
libpmi_la_LDFLAGS = -version-info $(libpmi_so_version)
78-
libpmi2_la_SOURCES = $(headers) $(sources)
82+
libpmi_la_LIBADD = $(libpmix_la_LIBADD)
83+
libpmi_la_DEPENDENCIES = $(libpmi_la_LIBADD)
84+
85+
libpmi2_la_SOURCES = $(headers) $(sources) $(pmi2_sources)
7986
libpmi2_la_LDFLAGS = -version-info $(libpmi2_so_version)
87+
libpmi2_la_LIBADD = $(libpmix_la_LIBADD)
88+
libpmi2_la_DEPENDENCIES = $(libpmi2_la_LIBADD)
8089
endif
8190

8291
endif !PMIX_EMBEDDED_MODE

opal/mca/pmix/pmix2x/pmix/src/atomics/sys/powerpc/atomic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void pmix_atomic_rmb(void)
8484
static inline
8585
void pmix_atomic_wmb(void)
8686
{
87-
PMIXRMB();
87+
PMIXWMB();
8888
}
8989

9090
static inline
@@ -110,7 +110,7 @@ void pmix_atomic_isync(void)
110110
#pragma mc_func pmix_atomic_rmb { "7c2004ac" } /* lwsync */
111111
#pragma reg_killed_by pmix_atomic_rmb /* none */
112112

113-
#pragma mc_func pmix_atomic_wmb { "7c0006ac" } /* eieio */
113+
#pragma mc_func pmix_atomic_wmb { "7c2004ac" } /* lwsync */
114114
#pragma reg_killed_by pmix_atomic_wmb /* none */
115115

116116
#endif

opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ sources += \
2323
client/pmix_client_connect.c
2424

2525
if WANT_PMI_BACKWARD
26-
sources += \
27-
client/pmi1.c \
26+
pmi1_sources += \
27+
client/pmi1.c
28+
pmi2_sources += \
2829
client/pmi2.c
2930
endif

opal/mca/pmix/pmix2x/pmix/src/include/pmix_globals.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ static void pcon(pmix_peer_t *p)
124124
PMIX_CONSTRUCT(&p->send_queue, pmix_list_t);
125125
p->send_msg = NULL;
126126
p->recv_msg = NULL;
127+
p->commit_cnt = 0;
127128
}
128129
static void pdes(pmix_peer_t *p)
129130
{

opal/mca/pmix/pmix2x/pmix/src/include/pmix_globals.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ typedef struct pmix_peer_t {
177177
pmix_list_t send_queue; /**< list of messages to send */
178178
pmix_ptl_send_t *send_msg; /**< current send in progress */
179179
pmix_ptl_recv_t *recv_msg; /**< current recv in progress */
180+
int commit_cnt;
180181
} pmix_peer_t;
181182
PMIX_CLASS_DECLARATION(pmix_peer_t);
182183

opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var.h

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ typedef enum {
9595
PMIX_MCA_BASE_VAR_TYPE_MAX
9696
} pmix_mca_base_var_type_t;
9797

98-
extern const char *pmix_var_type_names[];
98+
PMIX_EXPORT extern const char *pmix_var_type_names[];
9999

100100
/**
101101
* Source of an MCA variable's value
@@ -298,7 +298,7 @@ BEGIN_C_DECLS
298298
/**
299299
* Object declarayion for pmix_mca_base_var_t
300300
*/
301-
PMIX_CLASS_DECLARATION(pmix_mca_base_var_t);
301+
PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_mca_base_var_t);
302302

303303
/**
304304
* Initialize the MCA variable system.
@@ -309,7 +309,7 @@ PMIX_CLASS_DECLARATION(pmix_mca_base_var_t);
309309
* invoked internally (by pmix_mca_base_open()) and is only documented
310310
* here for completeness.
311311
*/
312-
int pmix_mca_base_var_init(void);
312+
PMIX_EXPORT int pmix_mca_base_var_init(void);
313313

314314
/**
315315
* Register an MCA variable
@@ -489,7 +489,7 @@ PMIX_EXPORT int pmix_mca_base_var_register_synonym (int synonym_for, const char
489489
*
490490
* If an enumerator is associated with this variable it will be dereferenced.
491491
*/
492-
int pmix_mca_base_var_deregister(int vari);
492+
PMIX_EXPORT int pmix_mca_base_var_deregister(int vari);
493493

494494

495495
/**
@@ -512,9 +512,9 @@ int pmix_mca_base_var_deregister(int vari);
512512
* Note: The value can be changed by the registering code without using
513513
* the pmix_mca_base_var_* interface so the source may be incorrect.
514514
*/
515-
int pmix_mca_base_var_get_value (int vari, void *value,
516-
pmix_mca_base_var_source_t *source,
517-
const char **source_file);
515+
PMIX_EXPORT int pmix_mca_base_var_get_value (int vari, void *value,
516+
pmix_mca_base_var_source_t *source,
517+
const char **source_file);
518518

519519
/**
520520
* Sets an "override" value for an integer MCA variable.
@@ -537,9 +537,9 @@ int pmix_mca_base_var_get_value (int vari, void *value,
537537
* a synonym the variable the synonym represents) if the value is
538538
* settable.
539539
*/
540-
int pmix_mca_base_var_set_value (int vari, const void *value, size_t size,
541-
pmix_mca_base_var_source_t source,
542-
const char *source_file);
540+
PMIX_EXPORT int pmix_mca_base_var_set_value (int vari, const void *value, size_t size,
541+
pmix_mca_base_var_source_t source,
542+
const char *source_file);
543543

544544
/**
545545
* Get the string name corresponding to the MCA variable
@@ -554,8 +554,8 @@ int pmix_mca_base_var_set_value (int vari, const void *value, size_t size,
554554
* The string that is returned is owned by the caller; if
555555
* appropriate, it must be eventually freed by the caller.
556556
*/
557-
int pmix_mca_base_var_env_name(const char *param_name,
558-
char **env_name);
557+
PMIX_EXPORT int pmix_mca_base_var_env_name(const char *param_name,
558+
char **env_name);
559559

560560
/**
561561
* Find the index for an MCA variable based on its names.
@@ -574,10 +574,10 @@ int pmix_mca_base_var_env_name(const char *param_name,
574574
* of any registered variable. The returned index can be used with
575575
* pmix_mca_base_var_get() and pmix_mca_base_var_get_value().
576576
*/
577-
int pmix_mca_base_var_find (const char *project_name,
578-
const char *type_name,
579-
const char *component_name,
580-
const char *param_name);
577+
PMIX_EXPORT int pmix_mca_base_var_find (const char *project_name,
578+
const char *type_name,
579+
const char *component_name,
580+
const char *param_name);
581581

582582
/**
583583
* Find the index for a variable based on its full name
@@ -587,7 +587,7 @@ int pmix_mca_base_var_find (const char *project_name,
587587
*
588588
* See pmix_mca_base_var_find().
589589
*/
590-
int pmix_mca_base_var_find_by_name (const char *full_name, int *vari);
590+
PMIX_EXPORT int pmix_mca_base_var_find_by_name (const char *full_name, int *vari);
591591

592592
/**
593593
* Check that two MCA variables were not both set to non-default
@@ -617,13 +617,13 @@ int pmix_mca_base_var_find_by_name (const char *full_name, int *vari);
617617
* are not MCA_BASE_VAR_SOURCE_DEFAULT.
618618
* @returns PMIX_SUCCESS otherwise.
619619
*/
620-
int pmix_mca_base_var_check_exclusive (const char *project,
621-
const char *type_a,
622-
const char *component_a,
623-
const char *param_a,
624-
const char *type_b,
625-
const char *component_b,
626-
const char *param_b);
620+
PMIX_EXPORT int pmix_mca_base_var_check_exclusive (const char *project,
621+
const char *type_a,
622+
const char *component_a,
623+
const char *param_a,
624+
const char *type_b,
625+
const char *component_b,
626+
const char *param_b);
627627

628628
/**
629629
* Set or unset a flag on a variable.
@@ -636,8 +636,8 @@ int pmix_mca_base_var_check_exclusive (const char *project,
636636
* @returns PMIX_ERR_BAD_PARAM If the variable is not registered.
637637
* @returns PMIX_ERROR Otherwise
638638
*/
639-
int pmix_mca_base_var_set_flag(int vari, pmix_mca_base_var_flag_t flag,
640-
bool set);
639+
PMIX_EXPORT int pmix_mca_base_var_set_flag(int vari, pmix_mca_base_var_flag_t flag,
640+
bool set);
641641

642642
/**
643643
* Obtain basic info on a single variable (name, help message, etc)
@@ -651,7 +651,7 @@ int pmix_mca_base_var_set_flag(int vari, pmix_mca_base_var_flag_t flag,
651651
* The returned pointer belongs to the MCA variable system. Do not
652652
* modify/free/retain the pointer.
653653
*/
654-
int pmix_mca_base_var_get (int vari, const pmix_mca_base_var_t **var);
654+
PMIX_EXPORT int pmix_mca_base_var_get (int vari, const pmix_mca_base_var_t **var);
655655

656656
/**
657657
* Obtain the number of variables that have been registered.
@@ -664,7 +664,7 @@ int pmix_mca_base_var_get (int vari, const pmix_mca_base_var_t **var);
664664
* returned is equal to the number of calls to pmix_mca_base_var_register with
665665
* unique names. ie. two calls with the same name will not affect the count.
666666
*/
667-
int pmix_mca_base_var_get_count (void);
667+
PMIX_EXPORT int pmix_mca_base_var_get_count (void);
668668

669669
/**
670670
* Obtain a list of enironment variables describing the all
@@ -683,8 +683,8 @@ int pmix_mca_base_var_get_count (void);
683683
* its output is in terms of an argv-style array of key=value
684684
* strings, suitable for using in an environment.
685685
*/
686-
int pmix_mca_base_var_build_env(char ***env, int *num_env,
687-
bool internal);
686+
PMIX_EXPORT int pmix_mca_base_var_build_env(char ***env, int *num_env,
687+
bool internal);
688688

689689
/**
690690
* Shut down the MCA variable system (normally only invoked by the
@@ -700,7 +700,7 @@ int pmix_mca_base_var_build_env(char ***env, int *num_env,
700700
* when the process is shutting down (e.g., during MPI_FINALIZE). It
701701
* is only documented here for completeness.
702702
*/
703-
int pmix_mca_base_var_finalize(void);
703+
PMIX_EXPORT int pmix_mca_base_var_finalize(void);
704704

705705
typedef enum {
706706
/* Dump human-readable strings */
@@ -721,19 +721,19 @@ typedef enum {
721721
* This function returns an array of strings describing the variable. All strings
722722
* and the array must be freed by the caller.
723723
*/
724-
int pmix_mca_base_var_dump(int vari, char ***out, pmix_mca_base_var_dump_type_t output_type);
724+
PMIX_EXPORT int pmix_mca_base_var_dump(int vari, char ***out, pmix_mca_base_var_dump_type_t output_type);
725725

726726
#define MCA_COMPILETIME_VER "print_compiletime_version"
727727
#define MCA_RUNTIME_VER "print_runtime_version"
728728

729-
int pmix_mca_base_var_cache_files (bool rel_path_search);
729+
PMIX_EXPORT int pmix_mca_base_var_cache_files (bool rel_path_search);
730730

731731
/*
732732
* Parse a provided list of envars and add their local value, or
733733
* their assigned value, to the provided argv
734734
*/
735-
int pmix_mca_base_var_process_env_list(char ***argv);
736-
int pmix_mca_base_var_process_env_list_from_file(char ***argv);
735+
PMIX_EXPORT int pmix_mca_base_var_process_env_list(char ***argv);
736+
PMIX_EXPORT int pmix_mca_base_var_process_env_list_from_file(char ***argv);
737737

738738
END_C_DECLS
739739

0 commit comments

Comments
 (0)