ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #658 from hjelmn/mpit_fixes

Просмотр исходного кода 
Fix definition of MPI_T_pvar_get_index
Этот коммит содержится в:
Nathan Hjelm 2015-06-24 16:40:25 -07:00
родитель dc1b125b12 4552afff06
Коммит e561f150d6
9 изменённых файлов: 44 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
NEWS
Просмотреть файл

@ -72,6 +72,8 @@ Master (not on release branches yet)
1.8.6
-----
- Fixed incorrect declaration for MPI_T_pvar_get_index and added
missing return code MPI_T_INVALID_NAME.
- Fixed memory leak on Mac OS-X exposed by TCP keepalive
- Fixed keepalive support to ensure that daemon/node failure
results in complete job cleanup

3
ompi/errhandler/errcode.c
Просмотреть файл

@ -114,6 +114,7 @@ static ompi_mpi_errcode_t ompi_err_rma_attach;
static ompi_mpi_errcode_t ompi_err_rma_flavor;
static ompi_mpi_errcode_t ompi_err_rma_shared;
static ompi_mpi_errcode_t ompi_t_err_invalid;
static ompi_mpi_errcode_t ompi_t_err_invalid_name;
static void ompi_mpi_errcode_construct(ompi_mpi_errcode_t* errcode);
static void ompi_mpi_errcode_destruct(ompi_mpi_errcode_t* errcode);
@ -214,6 +215,7 @@ int ompi_mpi_errcode_init (void)
CONSTRUCT_ERRCODE( ompi_err_rma_flavor, MPI_ERR_RMA_FLAVOR, "MPI_ERR_RMA_FLAVOR: Invalid type of window" );
CONSTRUCT_ERRCODE( ompi_err_rma_shared, MPI_ERR_RMA_SHARED, "MPI_ERR_RMA_SHARED: Memory cannot be shared" );
CONSTRUCT_ERRCODE( ompi_t_err_invalid, MPI_T_ERR_INVALID, "MPI_T_ERR_INVALID: Invalid use of the interface or bad parameter value(s)" );
CONSTRUCT_ERRCODE( ompi_t_err_invalid_name, MPI_T_ERR_INVALID_NAME, "MPI_T_ERR_INVALID_NAME: The variable or category name is invalid" );
/* Per MPI-3 p353:27-32, MPI_LASTUSEDCODE must be >=
MPI_ERR_LASTCODE. So just start it as == MPI_ERR_LASTCODE. */
@ -309,6 +311,7 @@ int ompi_mpi_errcode_finalize(void)
OBJ_DESTRUCT(&ompi_err_rma_flavor);
OBJ_DESTRUCT(&ompi_err_rma_shared);
OBJ_DESTRUCT(&ompi_t_err_invalid);
OBJ_DESTRUCT(&ompi_t_err_invalid_name);
OBJ_DESTRUCT(&ompi_mpi_errcodes);
return OMPI_SUCCESS;

5
ompi/include/mpi.h.in
Просмотреть файл

@ -604,6 +604,7 @@ enum {
#define MPI_ERR_RMA_FLAVOR 70
#define MPI_ERR_RMA_SHARED 71
#define MPI_T_ERR_INVALID 72
#define MPI_T_ERR_INVALID_NAME 73
/* Per MPI-3 p349 47, MPI_ERR_LASTCODE must be >= the last predefined
MPI_ERR_<foo> code. Set the last code to allow some room for adding
@ -2594,7 +2595,7 @@ OMPI_DECLSPEC int PMPI_T_pvar_get_info(int pvar_index, char *name, int *name_le
int *verbosity, int *var_class, MPI_Datatype *datatype,
MPI_T_enum *enumtype, char *desc, int *desc_len, int *bind,
int *readonly, int *continuous, int *atomic);
OMPI_DECLSPEC int PMPI_T_pvar_get_index (const char *name, int *pvar_index);
OMPI_DECLSPEC int PMPI_T_pvar_get_index (const char *name, int var_class, int *pvar_index);
OMPI_DECLSPEC int PMPI_T_pvar_session_create(MPI_T_pvar_session *session);
OMPI_DECLSPEC int PMPI_T_pvar_session_free(MPI_T_pvar_session *session);
OMPI_DECLSPEC int PMPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,
@ -2644,7 +2645,7 @@ OMPI_DECLSPEC int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len
int *verbosity, int *var_class, MPI_Datatype *datatype,
MPI_T_enum *enumtype, char *desc, int *desc_len, int *bind,
int *readonly, int *continuous, int *atomic);
OMPI_DECLSPEC int MPI_T_pvar_get_index (const char *name, int *pvar_index);
OMPI_DECLSPEC int MPI_T_pvar_get_index (const char *name, int var_class, int *pvar_index);
OMPI_DECLSPEC int MPI_T_pvar_session_create(MPI_T_pvar_session *session);
OMPI_DECLSPEC int MPI_T_pvar_session_free(MPI_T_pvar_session *session);
OMPI_DECLSPEC int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,

5
ompi/mpi/tool/category_get_index.c
Просмотреть файл

@ -36,6 +36,9 @@ int MPI_T_category_get_index (const char *name, int *category_index)
mpit_lock ();
ret = mca_base_var_group_find_by_name (name, category_index);
mpit_unlock ();
if (OPAL_SUCCESS != ret) {
return MPI_T_ERR_INVALID_NAME;
}
return ompit_opal_to_mpit_error (ret);
return MPI_SUCCESS;
}

5
ompi/mpi/tool/cvar_get_index.c
Просмотреть файл

@ -36,6 +36,9 @@ int MPI_T_cvar_get_index (const char *name, int *cvar_index)
mpit_lock ();
ret = mca_base_var_find_by_name (name, cvar_index);
mpit_unlock ();
if (OPAL_SUCCESS != ret) {
return MPI_T_ERR_INVALID_NAME;
}
return ompit_opal_to_mpit_error (ret);
return MPI_SUCCESS;
}

4
ompi/mpi/tool/mpit_common.c
Просмотреть файл

@ -34,6 +34,10 @@ void mpit_unlock (void)
int ompit_var_type_to_datatype (mca_base_var_type_t type, MPI_Datatype *datatype)
{
if (!datatype) {
return OMPI_SUCCESS;
}
switch (type) {
case MCA_BASE_VAR_TYPE_INT:
*datatype = MPI_INT;

11
ompi/mpi/tool/pvar_get_index.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
@ -21,7 +21,7 @@
#endif
int MPI_T_pvar_get_index (const char *name, int *pvar_index)
int MPI_T_pvar_get_index (const char *name, int var_class, int *pvar_index)
{
int ret;
@ -34,8 +34,11 @@ int MPI_T_pvar_get_index (const char *name, int *pvar_index)
}
mpit_lock ();
ret = mca_base_pvar_find_by_name (name, pvar_index);
ret = mca_base_pvar_find_by_name (name, var_class, pvar_index);
mpit_unlock ();
if (OPAL_SUCCESS != ret) {
return MPI_T_ERR_INVALID_NAME;
}
return ompit_opal_to_mpit_error (ret);
return MPI_SUCCESS;
}

16
opal/mca/base/mca_base_pvar.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
@ -76,7 +76,7 @@ int mca_base_pvar_find (const char *project, const char *framework, const char *
return OPAL_ERROR;
}
ret = mca_base_pvar_find_by_name (full_name, &index);
ret = mca_base_pvar_find_by_name (full_name, MCA_BASE_PVAR_CLASS_ANY, &index);
free (full_name);
/* NTH: should we verify the name components match the returned variable? */
@ -84,8 +84,9 @@ int mca_base_pvar_find (const char *project, const char *framework, const char *
return (OPAL_SUCCESS != ret) ? ret : index;
}
int mca_base_pvar_find_by_name (const char *full_name, int *index)
int mca_base_pvar_find_by_name (const char *full_name, int var_class, int *index)
{
mca_base_pvar_t *pvar;
void *tmp;
int rc;
@ -95,6 +96,15 @@ int mca_base_pvar_find_by_name (const char *full_name, int *index)
return rc;
}
rc = mca_base_pvar_get_internal ((int)(uintptr_t) tmp, &pvar, false);
if (OPAL_SUCCESS != rc) {
return rc;
}
if (MCA_BASE_PVAR_CLASS_ANY != var_class && pvar->var_class != var_class) {
return OPAL_ERR_NOT_FOUND;
}
*index = (int)(uintptr_t) tmp;
return OPAL_SUCCESS;

6
opal/mca/base/mca_base_pvar.h
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
* reserved.
*
* Additional copyrights may follow
@ -91,6 +91,8 @@ enum {
MCA_BASE_PVAR_CLASS_GENERIC
};
#define MCA_BASE_PVAR_CLASS_ANY -1
/*
* Reserved bindings; passed when registering a new pvar. OPAL will
* ignore any other binding type.
@ -356,7 +358,7 @@ OPAL_DECLSPEC int mca_base_pvar_find (const char *project, const char *framework
*
* See mca_base_pvar_find().
*/
OPAL_DECLSPEC int mca_base_pvar_find_by_name (const char *full_name, int *index);
OPAL_DECLSPEC int mca_base_pvar_find_by_name (const char *full_name, int var_class, int *index);
/****************************************************************************
* The following functions are the back-end to the MPI_T API functions