Skip to content

Commit 479bd68

Browse files
committed
ABI library: don't include functions in 19.3.4/5
in the library as they are not part of the ABI. Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent be305d9 commit 479bd68

File tree

1 file changed

+37
-30
lines changed

1 file changed

+37
-30
lines changed

ompi/mpi/c/Makefile.am

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ prototype_sources = \
9494
close_port.c.in \
9595
comm_accept.c.in \
9696
comm_attach_buffer.c.in \
97-
comm_c2f.c.in \
9897
comm_call_errhandler.c.in \
9998
comm_compare.c.in \
10099
comm_connect.c.in \
@@ -108,7 +107,6 @@ prototype_sources = \
108107
comm_disconnect.c.in \
109108
comm_dup.c.in \
110109
comm_dup_with_info.c.in \
111-
comm_f2c.c.in \
112110
comm_flush_buffer.c.in \
113111
comm_free.c.in \
114112
comm_free_keyval.c.in \
@@ -141,20 +139,16 @@ prototype_sources = \
141139
dist_graph_create.c.in \
142140
dist_graph_neighbors.c.in \
143141
dist_graph_neighbors_count.c.in \
144-
errhandler_c2f.c.in \
145-
errhandler_f2c.c.in \
146142
errhandler_free.c.in \
147143
error_class.c.in \
148144
error_string.c.in \
149145
exscan.c.in \
150146
exscan_init.c.in \
151147
fetch_and_op.c.in \
152-
file_c2f.c.in \
153148
file_call_errhandler.c.in \
154149
file_close.c.in \
155150
file_create_errhandler.c.in \
156151
file_delete.c.in \
157-
file_f2c.c.in \
158152
file_get_amode.c.in \
159153
file_get_atomicity.c.in \
160154
file_get_byte_offset.c.in \
@@ -235,11 +229,9 @@ prototype_sources = \
235229
graph_neighbors_count.c.in \
236230
grequest_complete.c.in \
237231
grequest_start.c.in \
238-
group_c2f.c.in \
239232
group_compare.c.in \
240233
group_difference.c.in \
241234
group_excl.c.in \
242-
group_f2c.c.in \
243235
group_free.c.in \
244236
group_from_session_pset.c.in \
245237
group_incl.c.in \
@@ -268,12 +260,10 @@ prototype_sources = \
268260
ineighbor_alltoall.c.in \
269261
ineighbor_alltoallv.c.in \
270262
ineighbor_alltoallw.c.in \
271-
info_c2f.c.in \
272263
info_create.c.in \
273264
info_create_env.c.in \
274265
info_delete.c.in \
275266
info_dup.c.in \
276-
info_f2c.c.in \
277267
info_free.c.in \
278268
info_get.c.in \
279269
info_get_nkeys.c.in \
@@ -303,8 +293,6 @@ prototype_sources = \
303293
issend.c.in \
304294
is_thread_main.c.in \
305295
lookup_name.c.in \
306-
message_c2f.c.in \
307-
message_f2c.c.in \
308296
mprobe.c.in \
309297
mrecv.c.in \
310298
neighbor_allgather.c.in \
@@ -318,11 +306,9 @@ prototype_sources = \
318306
neighbor_alltoallw.c.in \
319307
neighbor_alltoallw_init.c.in \
320308
open_port.c.in \
321-
op_c2f.c.in \
322309
op_commutative.c.in \
323310
op_create.c.in \
324311
op_free.c.in \
325-
op_f2c.c.in \
326312
pack.c.in \
327313
pack_external.c.in \
328314
pack_external_size.c.in \
@@ -348,8 +334,6 @@ prototype_sources = \
348334
reduce_scatter.c.in \
349335
reduce_scatter_init.c.in \
350336
register_datarep.c.in \
351-
request_c2f.c.in \
352-
request_f2c.c.in \
353337
remove_error_class.c.in \
354338
remove_error_code.c.in \
355339
remove_error_string.c.in \
@@ -374,11 +358,11 @@ prototype_sources = \
374358
sendrecv.c.in \
375359
sendrecv_replace.c.in \
376360
session_attach_buffer.c.in \
377-
session_c2f.c.in \
378361
session_call_errhandler.c.in \
379362
session_create_errhandler.c.in \
380363
session_detach_buffer.c.in \
381-
session_f2c.c.in \
364+
session_call_errhandler.c.in \
365+
session_create_errhandler.c.in \
382366
session_finalize.c.in \
383367
session_flush_buffer.c.in \
384368
session_get_errhandler.c.in \
@@ -393,12 +377,6 @@ prototype_sources = \
393377
ssend_init.c.in \
394378
startall.c.in \
395379
start.c.in \
396-
status_c2f08.c.in \
397-
status_c2f.c.in \
398-
status_f082c.c.in \
399-
status_f082f.c.in \
400-
status_f2c.c.in \
401-
status_f2f08.c.in \
402380
status_get_error.c.in \
403381
status_get_source.c.in \
404382
status_get_tag.c.in \
@@ -414,7 +392,6 @@ prototype_sources = \
414392
test_cancelled.c.in \
415393
testsome.c.in \
416394
topo_test.c.in \
417-
type_c2f.c.in \
418395
type_commit.c.in \
419396
type_contiguous.c.in \
420397
type_create_darray.c.in \
@@ -431,7 +408,6 @@ prototype_sources = \
431408
type_create_subarray.c.in \
432409
type_delete_attr.c.in \
433410
type_dup.c.in \
434-
type_f2c.c.in \
435411
type_free.c.in \
436412
type_free_keyval.c.in \
437413
type_get_attr.c.in \
@@ -458,7 +434,6 @@ prototype_sources = \
458434
win_allocate.c.in \
459435
win_allocate_shared.c.in \
460436
win_attach.c.in \
461-
win_c2f.c.in \
462437
win_call_errhandler.c.in \
463438
win_complete.c.in \
464439
win_create.c.in \
@@ -474,7 +449,6 @@ prototype_sources = \
474449
win_flush_local.c.in \
475450
win_free.c.in \
476451
win_free_keyval.c.in \
477-
win_f2c.c.in \
478452
win_get_attr.c.in \
479453
win_get_errhandler.c.in \
480454
win_get_group.c.in \
@@ -496,7 +470,39 @@ prototype_sources = \
496470
win_wait.c.in \
497471
wtime.c.in
498472

473+
# See MPI-5 standard Chapter 20 section 4
474+
prototype_sources_not_in_abi = \
475+
comm_c2f.c.in \
476+
errhandler_c2f.c.in \
477+
file_c2f.c.in \
478+
group_c2f.c.in \
479+
info_c2f.c.in \
480+
message_c2f.c.in \
481+
op_c2f.c.in \
482+
request_c2f.c.in \
483+
session_c2f.c.in \
484+
status_c2f08.c.in \
485+
status_c2f.c.in \
486+
status_f082c.c.in \
487+
status_f082f.c.in \
488+
status_f2f08.c.in \
489+
type_c2f.c.in \
490+
win_c2f.c.in \
491+
comm_f2c.c.in \
492+
errhandler_f2c.c.in \
493+
file_f2c.c.in \
494+
group_f2c.c.in \
495+
info_f2c.c.in \
496+
message_f2c.c.in \
497+
op_f2c.c.in \
498+
request_f2c.c.in \
499+
session_f2c.c.in \
500+
status_f2c.c.in \
501+
type_f2c.c.in \
502+
win_f2c.c.in
503+
499504
EXTRA_DIST = $(prototype_sources) \
505+
$(prototype_sources_not_in_abi) \
500506
abi_converters.h \
501507
abi_get_info.c.in
502508

@@ -522,7 +528,8 @@ nobase_include_HEADERS = abi.h standard_abi/mpi.h
522528
# generated from prototype_sources above).
523529
#
524530
#
525-
interface_profile_sources = $(prototype_sources:.c.in=_ompi_generated.c)
531+
interface_profile_sources = $(prototype_sources:.c.in=_ompi_generated.c) \
532+
$(prototype_sources_not_in_abi:.c.in=_ompi_generated.c)
526533

527534

528535
# Conditionally install the header files
@@ -606,7 +613,7 @@ abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings
606613
$<
607614
endif
608615

609-
MAINTAINERCLEANFILES = *_generated.c $(nobase_include_HEADERS)
616+
MAINTAINERCLEANFILES = *_generated.c abi_get_info.c abi_get_version.c $(nobase_include_HEADERS)
610617
if OMPI_STANDARD_ABI
611618
include Makefile_abi.include
612619
endif

0 commit comments

Comments
 (0)