Skip to content

Commit 73075b8

Browse files
author
Ralph Castain
authored
Merge pull request #5804 from rhc54/topic/sync2
Sync to PMIx master
2 parents 8b228c1 + 172e770 commit 73075b8

Some content is hidden

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

77 files changed

+972
-921
lines changed

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=
3030
# command, or with the date (if "git describe" fails) in the form of
3131
# "date<date>".
3232

33-
repo_rev=git40a09ca0
33+
repo_rev=git56f2d69a
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="Sep 27, 2018"
47+
date="Sep 28, 2018"
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/autogen_found_items.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dnl ---------------------------------------------------------------------------
55
dnl This file is automatically created by autogen.pl; it should not
66
dnl be edited by hand!!
77
dnl
8-
dnl Generated by rhc at Thu Sep 27 20:48:58 2018
9-
dnl on Ralphs-iMac-2.local.
8+
dnl Generated by rhc at Fri Sep 28 12:11:25 2018
9+
dnl on localhost.localdomain.
1010
dnl ---------------------------------------------------------------------------
1111

1212
m4_define([autogen_platform_file], [])

opal/mca/pmix/pmix4x/pmix/include/pmix.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ PMIX_EXPORT pmix_status_t PMIx_Abort(int status, const char msg[],
129129
* the information locally until _PMIx_Commit_ is called. The provided scope
130130
* value is passed to the local PMIx server, which will distribute the data
131131
* as directed. */
132-
PMIX_EXPORT pmix_status_t PMIx_Put(pmix_scope_t scope, const char key[], pmix_value_t *val);
132+
PMIX_EXPORT pmix_status_t PMIx_Put(pmix_scope_t scope, const pmix_key_t key, pmix_value_t *val);
133133

134134

135135
/* Push all previously _PMIx_Put_ values to the local PMIx server.
@@ -208,7 +208,7 @@ PMIX_EXPORT pmix_status_t PMIx_Get(const pmix_proc_t *proc, const char key[],
208208
* be executed once the specified data has been _PMIx_Put_
209209
* by the identified process and retrieved by the local server. The info
210210
* array is used as described above for the blocking form of this call. */
211-
PMIX_EXPORT pmix_status_t PMIx_Get_nb(const pmix_proc_t *proc, const char key[],
211+
PMIX_EXPORT pmix_status_t PMIx_Get_nb(const pmix_proc_t *proc, const pmix_key_t key,
212212
const pmix_info_t info[], size_t ninfo,
213213
pmix_value_cbfunc_t cbfunc, void *cbdata);
214214

@@ -337,7 +337,7 @@ PMIX_EXPORT pmix_status_t PMIx_Unpublish_nb(char **keys,
337337
*/
338338
PMIX_EXPORT pmix_status_t PMIx_Spawn(const pmix_info_t job_info[], size_t ninfo,
339339
const pmix_app_t apps[], size_t napps,
340-
char nspace[]);
340+
pmix_nspace_t nspace);
341341

342342

343343
/* Non-blocking form of the _PMIx_Spawn_ function. The callback
@@ -394,15 +394,16 @@ PMIX_EXPORT pmix_status_t PMIx_Disconnect_nb(const pmix_proc_t ranges[], size_t
394394
* for releasing the array when done with it - the PMIX_PROC_FREE macro is
395395
* provided for this purpose.
396396
*/
397-
PMIX_EXPORT pmix_status_t PMIx_Resolve_peers(const char *nodename, const char *nspace,
397+
PMIX_EXPORT pmix_status_t PMIx_Resolve_peers(const char *nodename,
398+
const pmix_nspace_t nspace,
398399
pmix_proc_t **procs, size_t *nprocs);
399400

400401

401402
/* Given an nspace, return the list of nodes hosting processes within
402403
* that nspace. The returned string will contain a comma-delimited list
403404
* of nodenames. The caller is responsible for releasing the string
404405
* when done with it */
405-
PMIX_EXPORT pmix_status_t PMIx_Resolve_nodes(const char *nspace, char **nodelist);
406+
PMIX_EXPORT pmix_status_t PMIx_Resolve_nodes(const pmix_nspace_t nspace, char **nodelist);
406407

407408
/* Query information about the system in general - can include
408409
* a list of active nspaces, network topology, etc. Also can be

0 commit comments

Comments
 (0)