fixing the condition under which the values of the c-functions are
passed back to the fortran routines. Should probably go to v1.0.1, but is unfortunatly just half of the overall fix. This commit was SVN r8242.
Этот коммит содержится в:
родитель
05a5fb4b05
Коммит
b6ddb73f38
@ -61,7 +61,7 @@ void mpi_finalized_f(MPI_Fint *flag, MPI_Fint *ierr)
|
|||||||
{
|
{
|
||||||
OMPI_SINGLE_NAME_DECL(flag);
|
OMPI_SINGLE_NAME_DECL(flag);
|
||||||
*ierr = OMPI_INT_2_FINT(MPI_Finalized(OMPI_SINGLE_NAME_CONVERT(flag)));
|
*ierr = OMPI_INT_2_FINT(MPI_Finalized(OMPI_SINGLE_NAME_CONVERT(flag)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(flag);
|
OMPI_SINGLE_INT_2_FINT(flag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -62,7 +62,7 @@ void mpi_get_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr)
|
|||||||
MPI_Aint c_address;
|
MPI_Aint c_address;
|
||||||
|
|
||||||
*ierr = OMPI_INT_2_FINT(MPI_Get_address(location, &c_address));
|
*ierr = OMPI_INT_2_FINT(MPI_Get_address(location, &c_address));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
*address = (MPI_Fint) c_address;
|
*address = (MPI_Fint) c_address;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ void mpi_get_processor_name_f(char *name, MPI_Fint *resultlen, MPI_Fint *ierr)
|
|||||||
|
|
||||||
*ierr = OMPI_INT_2_FINT(MPI_Get_processor_name(name,
|
*ierr = OMPI_INT_2_FINT(MPI_Get_processor_name(name,
|
||||||
OMPI_SINGLE_NAME_CONVERT(resultlen)));
|
OMPI_SINGLE_NAME_CONVERT(resultlen)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(resultlen);
|
OMPI_SINGLE_INT_2_FINT(resultlen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@ void mpi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr)
|
|||||||
|
|
||||||
*ierr = OMPI_INT_2_FINT(MPI_Get_version(OMPI_SINGLE_NAME_CONVERT(version),
|
*ierr = OMPI_INT_2_FINT(MPI_Get_version(OMPI_SINGLE_NAME_CONVERT(version),
|
||||||
OMPI_SINGLE_NAME_CONVERT(subversion)));
|
OMPI_SINGLE_NAME_CONVERT(subversion)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(version);
|
OMPI_SINGLE_INT_2_FINT(version);
|
||||||
OMPI_SINGLE_INT_2_FINT(subversion);
|
OMPI_SINGLE_INT_2_FINT(subversion);
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ void mpi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex,
|
|||||||
OMPI_FINT_2_INT(*maxedges),
|
OMPI_FINT_2_INT(*maxedges),
|
||||||
OMPI_ARRAY_NAME_CONVERT(index),
|
OMPI_ARRAY_NAME_CONVERT(index),
|
||||||
OMPI_ARRAY_NAME_CONVERT(edges)));
|
OMPI_ARRAY_NAME_CONVERT(edges)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_ARRAY_INT_2_FINT(index, *maxindex);
|
OMPI_ARRAY_INT_2_FINT(index, *maxindex);
|
||||||
OMPI_ARRAY_INT_2_FINT(edges, *maxedges);
|
OMPI_ARRAY_INT_2_FINT(edges, *maxedges);
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ void mpi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *index,
|
|||||||
OMPI_ARRAY_NAME_CONVERT(index),
|
OMPI_ARRAY_NAME_CONVERT(index),
|
||||||
OMPI_ARRAY_NAME_CONVERT(edges),
|
OMPI_ARRAY_NAME_CONVERT(edges),
|
||||||
OMPI_SINGLE_NAME_CONVERT(nrank)));
|
OMPI_SINGLE_NAME_CONVERT(nrank)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(nrank);
|
OMPI_SINGLE_INT_2_FINT(nrank);
|
||||||
}
|
}
|
||||||
OMPI_ARRAY_FINT_2_INT_CLEANUP(edges);
|
OMPI_ARRAY_FINT_2_INT_CLEANUP(edges);
|
||||||
|
@ -68,7 +68,7 @@ void mpi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank,
|
|||||||
*ierr = OMPI_INT_2_FINT(MPI_Graph_neighbors_count(c_comm,
|
*ierr = OMPI_INT_2_FINT(MPI_Graph_neighbors_count(c_comm,
|
||||||
OMPI_FINT_2_INT(*rank),
|
OMPI_FINT_2_INT(*rank),
|
||||||
OMPI_SINGLE_NAME_CONVERT(nneighbors)));
|
OMPI_SINGLE_NAME_CONVERT(nneighbors)));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(nneighbors);
|
OMPI_SINGLE_INT_2_FINT(nneighbors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -73,7 +73,7 @@ void mpi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank,
|
|||||||
OMPI_FINT_2_INT(*maxneighbors),
|
OMPI_FINT_2_INT(*maxneighbors),
|
||||||
OMPI_ARRAY_NAME_CONVERT(neighbors)
|
OMPI_ARRAY_NAME_CONVERT(neighbors)
|
||||||
));
|
));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_ARRAY_INT_2_FINT(neighbors, *maxneighbors);
|
OMPI_ARRAY_INT_2_FINT(neighbors, *maxneighbors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ void mpi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes,
|
|||||||
OMPI_SINGLE_NAME_CONVERT(nnodes),
|
OMPI_SINGLE_NAME_CONVERT(nnodes),
|
||||||
OMPI_SINGLE_NAME_CONVERT(nedges)
|
OMPI_SINGLE_NAME_CONVERT(nedges)
|
||||||
));
|
));
|
||||||
if (OMPI_FINT_2_INT(*ierr)) {
|
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
|
||||||
OMPI_SINGLE_INT_2_FINT(nnodes);
|
OMPI_SINGLE_INT_2_FINT(nnodes);
|
||||||
OMPI_SINGLE_INT_2_FINT(nedges);
|
OMPI_SINGLE_INT_2_FINT(nedges);
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user