Skip to content

Commit ec6f444

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

File tree

15 files changed

+16
-133
lines changed

15 files changed

+16
-133
lines changed

ompi/datatype/ompi_datatype_create_darray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ cyclic(const int *gsize_array, int dim, int ndims, int nprocs,
136136

137137
if (rem) {
138138
/* if the last block is of size less than blksize, include
139-
it separately using MPI_Type_struct */
139+
it separately using MPI_Type_create_struct */
140140

141141
types [0] = *type_new; types [1] = type_old;
142142
disps [0] = 0; disps [1] = count*stride;

ompi/mca/io/romio321/romio/adio/ad_pvfs2/ad_pvfs2_open.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void ADIOI_PVFS2_Open(ADIO_File fd, int *error_code)
211211
MPI_Get_address(&o_status.error, &offsets[0]);
212212
MPI_Get_address(&o_status.object_ref, &offsets[1]);
213213

214-
MPI_Type_struct(2, lens, offsets, types, &open_status_type);
214+
MPI_Type_create_struct(2, lens, offsets, types, &open_status_type);
215215
MPI_Type_commit(&open_status_type);
216216

217217
/* Assertion: if we hit this Bcast, then all processes collectively

ompi/mca/io/romio321/romio/adio/ad_zoidfs/ad_zoidfs_open.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void ADIOI_ZOIDFS_Open(ADIO_File fd, int *error_code)
118118
MPI_Get_address(&o_status.error, &offsets[0]);
119119
MPI_Get_address(&o_status.handle, &offsets[1]);
120120

121-
MPI_Type_struct(2, lens, offsets, types, &open_status_type);
121+
MPI_Type_create_struct(2, lens, offsets, types, &open_status_type);
122122
MPI_Type_commit(&open_status_type);
123123

124124
/* Assertion: if we hit this Bcast, then all processes collectively

ompi/mca/io/romio321/romio/adio/common/ad_darray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ static int MPIOI_Type_cyclic(int *array_of_gsizes, int dim, int ndims, int nproc
248248

249249
if (rem) {
250250
/* if the last block is of size less than blksize, include
251-
it separately using MPI_Type_struct */
251+
it separately using MPI_Type_create_struct */
252252

253253
types[0] = *type_new;
254254
types[1] = type_old;

ompi/mca/io/romio321/romio/test-internal/io_bounds_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ int run_test (test_param_t *test) {
105105

106106
MPI_Datatype filetype;
107107

108-
MPI_Type_struct (test->type_count, test->type_blocklens,
109-
test->type_indices, test->type_oldtypes, &filetype);
108+
MPI_Type_create_struct (test->type_count, test->type_blocklens,
109+
test->type_indices, test->type_oldtypes, &filetype);
110110
MPI_Type_commit (&filetype);
111111

112112
MPI_File_open (MPI_COMM_WORLD, "test_file.txt" , MPI_MODE_RDWR,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
7171
t[1] = typevec;
7272
t[2] = MPI_UB;
7373

74-
MPI_Type_struct(3, b, d, t, &newtype);
74+
MPI_Type_create_struct(3, b, d, t, &newtype);
7575
MPI_Type_commit(&newtype);
7676
MPI_Type_free(&typevec);
7777

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
7575
t[2] = MPI_UB;
7676

7777
/* keep the struct, ditch the vector */
78-
MPI_Type_struct(3, b, d, t, &newtype);
78+
MPI_Type_create_struct(3, b, d, t, &newtype);
7979
MPI_Type_commit(&newtype);
8080
MPI_Type_free(&typevec);
8181

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
6969
t[1] = typevec;
7070
t[2] = MPI_UB;
7171

72-
MPI_Type_struct(3, b, d, t, &newtype);
72+
MPI_Type_create_struct(3, b, d, t, &newtype);
7373
MPI_Type_commit(&newtype);
7474
MPI_Type_free(&typevec);
7575

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ int test_file(char *filename, int mynod, int nprocs, char * cb_hosts, const char
384384
t[1] = typevec;
385385
t[2] = MPI_UB;
386386

387-
MPI_Type_struct(3, b, d, t, &newtype);
387+
MPI_Type_create_struct(3, b, d, t, &newtype);
388388
MPI_Type_commit(&newtype);
389389
MPI_Type_free(&typevec);
390390

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ PN2(void, MPI_Type_set_attr, mpi_type_set_attr, MPI_TYPE_SET_ATTR, (MPI_Fint *ty
391391
PN2(void, MPI_Type_set_name, mpi_type_set_name, MPI_TYPE_SET_NAME, (MPI_Fint *type, char *type_name, MPI_Fint *ierr, int name_len));
392392
PN2(void, MPI_Type_size, mpi_type_size, MPI_TYPE_SIZE, (MPI_Fint *type, MPI_Fint *size, MPI_Fint *ierr));
393393
PN2(void, MPI_Type_size_x, mpi_type_size_x, MPI_TYPE_SIZE_X, (MPI_Fint *type, MPI_Count *size, MPI_Fint *ierr));
394-
PN2(void, MPI_Type_struct, mpi_type_struct, MPI_TYPE_STRUCT, (MPI_Fint *count, MPI_Fint *array_of_blocklengths, MPI_Fint *array_of_displacements, MPI_Fint *array_of_types, MPI_Fint *newtype, MPI_Fint *ierr));
395394
PN2(void, MPI_Type_ub, mpi_type_ub, MPI_TYPE_UB, (MPI_Fint *mtype, MPI_Fint *ub, MPI_Fint *ierr));
396395
PN2(void, MPI_Type_vector, mpi_type_vector, MPI_TYPE_VECTOR, (MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *stride, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr));
397396
PN2(void, MPI_Unpack, mpi_unpack, MPI_UNPACK, (char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *comm, MPI_Fint *ierr));

0 commit comments

Comments
 (0)