Skip to content

Commit 360c797

Browse files
committed
fortran: PR feedback
Signed-off-by: Howard Pritchard <[email protected]>
1 parent a391063 commit 360c797

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

ompi/mpi/bindings/bindings.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,18 @@ def main():
3333
parser_fortran = subparsers.add_parser('fortran', help='subcommand for generating Fortran code')
3434
parser_fortran.add_argument('--generate-ts-suffix', action="store_true",
3535
help='generate ts suffixes for appropriate routines')
36+
parser_fortran.add_argument('--fort-std', choices=('f90', 'f08'),
37+
help='fortran standard to use for fortran module and code generation')
3638
# Handler for generating actual code
3739
subparsers_fortran = parser_fortran.add_subparsers()
3840
parser_code = subparsers_fortran.add_parser('code', help='generate binding code')
3941
parser_code.set_defaults(handler=lambda args, out: fortran.generate_code(args, out))
40-
parser_code.add_argument('--lang', choices=('fortran', 'c', 'f90'),
42+
parser_code.add_argument('--lang', choices=('fortran', 'c'),
4143
help='language to generate (only for code subparser)')
42-
parser_code.add_argument('--fort-std', choices=('f90', 'f08'),
43-
help='fortran standard to use for fortran module generation')
4444
# Handler for generating the Fortran interface files
4545
parser_interface = subparsers_fortran.add_parser('interface',
4646
help='generate Fortran interface specifications')
4747
parser_interface.set_defaults(handler=lambda args, out: fortran.generate_interface(args, out))
48-
parser_interface.add_argument('--fort-std', choices=('f90', 'f08'),
49-
help='fortran standard to use for fortran module generation')
5048
# The prototype files argument must come last and be specified for both subparsers
5149
for f_subparser in [parser_code, parser_interface]:
5250
f_subparser.add_argument('--prototype-files', nargs='+', help='prototype files to generate code for')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void ompi_request_get_status_some_f(MPI_Fint *incount, MPI_Fint *array_of_reques
116116
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
117117

118118
if (MPI_SUCCESS == c_ierr) {
119-
OMPI_SINGLE_INT_2_FINT(outcount);
119+
OMPI_SINGLE_INT_2_FINT(*outcount);
120120
OMPI_ARRAY_INT_2_FINT(array_of_indices, *incount);
121121

122122
/* Increment indexes by one for fortran conventions */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ mpi-f08-interfaces-generated.h: $(template_files)
9393
--output $(abs_builddir)/$@ \
9494
fortran \
9595
$(gen_ts) \
96-
interface \
9796
--fort-std f08 \
97+
interface \
9898
--prototype-files $(template_files)
9999

100100
# Delete generated file on maintainer-clean

ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ mpi-ignore-tkr-interfaces-generated.h: $(template_files)
148148
--output $(abs_builddir)/$@ \
149149
fortran \
150150
$(gen_ts) \
151-
interface \
152151
--fort-std f90 \
152+
interface \
153153
--prototype-files $(template_files)
154154

155155
#

0 commit comments

Comments
 (0)