Skip to content

Commit 8484636

Browse files
jtrongejtronge
committed
Update script invocations with prototype files
Signed-off-by: Jake Tronge <jtronge@lanl.gov>
1 parent 2b01a67 commit 8484636

File tree

7 files changed

+4900
-110
lines changed

7 files changed

+4900
-110
lines changed

‎config/ompi_config_files.m4‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
4242
ompi/mpi/fortran/use-mpi-f08/Makefile
4343
ompi/mpi/fortran/use-mpi-f08/base/Makefile
4444
ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
45-
ompi/mpi/fortran/use-mpi-f08/ts/Makefile
4645
ompi/mpi/fortran/use-mpi-f08/mod/Makefile
4746
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.h
48-
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-rename.h
4947
ompi/mpi/fortran/mpiext-use-mpi/Makefile
5048
ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile
5149
ompi/mpi/bindings/ompi_bindings/compiler.py

‎ompi/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ SUBDIRS = \
8888
mpi/fortran/use-mpi-f08/base \
8989
mpi/fortran/use-mpi-f08/mod \
9090
mpi/fortran/use-mpi-f08/bindings \
91-
mpi/fortran/use-mpi-f08/ts \
9291
$(OMPI_MPIEXT_USEMPIF08_DIRS) \
9392
mpi/fortran/use-mpi-f08 \
9493
mpi/fortran/mpiext-use-mpi-f08 \

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

Lines changed: 5 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -583,115 +583,17 @@ EXTRA_DIST = interface.json
583583

584584
if OMPI_GENERATE_BINDINGS
585585

586-
prototype_files = \
587-
accumulate_ts.c.in \
588-
bsend_init_ts.c.in \
589-
bsend_ts.c.in \
590-
buffer_attach_ts.c.in \
591-
compare_and_swap_ts.c.in \
592-
f_sync_reg_ts.c.in \
593-
fetch_and_op_ts.c.in \
594-
file_iread_all_ts.c.in \
595-
file_iread_at_all_ts.c.in \
596-
file_iread_at_ts.c.in \
597-
file_iread_shared_ts.c.in \
598-
file_iread_ts.c.in \
599-
file_iwrite_all_ts.c.in \
600-
file_iwrite_at_all_ts.c.in \
601-
file_iwrite_at_ts.c.in \
602-
file_iwrite_shared_ts.c.in \
603-
file_iwrite_ts.c.in \
604-
file_read_all_begin_ts.c.in \
605-
file_read_all_end_ts.c.in \
606-
file_read_all_ts.c.in \
607-
file_read_at_all_begin_ts.c.in \
608-
file_read_at_all_end_ts.c.in \
609-
file_read_at_all_ts.c.in \
610-
file_read_at_ts.c.in \
611-
file_read_ordered_begin_ts.c.in \
612-
file_read_ordered_end_ts.c.in \
613-
file_read_ordered_ts.c.in \
614-
file_read_shared_ts.c.in \
615-
file_read_ts.c.in \
616-
file_write_all_begin_ts.c.in \
617-
file_write_all_end_ts.c.in \
618-
file_write_all_ts.c.in \
619-
file_write_at_all_begin_ts.c.in \
620-
file_write_at_all_end_ts.c.in \
621-
file_write_at_all_ts.c.in \
622-
file_write_at_ts.c.in \
623-
file_write_ordered_begin_ts.c.in \
624-
file_write_ordered_end_ts.c.in \
625-
file_write_ordered_ts.c.in \
626-
file_write_shared_ts.c.in \
627-
file_write_ts.c.in \
628-
free_mem_ts.c.in \
629-
get_accumulate_ts.c.in \
630-
get_address_ts.c.in \
631-
get_ts.c.in \
632-
iallgather_ts.c.in \
633-
iallgatherv_ts.c.in \
634-
iallreduce_ts.c.in \
635-
ialltoall_ts.c.in \
636-
ialltoallv_ts.c.in \
637-
ialltoallw_ts.c.in \
638-
ibcast_ts.c.in \
639-
ibsend_ts.c.in \
640-
iexscan_ts.c.in \
641-
igather_ts.c.in \
642-
igatherv_ts.c.in \
643-
imrecv_ts.c.in \
644-
ineighbor_allgather_ts.c.in \
645-
ineighbor_allgatherv_ts.c.in \
646-
ineighbor_alltoall_ts.c.in \
647-
ineighbor_alltoallv_ts.c.in \
648-
ineighbor_alltoallw_ts.c.in \
649-
irecv_ts.c.in \
650-
ireduce_scatter_block_ts.c.in \
651-
ireduce_scatter_ts.c.in \
652-
ireduce_ts.c.in \
653-
irsend_ts.c.in \
654-
iscan_ts.c.in \
655-
iscatter_ts.c.in \
656-
iscatterv_ts.c.in \
657-
isend_ts.c.in \
658-
isendrecv_replace_ts.c.in \
659-
isendrecv_ts.c.in \
660-
issend_ts.c.in \
661-
mrecv_ts.c.in \
662-
pack_external_ts.c.in \
663-
pack_ts.c.in \
664-
put_ts.c.in \
665-
raccumulate_ts.c.in \
666-
recv_init_ts.c.in \
667-
recv_ts.c.in \
668-
rget_accumulate_ts.c.in \
669-
rget_ts.c.in \
670-
rput_ts.c.in \
671-
rsend_init_ts.c.in \
672-
rsend_ts.c.in \
673-
send_init_ts.c.in \
674-
send_ts.c.in \
675-
sendrecv_replace_ts.c.in \
676-
sendrecv_ts.c.in \
677-
ssend_init_ts.c.in \
678-
ssend_ts.c.in \
679-
ts.c.in \
680-
unpack_external_ts.c.in \
681-
unpack_ts.c.in \
682-
win_attach_ts.c.in \
683-
win_create_ts.c.in \
684-
win_detach_ts.c.in
685-
686-
api_f08_generated.F90: interface.json
586+
include Makefile.prototype_files
587+
588+
api_f08_generated.F90: $(prototype_files)
687589
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
688590
--builddir $(abs_top_builddir) \
689591
--srcdir $(abs_top_srcdir) \
690592
--output $(abs_builddir)/$@ \
691593
fortran \
692-
--prototypes $(abs_srcdir)/$< \
693594
code \
694-
fortran
595+
fortran \
596+
$(prototype_files)
695597

696598
# Delete generated file on maintainer-clean
697599
MAINTAINERCLEANFILES = api_f08_generated.F90

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
2+
prototype_files = \
3+
accumulate_ts.c.in \
4+
bsend_init_ts.c.in \
5+
bsend_ts.c.in \
6+
buffer_attach_ts.c.in \
7+
compare_and_swap_ts.c.in \
8+
f_sync_reg_ts.c.in \
9+
fetch_and_op_ts.c.in \
10+
file_iread_all_ts.c.in \
11+
file_iread_at_all_ts.c.in \
12+
file_iread_at_ts.c.in \
13+
file_iread_shared_ts.c.in \
14+
file_iread_ts.c.in \
15+
file_iwrite_all_ts.c.in \
16+
file_iwrite_at_all_ts.c.in \
17+
file_iwrite_at_ts.c.in \
18+
file_iwrite_shared_ts.c.in \
19+
file_iwrite_ts.c.in \
20+
file_read_all_begin_ts.c.in \
21+
file_read_all_end_ts.c.in \
22+
file_read_all_ts.c.in \
23+
file_read_at_all_begin_ts.c.in \
24+
file_read_at_all_end_ts.c.in \
25+
file_read_at_all_ts.c.in \
26+
file_read_at_ts.c.in \
27+
file_read_ordered_begin_ts.c.in \
28+
file_read_ordered_end_ts.c.in \
29+
file_read_ordered_ts.c.in \
30+
file_read_shared_ts.c.in \
31+
file_read_ts.c.in \
32+
file_write_all_begin_ts.c.in \
33+
file_write_all_end_ts.c.in \
34+
file_write_all_ts.c.in \
35+
file_write_at_all_begin_ts.c.in \
36+
file_write_at_all_end_ts.c.in \
37+
file_write_at_all_ts.c.in \
38+
file_write_at_ts.c.in \
39+
file_write_ordered_begin_ts.c.in \
40+
file_write_ordered_end_ts.c.in \
41+
file_write_ordered_ts.c.in \
42+
file_write_shared_ts.c.in \
43+
file_write_ts.c.in \
44+
free_mem_ts.c.in \
45+
get_accumulate_ts.c.in \
46+
get_address_ts.c.in \
47+
get_ts.c.in \
48+
iallgather_ts.c.in \
49+
iallgatherv_ts.c.in \
50+
iallreduce_ts.c.in \
51+
ialltoall_ts.c.in \
52+
ialltoallv_ts.c.in \
53+
ialltoallw_ts.c.in \
54+
ibcast_ts.c.in \
55+
ibsend_ts.c.in \
56+
iexscan_ts.c.in \
57+
igather_ts.c.in \
58+
igatherv_ts.c.in \
59+
imrecv_ts.c.in \
60+
ineighbor_allgather_ts.c.in \
61+
ineighbor_allgatherv_ts.c.in \
62+
ineighbor_alltoall_ts.c.in \
63+
ineighbor_alltoallv_ts.c.in \
64+
ineighbor_alltoallw_ts.c.in \
65+
irecv_ts.c.in \
66+
ireduce_scatter_block_ts.c.in \
67+
ireduce_scatter_ts.c.in \
68+
ireduce_ts.c.in \
69+
irsend_ts.c.in \
70+
iscan_ts.c.in \
71+
iscatter_ts.c.in \
72+
iscatterv_ts.c.in \
73+
isend_ts.c.in \
74+
isendrecv_replace_ts.c.in \
75+
isendrecv_ts.c.in \
76+
issend_ts.c.in \
77+
mrecv_ts.c.in \
78+
pack_external_ts.c.in \
79+
pack_ts.c.in \
80+
put_ts.c.in \
81+
raccumulate_ts.c.in \
82+
recv_init_ts.c.in \
83+
recv_ts.c.in \
84+
rget_accumulate_ts.c.in \
85+
rget_ts.c.in \
86+
rput_ts.c.in \
87+
rsend_init_ts.c.in \
88+
rsend_ts.c.in \
89+
send_init_ts.c.in \
90+
send_ts.c.in \
91+
sendrecv_replace_ts.c.in \
92+
sendrecv_ts.c.in \
93+
ssend_init_ts.c.in \
94+
ssend_ts.c.in \
95+
ts.c.in \
96+
unpack_external_ts.c.in \
97+
unpack_ts.c.in \
98+
win_attach_ts.c.in \
99+
win_create_ts.c.in \
100+
win_detach_ts.c.in

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,20 @@ endif
4949
# binding scripts in order to generate the specific version for their compiler.
5050
#
5151
if OMPI_GENERATE_BINDINGS
52-
api_f08_generated.c: ../interface.json
52+
53+
include ../Makefile.prototype_files
54+
prototype_files = $(prototype_files:%=../%)
55+
56+
api_f08_generated.c: $(prototype_files)
5357
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
5458
--builddir $(abs_top_builddir) \
5559
--srcdir $(abs_top_srcdir) \
5660
--output $(abs_builddir)/$@ \
5761
fortran \
5862
--prototypes $(abs_srcdir)/$< \
5963
code \
60-
c
64+
c \
65+
$(prototype_files)
6166

6267
api_f08_ts_generated.c: ../interface.json
6368
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,19 @@ config_h = \
7878

7979
# Generate the Fortran interfaces
8080
if OMPI_GENERATE_BINDINGS
81-
mpi-f08-interfaces-generated.h: ../interface.json
81+
82+
include ../Makefile.prototype_files
83+
prototype_files_mod = $(prototype_files:%=../%)
84+
85+
mpi-f08-interfaces-generated.h: $(prototype_files_mod)
8286
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
8387
--builddir $(abs_top_builddir) \
8488
--srcdir $(abs_top_srcdir) \
8589
--output $(abs_builddir)/$@ \
8690
fortran \
8791
--prototypes $(abs_srcdir)/$< \
88-
interface
92+
interface \
93+
$(prototype_files_mod)
8994

9095
# Delete generated file on maintainer-clean
9196
MAINTAINERCLEANFILES = mpi-f08-interfaces-generated.h

0 commit comments

Comments
 (0)