Skip to content

Commit d0980af

Browse files
committed
fortran: remove all references to MPI_Type_hindexed (removed in MPI 3.0)
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 32e5058 commit d0980af

File tree

11 files changed

+6
-371
lines changed

11 files changed

+6
-371
lines changed

ompi/mca/coll/libnbc/nbc_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static inline int NBC_Unpack(void *src, int srccount, MPI_Datatype srctype, void
530530
* types are contiguous), we can just use a single memcpy */
531531
res = ompi_datatype_get_extent (srctype, &lb, &ext);
532532
if (OMPI_SUCCESS != res) {
533-
NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res);
533+
NBC_Error ("MPI Error in MPI_Type_get_extent() (%i)", res);
534534
return res;
535535
}
536536

ompi/mca/io/romio321/romio/adio/include/adioi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ typedef struct view_state
624624
ADIO_Offset disp; /* file view params*/
625625
ADIO_Offset byte_off;
626626
ADIO_Offset sz;
627-
ADIO_Offset ext; /* preserved extent from MPI_Type_extent */
627+
ADIO_Offset ext; /* preserved extent from MPI_Type_get_extent */
628628
ADIO_Offset type_sz;
629629

630630
/* Current state */

ompi/mca/io/romio321/romio/test/types_with_zeros.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static int test_indexed_with_zeros(char *filename, int testcase)
7676
MPI_Type_indexed(num, blocklen, indices, MPI_INT, &filetype);
7777
break;
7878
case HINDEXED:
79-
MPI_Type_hindexed(num, blocklen, addrs, MPI_INT, &filetype);
79+
MPI_Type_create_hindexed(num, blocklen, addrs, MPI_INT, &filetype);
8080
break;
8181
case STRUCT:
8282
MPI_Type_create_struct(num, blocklen, addrs, types, &filetype);

ompi/mpi/fortran/mpif-h/prototypes_mpi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ PN2(void, MPI_Type_create_subarray, mpi_type_create_subarray, MPI_TYPE_CREATE_SU
375375
PN2(void, MPI_Type_create_resized, mpi_type_create_resized, MPI_TYPE_CREATE_RESIZED, (MPI_Fint *oldtype, MPI_Aint *lb, MPI_Aint *extent, MPI_Fint *newtype, MPI_Fint *ierr));
376376
PN2(void, MPI_Type_delete_attr, mpi_type_delete_attr, MPI_TYPE_DELETE_ATTR, (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Fint *ierr));
377377
PN2(void, MPI_Type_dup, mpi_type_dup, MPI_TYPE_DUP, (MPI_Fint *type, MPI_Fint *newtype, MPI_Fint *ierr));
378-
PN2(void, MPI_Type_extent, mpi_type_extent, MPI_TYPE_EXTENT, (MPI_Fint *type, MPI_Fint *extent, MPI_Fint *ierr));
379378
PN2(void, MPI_Type_free, mpi_type_free, MPI_TYPE_FREE, (MPI_Fint *type, MPI_Fint *ierr));
380379
PN2(void, MPI_Type_free_keyval, mpi_type_free_keyval, MPI_TYPE_FREE_KEYVAL, (MPI_Fint *type_keyval, MPI_Fint *ierr));
381380
PN2(void, MPI_Type_get_attr, mpi_type_get_attr, MPI_TYPE_GET_ATTR, (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr));
@@ -386,7 +385,6 @@ PN2(void, MPI_Type_get_extent_x, mpi_type_get_extent_x, MPI_TYPE_GET_EXTENT_X, (
386385
PN2(void, MPI_Type_get_name, mpi_type_get_name, MPI_TYPE_GET_NAME, (MPI_Fint *type, char *type_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len));
387386
PN2(void, MPI_Type_get_true_extent, mpi_type_get_true_extent, MPI_TYPE_GET_TRUE_EXTENT, (MPI_Fint *datatype, MPI_Aint *true_lb, MPI_Aint *true_extent, MPI_Fint *ierr));
388387
PN2(void, MPI_Type_get_true_extent_x, mpi_type_get_true_extent_x, MPI_TYPE_GET_TRUE_EXTENT_X, (MPI_Fint *datatype, MPI_Count *true_lb, MPI_Count *true_extent, MPI_Fint *ierr));
389-
PN2(void, MPI_Type_hindexed, mpi_type_hindexed, MPI_TYPE_HINDEXED, (MPI_Fint *count, MPI_Fint *array_of_blocklengths, MPI_Fint *array_of_displacements, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr));
390388
PN2(void, MPI_Type_hvector, mpi_type_hvector, MPI_TYPE_HVECTOR, (MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *stride, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr));
391389
PN2(void, MPI_Type_indexed, mpi_type_indexed, MPI_TYPE_INDEXED, (MPI_Fint *count, MPI_Fint *array_of_blocklengths, MPI_Fint *array_of_displacements, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr));
392390
PN2(void, MPI_Type_lb, mpi_type_lb, MPI_TYPE_LB, (MPI_Fint *type, MPI_Fint *lb, MPI_Fint *ierr));

ompi/mpi/fortran/mpif-h/type_extent_f.c

Lines changed: 0 additions & 81 deletions
This file was deleted.

ompi/mpi/fortran/mpif-h/type_hindexed_f.c

Lines changed: 0 additions & 108 deletions
This file was deleted.

ompi/mpi/man/man3/MPI_Gather.3in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ and the root had executed n calls to
123123
recvcount, recvtype, i, \&...)
124124
.fi
125125
.sp
126-
where extent(recvtype) is the type extent obtained from a call to MPI_Type_extent().
126+
where extent(recvtype) is the type extent obtained from a call to MPI_Type_get_extent().
127127
.sp
128128
An alternative description is that the n messages sent by the processes in the group are concatenated in rank order, and the resulting message is received by the root as if by a call to MPI_RECV(recvbuf, recvcount * n, recvtype, . . . ).
129129
.sp

ompi/mpi/man/man3/MPI_Type_create_resized.3in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ or
8282
where MPI_ADDRESS_KIND is a constant defined in mpif.h
8383
and gives the length of the declared integer in bytes.
8484

85-
.SH NOTE
86-
.ft R
87-
Use of MPI_Type_create_resized is strongly recommended over the old MPI-1 functions MPI_Type_extent and MPI_Type_lb.
88-
8985
.SH ERRORS
9086
Almost all MPI routines return an error value; C routines as the value of the function and Fortran routines in the last argument. C++ functions do not return errors. If the default error handler is set to MPI::ERRORS_THROW_EXCEPTIONS, then on error the C++ exception mechanism will be used to throw an MPI::Exception object.
9187
.sp

ompi/mpi/man/man3/MPI_Type_get_envelope.3in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ MPI_COMBINER_CONTIGUOUS MPI_Type_contiguous
8686
MPI_COMBINER_VECTOR MPI_Type_vector
8787
MPI_COMBINER_HVECTOR MPI_Type_hvector
8888
MPI_COMBINER_INDEXED MPI_Type_indexed
89-
MPI_COMBINER_HINDEXED MPI_Type_hindexed
89+
MPI_COMBINER_HINDEXED MPI_Type_create_hindexed
9090
MPI_COMBINER_INDEXED_BLOCK MPI_Type_create_indexed_block
9191
MPI_COMBINER_STRUCT MPI_Type_struct
9292
MPI_COMBINER_SUBARRAY MPI_Type_create_subarray

ompi/mpi/man/man3/MPI_Type_get_extent.3in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ MPI_Type_get_extent returns the lower bound and the extent of \fIdatatype\fP. Fo
7676

7777
.SH NOTE
7878
.ft R
79-
Use of MPI_Type_get_extent is strongly recommended over the old MPI-1 functions MPI_Type_extent and MPI_Type_lb.
79+
Use of MPI_Type_get_extent is now mandatory since the old MPI-1 functions MPI_Type_extent and MPI_Type_lb have been removed in MPI 3.0.
8080

8181
.SH FORTRAN 77 NOTES
8282
.ft R

0 commit comments

Comments
 (0)