Skip to content

Commit 50afcac

Browse files
committed
abi: move converter functions to a persistent file
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent 4661c68 commit 50afcac

File tree

2 files changed

+599
-27
lines changed

2 files changed

+599
-27
lines changed

ompi/mpi/bindings/ompi_bindings/c.py

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -351,33 +351,36 @@ def dump_header(self):
351351
self.dump('int MPI_Abi_supported(int *flag);')
352352
self.dump('int MPI_Abi_version(int *abi_major, int *abi_minor);')
353353

354-
if not self.external:
355-
# Now generate the conversion code
356-
self.generate_error_convert_fn()
357-
self.generate_comm_convert_fn()
358-
self.generate_comm_convert_fn_intern_to_abi()
359-
self.generate_info_convert_fn()
360-
self.generate_info_convert_fn_intern_to_abi()
361-
self.generate_file_convert_fn()
362-
self.generate_file_convert_fn_intern_to_abi()
363-
self.generate_group_convert_fn()
364-
self.generate_group_convert_fn_intern_to_abi()
365-
self.generate_datatype_convert_fn()
366-
self.generate_datatype_convert_fn_intern_to_abi()
367-
self.generate_errhandler_convert_fn()
368-
self.generate_errhandler_convert_fn_intern_to_abi()
369-
self.generate_message_convert_fn()
370-
self.generate_message_convert_fn_intern_to_abi()
371-
self.generate_op_convert_fn()
372-
self.generate_op_convert_fn_intern_to_abi()
373-
self.generate_session_convert_fn()
374-
self.generate_session_convert_fn_intern_to_abi()
375-
self.generate_win_convert_fn()
376-
self.generate_win_convert_fn_intern_to_abi()
377-
self.generate_request_convert_fn()
378-
self.generate_request_convert_fn_intern_to_abi()
379-
self.generate_status_convert_fn()
380-
self.generate_status_convert_fn_intern_to_abi()
354+
#
355+
# the converters are no longer generated
356+
#
357+
# if not self.external:
358+
# # Now generate the conversion code
359+
# self.generate_error_convert_fn()
360+
# self.generate_comm_convert_fn()
361+
# self.generate_comm_convert_fn_intern_to_abi()
362+
# self.generate_info_convert_fn()
363+
# self.generate_info_convert_fn_intern_to_abi()
364+
# self.generate_file_convert_fn()
365+
# self.generate_file_convert_fn_intern_to_abi()
366+
# self.generate_group_convert_fn()
367+
# self.generate_group_convert_fn_intern_to_abi()
368+
# self.generate_datatype_convert_fn()
369+
# self.generate_datatype_convert_fn_intern_to_abi()
370+
# self.generate_errhandler_convert_fn()
371+
# self.generate_errhandler_convert_fn_intern_to_abi()
372+
# self.generate_message_convert_fn()
373+
# self.generate_message_convert_fn_intern_to_abi()
374+
# self.generate_op_convert_fn()
375+
# self.generate_op_convert_fn_intern_to_abi()
376+
# self.generate_session_convert_fn()
377+
# self.generate_session_convert_fn_intern_to_abi()
378+
# self.generate_win_convert_fn()
379+
# self.generate_win_convert_fn_intern_to_abi()
380+
# self.generate_request_convert_fn()
381+
# self.generate_request_convert_fn_intern_to_abi()
382+
# self.generate_status_convert_fn()
383+
# self.generate_status_convert_fn_intern_to_abi()
381384

382385
self.dump("""
383386
#if defined(c_plusplus) || defined(__cplusplus)
@@ -432,12 +435,14 @@ def ompi_abi(base_name, template, out):
432435

433436

434437
ABI_INTERNAL_HEADER = 'ompi/mpi/c/abi.h'
438+
ABI_INTERNAL_CONVERTOR = 'ompi/mpi/c/abi_converters.h'
435439

436440

437441
def standard_abi(base_name, template, out):
438442
"""Generate the standard ABI functions."""
439443
template.print_header(out)
440444
out.dump(f'#include "{ABI_INTERNAL_HEADER}"')
445+
out.dump(f'#include "{ABI_INTERNAL_CONVERTOR}"')
441446
print_cdefs_for_abi(out,abi_type='standard')
442447

443448
# If any parameters are pointers to user callback functions, generate code

0 commit comments

Comments
 (0)