pmix: rename the ext11 component into ext1x
also use the same naming scheme thann pmix/ext2x Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
Gilles Gouaillardet
родитель
dccb1899e6
Коммит
f485d12a82
@ -1,46 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
sources = \
|
||||
pmix_ext.h \
|
||||
pmix_ext_component.c \
|
||||
pmix_ext.c \
|
||||
pmix_ext_client.c \
|
||||
pmix_ext_server_south.c \
|
||||
pmix_ext_server_north.c
|
||||
|
||||
# Make the output library in this directory, and name it either
|
||||
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||
# (for static builds).
|
||||
|
||||
if MCA_BUILD_opal_pmix_ext11_DSO
|
||||
component_noinst =
|
||||
component_install = mca_pmix_ext11.la
|
||||
else
|
||||
component_noinst = libmca_pmix_ext11.la
|
||||
component_install =
|
||||
endif
|
||||
|
||||
mcacomponentdir = $(opallibdir)
|
||||
mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_pmix_ext11_la_SOURCES = $(sources)
|
||||
mca_pmix_ext11_la_CFLAGS =
|
||||
mca_pmix_ext11_la_CPPFLAGS = $(opal_pmix_ext11_CPPFLAGS)
|
||||
mca_pmix_ext11_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext11_LDFLAGS)
|
||||
mca_pmix_ext11_la_LIBADD = $(opal_pmix_ext11_LIBS)
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_pmix_ext11_la_SOURCES =$(sources)
|
||||
libmca_pmix_ext11_la_CFLAGS =
|
||||
libmca_pmix_ext11_la_CPPFLAGS = $(opal_pmix_ext11_CPPFLAGS)
|
||||
libmca_pmix_ext11_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext11_LDFLAGS)
|
||||
libmca_pmix_ext11_la_LIBADD = $(opal_pmix_ext11_LIBS)
|
||||
48
opal/mca/pmix/ext1x/Makefile.am
Обычный файл
48
opal/mca/pmix/ext1x/Makefile.am
Обычный файл
@ -0,0 +1,48 @@
|
||||
#
|
||||
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2017 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
sources = \
|
||||
pmix1x.h \
|
||||
pmix1x_component.c \
|
||||
pmix1x.c \
|
||||
pmix1x_client.c \
|
||||
pmix1x_server_south.c \
|
||||
pmix1x_server_north.c
|
||||
|
||||
# Make the output library in this directory, and name it either
|
||||
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||
# (for static builds).
|
||||
|
||||
if MCA_BUILD_opal_pmix_ext1x_DSO
|
||||
component_noinst =
|
||||
component_install = mca_pmix_ext1x.la
|
||||
else
|
||||
component_noinst = libmca_pmix_ext1x.la
|
||||
component_install =
|
||||
endif
|
||||
|
||||
mcacomponentdir = $(opallibdir)
|
||||
mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_pmix_ext1x_la_SOURCES = $(sources)
|
||||
mca_pmix_ext1x_la_CFLAGS =
|
||||
mca_pmix_ext1x_la_CPPFLAGS = $(opal_pmix_ext1x_CPPFLAGS)
|
||||
mca_pmix_ext1x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext1x_LDFLAGS)
|
||||
mca_pmix_ext1x_la_LIBADD = $(opal_pmix_ext1x_LIBS)
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_pmix_ext1x_la_SOURCES =$(sources)
|
||||
libmca_pmix_ext1x_la_CFLAGS =
|
||||
libmca_pmix_ext1x_la_CPPFLAGS = $(opal_pmix_ext1x_CPPFLAGS)
|
||||
libmca_pmix_ext1x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext1x_LDFLAGS)
|
||||
libmca_pmix_ext1x_la_LIBADD = $(opal_pmix_ext1x_LIBS)
|
||||
@ -14,7 +14,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Research Organization for Information Science
|
||||
# Copyright (c) 2015-2017 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||
# All rights reserved.
|
||||
@ -25,10 +25,10 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# MCA_pmix_ext11_CONFIG([action-if-found], [action-if-not-found])
|
||||
# MCA_pmix_ext1x_CONFIG([action-if-found], [action-if-not-found])
|
||||
# -----------------------------------------------------------
|
||||
AC_DEFUN([MCA_opal_pmix_ext11_CONFIG],[
|
||||
AC_CONFIG_FILES([opal/mca/pmix/ext11/Makefile])
|
||||
AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
|
||||
AC_CONFIG_FILES([opal/mca/pmix/ext1x/Makefile])
|
||||
|
||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||
[AS_IF([test "$opal_event_external_support" != "yes"],
|
||||
@ -42,29 +42,30 @@ AC_DEFUN([MCA_opal_pmix_ext11_CONFIG],[
|
||||
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
||||
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
|
||||
|
||||
# check for the 1.1.4 version
|
||||
AC_MSG_CHECKING([if external component is version 1.1.4])
|
||||
# check for the 1.x version ( >= 1.1.4 ?)
|
||||
AC_MSG_CHECKING([if external component is version 1.x])
|
||||
AS_IF([test "$opal_external_pmix_version" = "11" ||
|
||||
test "$opal_external_pmix_version" = "12" ||
|
||||
test "$opal_external_pmix_version" = "1x"],
|
||||
[AC_MSG_RESULT([yes])
|
||||
opal_pmix_external_11_happy=yes],
|
||||
opal_pmix_external_1x_happy=yes],
|
||||
[AC_MSG_RESULT([no])
|
||||
opal_pmix_external_11_happy=no])
|
||||
opal_pmix_external_1x_happy=no])
|
||||
|
||||
AS_IF([test "$opal_pmix_external_11_happy" = "yes"],
|
||||
AS_IF([test "$opal_pmix_external_1x_happy" = "yes"],
|
||||
[$1
|
||||
# need to set the wrapper flags for static builds
|
||||
pmix_ext11_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||
pmix_ext11_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
||||
pmix_ext1x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||
pmix_ext1x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
||||
[$2])],
|
||||
[$2])
|
||||
|
||||
opal_pmix_ext11_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
||||
opal_pmix_ext11_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||
opal_pmix_ext11_LIBS=$opal_external_pmix_LIBS
|
||||
opal_pmix_ext1x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
||||
opal_pmix_ext1x_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||
opal_pmix_ext1x_LIBS=$opal_external_pmix_LIBS
|
||||
|
||||
AC_SUBST([opal_pmix_ext11_CPPFLAGS])
|
||||
AC_SUBST([opal_pmix_ext11_LDFLAGS])
|
||||
AC_SUBST([opal_pmix_ext11_LIBS])
|
||||
AC_SUBST([opal_pmix_ext1x_CPPFLAGS])
|
||||
AC_SUBST([opal_pmix_ext1x_LDFLAGS])
|
||||
AC_SUBST([opal_pmix_ext1x_LIBS])
|
||||
|
||||
])dnl
|
||||
@ -35,7 +35,7 @@
|
||||
#include "opal/util/proc.h"
|
||||
#include "opal/util/show_help.h"
|
||||
|
||||
#include "pmix_ext.h"
|
||||
#include "pmix1x.h"
|
||||
#include "opal/mca/pmix/base/base.h"
|
||||
#include "opal/mca/pmix/pmix_types.h"
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
static const char *pmix1_get_nspace(opal_jobid_t jobid);
|
||||
static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace);
|
||||
|
||||
const opal_pmix_base_module_t opal_pmix_ext11_module = {
|
||||
const opal_pmix_base_module_t opal_pmix_ext1x_module = {
|
||||
/* client APIs */
|
||||
.init = pmix1_client_init,
|
||||
.finalize = pmix1_client_finalize,
|
||||
@ -100,7 +100,7 @@ static const char *pmix1_get_nspace(opal_jobid_t jobid)
|
||||
{
|
||||
opal_pmix1_jobid_trkr_t *jptr;
|
||||
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == jobid) {
|
||||
return jptr->nspace;
|
||||
}
|
||||
@ -113,7 +113,7 @@ static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace)
|
||||
opal_pmix1_jobid_trkr_t *jptr;
|
||||
|
||||
/* if we don't already have it, add this to our jobid tracker */
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == jobid) {
|
||||
return;
|
||||
}
|
||||
@ -121,7 +121,7 @@ static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace)
|
||||
jptr = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(jptr->nspace, nspace, PMIX_MAX_NSLEN);
|
||||
jptr->jobid = jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &jptr->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &jptr->super);
|
||||
}
|
||||
|
||||
pmix_status_t pmix1_convert_opalrc(int rc)
|
||||
@ -37,11 +37,11 @@ typedef struct {
|
||||
opal_pmix_base_component_t super;
|
||||
opal_list_t jobids;
|
||||
bool native_launch;
|
||||
} mca_pmix_ext11_component_t;
|
||||
} mca_pmix_ext1x_component_t;
|
||||
|
||||
OPAL_DECLSPEC extern mca_pmix_ext11_component_t mca_pmix_ext11_component;
|
||||
OPAL_DECLSPEC extern mca_pmix_ext1x_component_t mca_pmix_ext1x_component;
|
||||
|
||||
OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_ext11_module;
|
||||
OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_ext1x_module;
|
||||
|
||||
/**** INTERNAL OBJECTS ****/
|
||||
typedef struct {
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
||||
/*
|
||||
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||
* Copyright (c) 2014-2016 Research Organization for Information Science
|
||||
* Copyright (c) 2014-2017 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||
* All rights reserved.
|
||||
@ -28,7 +28,7 @@
|
||||
#include "opal/util/proc.h"
|
||||
|
||||
#include "opal/mca/pmix/base/base.h"
|
||||
#include "pmix_ext.h"
|
||||
#include "pmix1x.h"
|
||||
#include "pmix.h"
|
||||
|
||||
static pmix_proc_t my_proc;
|
||||
@ -124,7 +124,7 @@ int pmix1_client_init(void)
|
||||
if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
mca_pmix_ext11_component.native_launch = true;
|
||||
mca_pmix_ext1x_component.native_launch = true;
|
||||
opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace);
|
||||
} else {
|
||||
/* we were launched by someone else, so make the
|
||||
@ -136,7 +136,7 @@ int pmix1_client_init(void)
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, my_proc.nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = pname.jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
|
||||
pname.vpid = my_proc.rank;
|
||||
opal_proc_set_name(&pname);
|
||||
@ -190,7 +190,7 @@ int pmix1_abort(int flag, const char *msg,
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == ptr->name.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -225,7 +225,7 @@ int pmix1_store_local(const opal_process_name_t *proc, opal_value_t *val)
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == proc->jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -291,7 +291,7 @@ int pmix1_fence(opal_list_t *procs, int collect_data)
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == ptr->name.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -353,7 +353,7 @@ int pmix1_fencenb(opal_list_t *procs, int collect_data,
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == ptr->name.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -438,7 +438,7 @@ int pmix1_get(const opal_process_name_t *proc, const char *key,
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == proc->jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -543,7 +543,7 @@ int pmix1_getnb(const opal_process_name_t *proc, const char *key,
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == proc->jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -694,7 +694,7 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info)
|
||||
/* transfer the data back */
|
||||
n=0;
|
||||
OPAL_LIST_FOREACH(d, data, opal_pmix_pdata_t) {
|
||||
if (mca_pmix_ext11_component.native_launch) {
|
||||
if (mca_pmix_ext1x_component.native_launch) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
opal_convert_string_to_jobid(&d->proc.jobid, pdata[n].proc.nspace);
|
||||
@ -705,7 +705,7 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info)
|
||||
}
|
||||
/* if we don't already have it, add this to our jobid tracker */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == d->proc.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -715,7 +715,7 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info)
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, pdata[n].proc.nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = d->proc.jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
}
|
||||
if (PMIX_RANK_WILDCARD == pdata[n].proc.rank) {
|
||||
d->proc.vpid = OPAL_VPID_WILDCARD;
|
||||
@ -757,7 +757,7 @@ static void lk_cbfunc(pmix_status_t status,
|
||||
for (n=0; n < ndata; n++) {
|
||||
d = OBJ_NEW(opal_pmix_pdata_t);
|
||||
opal_list_append(&results, &d->super);
|
||||
if (mca_pmix_ext11_component.native_launch) {
|
||||
if (mca_pmix_ext1x_component.native_launch) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
opal_convert_string_to_jobid(&d->proc.jobid, data[n].proc.nspace);
|
||||
@ -768,7 +768,7 @@ static void lk_cbfunc(pmix_status_t status,
|
||||
}
|
||||
/* if we don't already have it, add this to our jobid tracker */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == d->proc.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -778,7 +778,7 @@ static void lk_cbfunc(pmix_status_t status,
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, data[n].proc.nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = d->proc.jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
}
|
||||
if (PMIX_RANK_WILDCARD == data[n].proc.rank) {
|
||||
d->proc.vpid = OPAL_VPID_WILDCARD;
|
||||
@ -942,7 +942,7 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
|
||||
|
||||
ret = PMIx_Spawn(pinfo, ninfo, papps, napps, nspace);
|
||||
if (PMIX_SUCCESS == ret) {
|
||||
if (mca_pmix_ext11_component.native_launch) {
|
||||
if (mca_pmix_ext1x_component.native_launch) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
opal_convert_string_to_jobid(jobid, nspace);
|
||||
@ -955,7 +955,7 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = *jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
}
|
||||
PMIX_APP_FREE(papps, napps);
|
||||
|
||||
@ -972,7 +972,7 @@ static void spcbfunc(pmix_status_t status,
|
||||
|
||||
rc = pmix1_convert_rc(status);
|
||||
if (PMIX_SUCCESS == status) {
|
||||
if (mca_pmix_ext11_component.native_launch) {
|
||||
if (mca_pmix_ext1x_component.native_launch) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
opal_convert_string_to_jobid(&jobid, nspace);
|
||||
@ -985,7 +985,7 @@ static void spcbfunc(pmix_status_t status,
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
}
|
||||
|
||||
op->spcbfunc(rc, jobid, op->cbdata);
|
||||
@ -1063,7 +1063,7 @@ int pmix1_connect(opal_list_t *procs)
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == ptr->name.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -1116,7 +1116,7 @@ int pmix1_connectnb(opal_list_t *procs,
|
||||
OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) {
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (job->jobid == ptr->name.jobid) {
|
||||
(void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN);
|
||||
break;
|
||||
@ -1155,7 +1155,7 @@ int pmix1_disconnect(opal_list_t *procs)
|
||||
OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) {
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (job->jobid == ptr->name.jobid) {
|
||||
(void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN);
|
||||
break;
|
||||
@ -1203,7 +1203,7 @@ int pmix1_disconnectnb(opal_list_t *procs,
|
||||
OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) {
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(job, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (job->jobid == ptr->name.jobid) {
|
||||
(void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN);
|
||||
break;
|
||||
@ -1238,7 +1238,7 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid,
|
||||
nspace = NULL;
|
||||
} else {
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -1257,7 +1257,7 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid,
|
||||
for (n=0; n < nprocs; n++) {
|
||||
nm = OBJ_NEW(opal_namelist_t);
|
||||
opal_list_append(procs, &nm->super);
|
||||
if (mca_pmix_ext11_component.native_launch) {
|
||||
if (mca_pmix_ext1x_component.native_launch) {
|
||||
/* if we were launched by the OMPI RTE, then
|
||||
* the jobid is in a special format - so get it */
|
||||
opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace);
|
||||
@ -1268,7 +1268,7 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid,
|
||||
}
|
||||
/* if we don't already have it, add this to our jobid tracker */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == nm->name.jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -1278,7 +1278,7 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid,
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
}
|
||||
nm->name.vpid = array[n].rank;
|
||||
}
|
||||
@ -1298,7 +1298,7 @@ int pmix1_resolve_nodes(opal_jobid_t jobid, char **nodelist)
|
||||
/* look thru our list of jobids and find the
|
||||
* corresponding nspace */
|
||||
job = NULL;
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == jobid) {
|
||||
job = jptr;
|
||||
break;
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||
* Copyright (c) 2014-2015 Research Organization for Information Science
|
||||
* Copyright (c) 2014-2017 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
@ -22,12 +22,12 @@
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "opal/util/proc.h"
|
||||
#include "opal/mca/pmix/pmix.h"
|
||||
#include "pmix_ext.h"
|
||||
#include "pmix1x.h"
|
||||
|
||||
/*
|
||||
* Public string showing the pmix ext11 component version number
|
||||
* Public string showing the pmix ext1x component version number
|
||||
*/
|
||||
const char *opal_pmix_ext11_component_version_string =
|
||||
const char *opal_pmix_ext1x_component_version_string =
|
||||
"OPAL external pmix1.1.4 MCA component version " OPAL_VERSION;
|
||||
|
||||
/*
|
||||
@ -43,7 +43,7 @@ static int external_component_query(mca_base_module_t **module, int *priority);
|
||||
* and pointers to our public functions in it
|
||||
*/
|
||||
|
||||
mca_pmix_ext11_component_t mca_pmix_ext11_component = {
|
||||
mca_pmix_ext1x_component_t mca_pmix_ext1x_component = {
|
||||
{
|
||||
/* First, the mca_component_t struct containing meta information
|
||||
about the component itself */
|
||||
@ -56,7 +56,7 @@ mca_pmix_ext11_component_t mca_pmix_ext11_component = {
|
||||
|
||||
/* Component name and version */
|
||||
|
||||
.mca_component_name = "ext11",
|
||||
.mca_component_name = "ext1x",
|
||||
MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION,
|
||||
OPAL_RELEASE_VERSION),
|
||||
|
||||
@ -77,13 +77,13 @@ mca_pmix_ext11_component_t mca_pmix_ext11_component = {
|
||||
|
||||
static int external_open(void)
|
||||
{
|
||||
OBJ_CONSTRUCT(&mca_pmix_ext11_component.jobids, opal_list_t);
|
||||
OBJ_CONSTRUCT(&mca_pmix_ext1x_component.jobids, opal_list_t);
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
static int external_close(void)
|
||||
{
|
||||
OPAL_LIST_DESTRUCT(&mca_pmix_ext11_component.jobids);
|
||||
OPAL_LIST_DESTRUCT(&mca_pmix_ext1x_component.jobids);
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
@ -101,6 +101,6 @@ static int external_component_query(mca_base_module_t **module, int *priority)
|
||||
/* we could be a server, so we still need to be considered */
|
||||
*priority = 5;
|
||||
}
|
||||
*module = (mca_base_module_t *)&opal_pmix_ext11_module;
|
||||
*module = (mca_base_module_t *)&opal_pmix_ext1x_module;
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
@ -35,7 +35,7 @@
|
||||
#include "opal/util/proc.h"
|
||||
#include "opal/util/show_help.h"
|
||||
#include "opal/mca/pmix/base/base.h"
|
||||
#include "pmix_ext.h"
|
||||
#include "pmix1x.h"
|
||||
|
||||
#include "pmix.h"
|
||||
#include "pmix_server.h"
|
||||
@ -36,7 +36,7 @@
|
||||
#include "opal/util/proc.h"
|
||||
#include "opal/util/show_help.h"
|
||||
#include "opal/mca/pmix/base/base.h"
|
||||
#include "pmix_ext.h"
|
||||
#include "pmix1x.h"
|
||||
|
||||
#include "pmix.h"
|
||||
#include "pmix_server.h"
|
||||
@ -222,7 +222,7 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
|
||||
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
|
||||
(void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
|
||||
job->jobid = jobid;
|
||||
opal_list_append(&mca_pmix_ext11_component.jobids, &job->super);
|
||||
opal_list_append(&mca_pmix_ext1x_component.jobids, &job->super);
|
||||
|
||||
/* convert the list to an array of pmix_info_t */
|
||||
if (NULL != info) {
|
||||
@ -278,12 +278,12 @@ void pmix1_server_deregister_nspace(opal_jobid_t jobid,
|
||||
opal_pmix1_jobid_trkr_t *jptr;
|
||||
|
||||
/* if we don't already have it, we can ignore this */
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == jobid) {
|
||||
/* found it - tell the server to deregister */
|
||||
PMIx_server_deregister_nspace(jptr->nspace);
|
||||
/* now get rid of it from our list */
|
||||
opal_list_remove_item(&mca_pmix_ext11_component.jobids, &jptr->super);
|
||||
opal_list_remove_item(&mca_pmix_ext1x_component.jobids, &jptr->super);
|
||||
OBJ_RELEASE(jptr);
|
||||
return;
|
||||
}
|
||||
@ -324,7 +324,7 @@ void pmix1_server_deregister_client(const opal_process_name_t *proc,
|
||||
pmix_proc_t p;
|
||||
|
||||
/* if we don't already have it, we can ignore this */
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
|
||||
if (jptr->jobid == proc->jobid) {
|
||||
/* found it - tell the server to deregister */
|
||||
(void)strncpy(p.nspace, jptr->nspace, PMIX_MAX_NSLEN);
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user