Skip to content

Commit ecc0c38

Browse files
jtrongejtronge
committed
Convert Fortran file_read_* functions
Signed-off-by: Jake Tronge <jtronge@lanl.gov>
1 parent 2e9d8c6 commit ecc0c38

26 files changed

+62
-679
lines changed

‎ompi/mpi/fortran/use-mpi-f08/Makefile.am‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,6 @@ mpi_api_files = \
202202
file_get_view_f08.F90 \
203203
file_open_f08.F90 \
204204
file_preallocate_f08.F90 \
205-
file_read_all_begin_f08.F90 \
206-
file_read_all_end_f08.F90 \
207-
file_read_all_f08.F90 \
208-
file_read_at_all_begin_f08.F90 \
209-
file_read_at_all_end_f08.F90 \
210-
file_read_at_all_f08.F90 \
211-
file_read_at_f08.F90 \
212-
file_read_f08.F90 \
213-
file_read_ordered_begin_f08.F90 \
214-
file_read_ordered_end_f08.F90 \
215-
file_read_ordered_f08.F90 \
216-
file_read_shared_f08.F90 \
217205
file_seek_f08.F90 \
218206
file_seek_shared_f08.F90 \
219207
file_set_atomicity_f08.F90 \

‎ompi/mpi/fortran/use-mpi-f08/Makefile.prototype_files‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,18 @@ ready_prototype_files = \
157157
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_ts.c.in \
158158
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_ts.c.in \
159159
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_ts.c.in \
160+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_ts.c.in \
161+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_ts.c.in \
162+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_ts.c.in \
163+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_ts.c.in \
164+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_ts.c.in \
165+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_ts.c.in \
166+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_ts.c.in \
167+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_ts.c.in \
168+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_ts.c.in \
169+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_ts.c.in \
170+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_shared_ts.c.in \
171+
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ts.c.in \
160172
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_ts.c.in \
161173
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_ts.c.in \
162174
$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_ts.c.in \

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_f08.F90‎

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

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_ts.c.in‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,14 @@
1919
* $HEADER$
2020
*/
2121

22-
#include "ompi_config.h"
23-
24-
#include "ompi/file/file.h"
25-
#include "ompi/errhandler/errhandler.h"
26-
#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
27-
#include "ompi/mpi/fortran/base/constants.h"
28-
29-
static const char FUNC_NAME[] = "MPI_File_read_all_begin";
30-
31-
void ompi_file_read_all_begin_ts(MPI_Fint *fh, CFI_cdesc_t *x,
32-
MPI_Fint *count, MPI_Fint *datatype,
33-
MPI_Fint *ierr)
22+
PROTOTYPE VOID file_read_all_begin(FILE fh, BUFFER_ASYNC x,
23+
COUNT count, DATATYPE datatype)
3424
{
3525
int c_ierr;
3626
MPI_File c_fh = PMPI_File_f2c(*fh);
3727
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
3828
void *buf = OMPI_CFI_BASE_ADDR(x);
39-
int c_count = OMPI_FINT_2_INT(*count);
29+
@COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
4030

4131
OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
4232
if (MPI_SUCCESS != c_ierr) {
@@ -45,9 +35,7 @@ void ompi_file_read_all_begin_ts(MPI_Fint *fh, CFI_cdesc_t *x,
4535
return;
4636
}
4737

48-
c_ierr = PMPI_File_read_all_begin(c_fh, OMPI_F2C_BOTTOM(buf),
49-
c_count,
50-
c_datatype);
38+
c_ierr = @INNER_CALL@(c_fh, OMPI_F2C_BOTTOM(buf), c_count, c_datatype);
5139

5240
if (c_datatype != c_type) {
5341
ompi_datatype_destroy(&c_datatype);

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_end_f08.F90‎

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

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_end_ts.c.in‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,7 @@
2020
* $HEADER$
2121
*/
2222

23-
#include "ompi_config.h"
24-
25-
#include "ompi/file/file.h"
26-
#include "ompi/errhandler/errhandler.h"
27-
#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
28-
#include "ompi/mpi/fortran/mpif-h/status-conversion.h"
29-
#include "ompi/mpi/fortran/base/constants.h"
30-
31-
void ompi_file_read_all_end_ts(MPI_Fint *fh, CFI_cdesc_t *x, MPI_Fint *status,
32-
MPI_Fint *ierr)
23+
PROTOTYPE VOID file_read_all_end(FILE fh, BUFFER_ASYNC x, STATUS_OUT status)
3324
{
3425
int c_ierr;
3526
void *buf = OMPI_CFI_BASE_ADDR(x);

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_f08.F90‎

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

‎ompi/mpi/fortran/use-mpi-f08/file_read_all_ts.c.in‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,14 @@
2020
* $HEADER$
2121
*/
2222

23-
#include "ompi_config.h"
24-
25-
#include "ompi/file/file.h"
26-
#include "ompi/errhandler/errhandler.h"
27-
#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
28-
#include "ompi/mpi/fortran/mpif-h/status-conversion.h"
29-
#include "ompi/mpi/fortran/base/constants.h"
30-
31-
static const char FUNC_NAME[] = "MPI_File_read_all";
32-
33-
void ompi_file_read_all_ts(MPI_Fint *fh, CFI_cdesc_t *x, MPI_Fint *count,
34-
MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
23+
PROTOTYPE VOID file_read_all(FILE fh, BUFFER x, COUNT count,
24+
DATATYPE datatype, STATUS_OUT status)
3525
{
3626
int c_ierr;
3727
MPI_File c_fh = PMPI_File_f2c(*fh);
3828
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
3929
void *buf = OMPI_CFI_BASE_ADDR(x);
40-
int c_count = OMPI_FINT_2_INT(*count);
30+
@COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
4131
OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2)
4232

4333
OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status)
@@ -49,9 +39,8 @@ void ompi_file_read_all_ts(MPI_Fint *fh, CFI_cdesc_t *x, MPI_Fint *count,
4939
return;
5040
}
5141

52-
c_ierr = PMPI_File_read_all(c_fh, OMPI_F2C_BOTTOM(buf),
53-
c_count,
54-
c_datatype, c_status);
42+
c_ierr = @INNER_CALL@(c_fh, OMPI_F2C_BOTTOM(buf), c_count, c_datatype,
43+
c_status);
5544

5645
if (c_datatype != c_type) {
5746
ompi_datatype_destroy(&c_datatype);

‎ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_f08.F90‎

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

‎ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_ts.c.in‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,15 @@
1919
* $HEADER$
2020
*/
2121

22-
#include "ompi_config.h"
23-
24-
#include "ompi/file/file.h"
25-
#include "ompi/errhandler/errhandler.h"
26-
#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
27-
#include "ompi/mpi/fortran/base/constants.h"
28-
29-
static const char FUNC_NAME[] = "MPI_File_read_at_all_begin";
30-
31-
void ompi_file_read_at_all_begin_ts(MPI_Fint *fh, MPI_Offset *offset,
32-
CFI_cdesc_t *x, MPI_Fint *count,
33-
MPI_Fint *datatype, MPI_Fint *ierr)
22+
PROTOTYPE VOID file_read_at_all_begin(FILE fh, OFFSET offset,
23+
BUFFER_ASYNC x, COUNT count,
24+
DATATYPE datatype)
3425
{
3526
int c_ierr;
3627
MPI_File c_fh = PMPI_File_f2c(*fh);
3728
MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
3829
void *buf = OMPI_CFI_BASE_ADDR(x);
39-
int c_count = OMPI_FINT_2_INT(*count);
30+
@COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
4031

4132
OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
4233
if (MPI_SUCCESS != c_ierr) {
@@ -45,11 +36,8 @@ void ompi_file_read_at_all_begin_ts(MPI_Fint *fh, MPI_Offset *offset,
4536
return;
4637
}
4738

48-
c_ierr = PMPI_File_read_at_all_begin(c_fh,
49-
(MPI_Offset) *offset,
50-
OMPI_F2C_BOTTOM(buf),
51-
c_count,
52-
c_datatype);
39+
c_ierr = @INNER_CALL@(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf),
40+
c_count, c_datatype);
5341

5442
if (c_datatype != c_type) {
5543
ompi_datatype_destroy(&c_datatype);

0 commit comments

Comments
 (0)