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

Changing some files .. found warnings while trying to compile

Просмотр исходного кода 
This commit was SVN r1046.
Этот коммит содержится в:
Prabhanjan Kambadur 2004-04-16 22:01:32 +00:00
родитель ca01a056e5
Коммит 24543615db
5 изменённых файлов: 30 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
src/mca/topo/unity/src/cart_map.c
Просмотреть файл

@ -1,7 +1,7 @@
/*
* $HEADER$
*/
#include "mca/topo/unity/topo_unity.h"
#include "mca/topo/unity/src/topo_unity.h"
/*
* function - mca_topo_unity_cart_map
@ -19,7 +19,7 @@
* @retval MPI_ERR_DIMS
*/
int mca_topo_unity_cart_map (lam_communicator_t *comm,
int mca_topo_unity_cart_map (MPI_Comm comm,
int ndims,
int *dims,
int *periods,
@ -45,7 +45,9 @@ int mca_topo_unity_cart_map (lam_communicator_t *comm,
/*
* Check that number of processes <= size of communicator.
*/
#if 0
errcode = lam_comm_size (comm, &size);
#endif
if (errcode != MPI_SUCCESS) {
return errcode;
}
@ -57,7 +59,9 @@ int mca_topo_unity_cart_map (lam_communicator_t *comm,
/*
* Compute my new rank.
*/
#if 0
errcode = lam_comm_rank (comm, &rank);
#endif
if (errcode != MPI_SUCCESS) {
printf ("failed to get a comm rank\n");
return errcode;

12
src/mca/topo/unity/src/graph_map.c
Просмотреть файл

@ -1,7 +1,7 @@
/*
* $HEADER$
*/
#include "mca/topo/unity/topo_unity.h"
#include "mca/topo/unity/src/topo_unity.h"
/*
* function - mca_topo_unity_graph_map
@ -18,7 +18,7 @@
* @retval MPI_UNDEFINED
*/
int mca_topo_unity_graph_map (lam_communicator_t *comm,
int mca_topo_unity_graph_map (MPI_Comm comm,
int nnodes,
int *index,
int *edges,
@ -27,14 +27,16 @@ int mca_topo_unity_graph_map (lam_communicator_t *comm,
int errcode;
int myrank;
#if 0
errcode = lam_comm_rank (comm, &myrank);
if (MPI_SUCCESS != errcode) {
#endif
if (LAM_SUCCESS != errcode) {
printf ("failed to get a comm rank\n");
return MPI_ERROR;
return LAM_ERROR;
}
*newrank =
((0 > myrank) || (myrank >= nnodes)) ? MPI_UNDEFINED : myrank;
return MPI_SUCCESS;
return LAM_SUCCESS;
}

4
src/mca/topo/unity/src/topo_unity.c
Просмотреть файл

@ -1,14 +1,14 @@
/*
* $HEADER$
*/
#include "mca/topo/unity/topo_unity.h"
#include "mca/topo/unity/src/topo_unity.h"
/*
* Init on the communicator. This function is called once the
* module has been selected for a particular communicator. As
* of now, do nothing
*/
int mca_topo_unity_init (lam_communicator_t *comm,
int mca_topo_unity_init (MPI_Comm comm,
const mca_topo_t **new_topo) {
/*
* Nothing to init on the communicator

10
src/mca/topo/unity/src/topo_unity.h
Просмотреть файл

@ -20,7 +20,7 @@
* version information and the four functions (see below) which
* are needed for this module to function with the MCA framework
*/
extern struct mca_topo_base_module_1_0_0_t mca_topo_unity_module;
extern const struct mca_topo_base_module_1_0_0_t mca_topo_unity_module;
/*
* ******************************************************************
@ -72,16 +72,16 @@ extern struct mca_topo_base_module_1_0_0_t mca_topo_unity_module;
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
int mca_topo_unity_init (lam_communicator_t *comm,
mca_topo_t **new_topo);
int mca_topo_unity_init (MPI_Comm comm,
const mca_topo_t **new_topo);
int mca_topo_unity_cart_map (lam_communicator_t *comm,
int mca_topo_unity_cart_map (MPI_Comm comm,
int ndims,
int *dims,
int *periods,
int *newrank);
int mca_topo_unity_graph_map (lam_communicator_t *comm,
int mca_topo_unity_graph_map (MPI_Comm comm,
int nnodes,
int *index,
int *edges,

20
src/mca/topo/unity/src/topo_unity_module.c
Просмотреть файл

@ -8,14 +8,14 @@
* modules just to query their version and parameters
*/
#include "mca/topo/unity/topo_unity,h"
#include "mca/topo/unity/src/topo_unity.h"
/*
* Public string showing the topo unity module version number
*/
const char *mca_topo_unity_module_version_string =
"LAM/MPI unity topology MCA module version" MCA_TOPO_UNITY_VERSION;
"LAM/MPI unity topology MCA module version" MCA_topo_unity_FULL_VERSION;
/*
* *******************************************************************
@ -30,19 +30,19 @@ const char *mca_topo_unity_module_version_string =
*/
const mca_topo_base_module_1_0_0_t mca_topo_unity_module = {
{
MCA_TOPO_UNITY_VERSION_1_0_0, /* version number */
MCA_TOPO_BASE_VERSION_1_0_0, /* version number */
"unity", /* module name */
MCA_TOPO_UNITY_MAJOR_VERSION, /* major version */
MCA_TOPO_UNITY_MINOR_VERSION, /* minor version */
MCA_TOPO_UNITY_RELEASE_VERSION, /* release version */
MCA_topo_unity_MAJOR_VERSION, /* major version */
MCA_topo_unity_MINOR_VERSION, /* minor version */
MCA_topo_unity_RELEASE_VERSION, /* release version */
mca_topo_unity_module_open, /* fp to open the module */
mca_topo_unity_module_close /* fp to close the module */
},
{
false /* whether checkpoint/restart is enabled */
},
mca_topo_unity_comm_query, /* get priority and actions */
mca_topo_unity_comm_finalize /* undo actions of query */
mca_topo_unity_module_query, /* get priority and actions */
mca_topo_unity_module_finalize /* undo actions of query */
};
/*
* *******************************************************************
@ -55,7 +55,7 @@ const mca_topo_base_module_1_0_0_t mca_topo_unity_module = {
* ************************ actions structure ************************
* *******************************************************************
*/
static const mca_topo_t unity {
static mca_topo_t unity = {
mca_topo_unity_init, /* initalise after being selected */
NULL, /* topo_cart_coords */
NULL, /* topo_cart_create */
@ -69,7 +69,7 @@ static const mca_topo_t unity {
NULL, /* topo_graph_get */
mca_topo_unity_graph_map,
NULL, /* topo_graph_neighbors */
NULL, /* topo_graph_neighbors_count */
NULL /* topo_graph_neighbors_count */
};
/*
* *******************************************************************