From 99f38f3cca76e0b8515be90cf8af8ed053912dd3 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 11 Nov 2015 09:10:29 +0900 Subject: [PATCH 01/12] fortran/mpif-h: invoke the C PMPI_* subroutines instead of the MPI_* ones when profiling is built. This prevents Fortran subroutines from being wrapped twice by third party tools (e.g. once in Fortran and once in C) see discussion starting at http://www.open-mpi.org/community/lists/devel/2015/08/17842.php (back-ported from commit open-mpi/ompi@16d65a276272be748493c43ef2df3fc7aa1ac3a5) --- ompi/mpi/c/Makefile.am | 14 +- ompi/mpi/c/abort.c | 8 +- ompi/mpi/c/accumulate.c | 6 +- ompi/mpi/c/add_error_class.c | 8 +- ompi/mpi/c/add_error_code.c | 8 +- ompi/mpi/c/add_error_string.c | 8 +- ompi/mpi/c/address.c | 8 +- ompi/mpi/c/allgather.c | 6 +- ompi/mpi/c/allgatherv.c | 6 +- ompi/mpi/c/alloc_mem.c | 8 +- ompi/mpi/c/allreduce.c | 6 +- ompi/mpi/c/alltoall.c | 6 +- ompi/mpi/c/alltoallv.c | 6 +- ompi/mpi/c/alltoallw.c | 6 +- ompi/mpi/c/attr_delete.c | 8 +- ompi/mpi/c/attr_get.c | 8 +- ompi/mpi/c/attr_put.c | 8 +- ompi/mpi/c/barrier.c | 8 +- ompi/mpi/c/bcast.c | 8 +- ompi/mpi/c/bsend.c | 6 +- ompi/mpi/c/bsend_init.c | 6 +- ompi/mpi/c/buffer_attach.c | 8 +- ompi/mpi/c/buffer_detach.c | 8 +- ompi/mpi/c/cancel.c | 8 +- ompi/mpi/c/cart_coords.c | 8 +- ompi/mpi/c/cart_create.c | 6 +- ompi/mpi/c/cart_get.c | 8 +- ompi/mpi/c/cart_map.c | 6 +- ompi/mpi/c/cart_rank.c | 6 +- ompi/mpi/c/cart_shift.c | 8 +- ompi/mpi/c/cart_sub.c | 6 +- ompi/mpi/c/cartdim_get.c | 8 +- ompi/mpi/c/close_port.c | 8 +- ompi/mpi/c/comm_accept.c | 8 +- ompi/mpi/c/comm_c2f.c | 8 +- ompi/mpi/c/comm_call_errhandler.c | 8 +- ompi/mpi/c/comm_compare.c | 8 +- ompi/mpi/c/comm_connect.c | 8 +- ompi/mpi/c/comm_create.c | 8 +- ompi/mpi/c/comm_create_errhandler.c | 8 +- ompi/mpi/c/comm_create_group.c | 8 +- ompi/mpi/c/comm_create_keyval.c | 8 +- ompi/mpi/c/comm_delete_attr.c | 8 +- ompi/mpi/c/comm_disconnect.c | 8 +- ompi/mpi/c/comm_dup.c | 8 +- ompi/mpi/c/comm_dup_with_info.c | 8 +- ompi/mpi/c/comm_f2c.c | 8 +- ompi/mpi/c/comm_free.c | 8 +- ompi/mpi/c/comm_free_keyval.c | 8 +- ompi/mpi/c/comm_get_attr.c | 8 +- ompi/mpi/c/comm_get_errhandler.c | 8 +- ompi/mpi/c/comm_get_info.c | 8 +- ompi/mpi/c/comm_get_name.c | 8 +- ompi/mpi/c/comm_get_parent.c | 8 +- ompi/mpi/c/comm_group.c | 8 +- ompi/mpi/c/comm_idup.c | 8 +- ompi/mpi/c/comm_join.c | 8 +- ompi/mpi/c/comm_rank.c | 8 +- ompi/mpi/c/comm_remote_group.c | 8 +- ompi/mpi/c/comm_remote_size.c | 8 +- ompi/mpi/c/comm_set_attr.c | 8 +- ompi/mpi/c/comm_set_errhandler.c | 8 +- ompi/mpi/c/comm_set_info.c | 8 +- ompi/mpi/c/comm_set_name.c | 12 +- ompi/mpi/c/comm_size.c | 8 +- ompi/mpi/c/comm_spawn.c | 8 +- ompi/mpi/c/comm_spawn_multiple.c | 8 +- ompi/mpi/c/comm_split.c | 8 +- ompi/mpi/c/comm_split_type.c | 8 +- ompi/mpi/c/comm_test_inter.c | 8 +- ompi/mpi/c/compare_and_swap.c | 6 +- ompi/mpi/c/dims_create.c | 8 +- ompi/mpi/c/dist_graph_create.c | 9 +- ompi/mpi/c/dist_graph_create_adjacent.c | 9 +- ompi/mpi/c/dist_graph_neighbors.c | 11 +- ompi/mpi/c/dist_graph_neighbors_count.c | 11 +- ompi/mpi/c/errhandler_c2f.c | 8 +- ompi/mpi/c/errhandler_create.c | 11 +- ompi/mpi/c/errhandler_f2c.c | 8 +- ompi/mpi/c/errhandler_free.c | 8 +- ompi/mpi/c/errhandler_get.c | 12 +- ompi/mpi/c/errhandler_set.c | 12 +- ompi/mpi/c/error_class.c | 8 +- ompi/mpi/c/error_string.c | 8 +- ompi/mpi/c/exscan.c | 6 +- ompi/mpi/c/fetch_and_op.c | 6 +- ompi/mpi/c/file_c2f.c | 8 +- ompi/mpi/c/file_call_errhandler.c | 8 +- ompi/mpi/c/file_close.c | 8 +- ompi/mpi/c/file_create_errhandler.c | 8 +- ompi/mpi/c/file_delete.c | 6 +- ompi/mpi/c/file_f2c.c | 8 +- ompi/mpi/c/file_get_amode.c | 8 +- ompi/mpi/c/file_get_atomicity.c | 8 +- ompi/mpi/c/file_get_byte_offset.c | 8 +- ompi/mpi/c/file_get_errhandler.c | 8 +- ompi/mpi/c/file_get_group.c | 8 +- ompi/mpi/c/file_get_info.c | 8 +- ompi/mpi/c/file_get_position.c | 8 +- ompi/mpi/c/file_get_position_shared.c | 8 +- ompi/mpi/c/file_get_size.c | 8 +- ompi/mpi/c/file_get_type_extent.c | 8 +- ompi/mpi/c/file_get_view.c | 8 +- ompi/mpi/c/file_iread.c | 8 +- ompi/mpi/c/file_iread_all.c | 8 +- ompi/mpi/c/file_iread_at.c | 8 +- ompi/mpi/c/file_iread_at_all.c | 8 +- ompi/mpi/c/file_iread_shared.c | 8 +- ompi/mpi/c/file_iwrite.c | 6 +- ompi/mpi/c/file_iwrite_all.c | 6 +- ompi/mpi/c/file_iwrite_at.c | 6 +- ompi/mpi/c/file_iwrite_at_all.c | 6 +- ompi/mpi/c/file_iwrite_shared.c | 6 +- ompi/mpi/c/file_open.c | 6 +- ompi/mpi/c/file_preallocate.c | 8 +- ompi/mpi/c/file_read.c | 8 +- ompi/mpi/c/file_read_all.c | 8 +- ompi/mpi/c/file_read_all_begin.c | 8 +- ompi/mpi/c/file_read_all_end.c | 8 +- ompi/mpi/c/file_read_at.c | 8 +- ompi/mpi/c/file_read_at_all.c | 8 +- ompi/mpi/c/file_read_at_all_begin.c | 8 +- ompi/mpi/c/file_read_at_all_end.c | 8 +- ompi/mpi/c/file_read_ordered.c | 8 +- ompi/mpi/c/file_read_ordered_begin.c | 8 +- ompi/mpi/c/file_read_ordered_end.c | 8 +- ompi/mpi/c/file_read_shared.c | 8 +- ompi/mpi/c/file_seek.c | 8 +- ompi/mpi/c/file_seek_shared.c | 8 +- ompi/mpi/c/file_set_atomicity.c | 8 +- ompi/mpi/c/file_set_errhandler.c | 8 +- ompi/mpi/c/file_set_info.c | 8 +- ompi/mpi/c/file_set_size.c | 8 +- ompi/mpi/c/file_set_view.c | 6 +- ompi/mpi/c/file_sync.c | 8 +- ompi/mpi/c/file_write.c | 6 +- ompi/mpi/c/file_write_all.c | 6 +- ompi/mpi/c/file_write_all_begin.c | 6 +- ompi/mpi/c/file_write_all_end.c | 6 +- ompi/mpi/c/file_write_at.c | 6 +- ompi/mpi/c/file_write_at_all.c | 6 +- ompi/mpi/c/file_write_at_all_begin.c | 6 +- ompi/mpi/c/file_write_at_all_end.c | 6 +- ompi/mpi/c/file_write_ordered.c | 6 +- ompi/mpi/c/file_write_ordered_begin.c | 6 +- ompi/mpi/c/file_write_ordered_end.c | 6 +- ompi/mpi/c/file_write_shared.c | 6 +- ompi/mpi/c/finalize.c | 8 +- ompi/mpi/c/finalized.c | 8 +- ompi/mpi/c/free_mem.c | 8 +- ompi/mpi/c/gather.c | 6 +- ompi/mpi/c/gatherv.c | 6 +- ompi/mpi/c/get.c | 6 +- ompi/mpi/c/get_accumulate.c | 6 +- ompi/mpi/c/get_address.c | 8 +- ompi/mpi/c/get_count.c | 8 +- ompi/mpi/c/get_elements.c | 8 +- ompi/mpi/c/get_elements_x.c | 8 +- ompi/mpi/c/get_library_version.c | 8 +- ompi/mpi/c/get_processor_name.c | 8 +- ompi/mpi/c/get_version.c | 8 +- ompi/mpi/c/graph_create.c | 6 +- ompi/mpi/c/graph_get.c | 8 +- ompi/mpi/c/graph_map.c | 6 +- ompi/mpi/c/graph_neighbors.c | 8 +- ompi/mpi/c/graph_neighbors_count.c | 8 +- ompi/mpi/c/graphdims_get.c | 8 +- ompi/mpi/c/grequest_complete.c | 8 +- ompi/mpi/c/grequest_start.c | 8 +- ompi/mpi/c/group_c2f.c | 8 +- ompi/mpi/c/group_compare.c | 8 +- ompi/mpi/c/group_difference.c | 8 +- ompi/mpi/c/group_excl.c | 6 +- ompi/mpi/c/group_f2c.c | 8 +- ompi/mpi/c/group_free.c | 8 +- ompi/mpi/c/group_incl.c | 6 +- ompi/mpi/c/group_intersection.c | 8 +- ompi/mpi/c/group_range_excl.c | 8 +- ompi/mpi/c/group_range_incl.c | 8 +- ompi/mpi/c/group_rank.c | 8 +- ompi/mpi/c/group_size.c | 8 +- ompi/mpi/c/group_translate_ranks.c | 8 +- ompi/mpi/c/group_union.c | 8 +- ompi/mpi/c/iallgather.c | 6 +- ompi/mpi/c/iallgatherv.c | 6 +- ompi/mpi/c/iallreduce.c | 6 +- ompi/mpi/c/ialltoall.c | 6 +- ompi/mpi/c/ialltoallv.c | 6 +- ompi/mpi/c/ialltoallw.c | 6 +- ompi/mpi/c/ibarrier.c | 8 +- ompi/mpi/c/ibcast.c | 8 +- ompi/mpi/c/ibsend.c | 6 +- ompi/mpi/c/iexscan.c | 6 +- ompi/mpi/c/igather.c | 6 +- ompi/mpi/c/igatherv.c | 6 +- ompi/mpi/c/improbe.c | 8 +- ompi/mpi/c/imrecv.c | 8 +- ompi/mpi/c/ineighbor_allgather.c | 6 +- ompi/mpi/c/ineighbor_allgatherv.c | 6 +- ompi/mpi/c/ineighbor_alltoall.c | 6 +- ompi/mpi/c/ineighbor_alltoallv.c | 6 +- ompi/mpi/c/ineighbor_alltoallw.c | 6 +- ompi/mpi/c/info_c2f.c | 8 +- ompi/mpi/c/info_create.c | 8 +- ompi/mpi/c/info_delete.c | 8 +- ompi/mpi/c/info_dup.c | 8 +- ompi/mpi/c/info_f2c.c | 8 +- ompi/mpi/c/info_free.c | 8 +- ompi/mpi/c/info_get.c | 8 +- ompi/mpi/c/info_get_nkeys.c | 8 +- ompi/mpi/c/info_get_nthkey.c | 8 +- ompi/mpi/c/info_get_valuelen.c | 8 +- ompi/mpi/c/info_set.c | 8 +- ompi/mpi/c/init.c | 8 +- ompi/mpi/c/init_thread.c | 8 +- ompi/mpi/c/initialized.c | 8 +- ompi/mpi/c/intercomm_create.c | 8 +- ompi/mpi/c/intercomm_merge.c | 8 +- ompi/mpi/c/iprobe.c | 8 +- ompi/mpi/c/irecv.c | 8 +- ompi/mpi/c/ireduce.c | 6 +- ompi/mpi/c/ireduce_scatter.c | 6 +- ompi/mpi/c/ireduce_scatter_block.c | 6 +- ompi/mpi/c/irsend.c | 6 +- ompi/mpi/c/is_thread_main.c | 8 +- ompi/mpi/c/iscan.c | 6 +- ompi/mpi/c/iscatter.c | 6 +- ompi/mpi/c/iscatterv.c | 6 +- ompi/mpi/c/isend.c | 6 +- ompi/mpi/c/issend.c | 6 +- ompi/mpi/c/keyval_create.c | 8 +- ompi/mpi/c/keyval_free.c | 8 +- ompi/mpi/c/lookup_name.c | 8 +- ompi/mpi/c/message_c2f.c | 8 +- ompi/mpi/c/message_f2c.c | 8 +- ompi/mpi/c/mprobe.c | 8 +- ompi/mpi/c/mrecv.c | 8 +- ompi/mpi/c/neighbor_allgather.c | 6 +- ompi/mpi/c/neighbor_allgatherv.c | 6 +- ompi/mpi/c/neighbor_alltoall.c | 6 +- ompi/mpi/c/neighbor_alltoallv.c | 6 +- ompi/mpi/c/neighbor_alltoallw.c | 6 +- ompi/mpi/c/op_c2f.c | 8 +- ompi/mpi/c/op_commutative.c | 8 +- ompi/mpi/c/op_create.c | 8 +- ompi/mpi/c/op_f2c.c | 8 +- ompi/mpi/c/op_free.c | 8 +- ompi/mpi/c/open_port.c | 8 +- ompi/mpi/c/pack.c | 8 +- ompi/mpi/c/pack_external.c | 8 +- ompi/mpi/c/pack_external_size.c | 8 +- ompi/mpi/c/pack_size.c | 8 +- ompi/mpi/c/pcontrol.c | 8 +- ompi/mpi/c/probe.c | 8 +- ompi/mpi/c/profile/Makefile.am | 18 +- ompi/mpi/c/profile/defines.h | 419 ------------------ ompi/mpi/c/publish_name.c | 13 +- ompi/mpi/c/put.c | 6 +- ompi/mpi/c/query_thread.c | 8 +- ompi/mpi/c/raccumulate.c | 6 +- ompi/mpi/c/recv.c | 8 +- ompi/mpi/c/recv_init.c | 8 +- ompi/mpi/c/reduce.c | 6 +- ompi/mpi/c/reduce_local.c | 8 +- ompi/mpi/c/reduce_scatter.c | 6 +- ompi/mpi/c/reduce_scatter_block.c | 6 +- ompi/mpi/c/register_datarep.c | 6 +- ompi/mpi/c/request_c2f.c | 8 +- ompi/mpi/c/request_f2c.c | 8 +- ompi/mpi/c/request_free.c | 8 +- ompi/mpi/c/request_get_status.c | 8 +- ompi/mpi/c/rget.c | 8 +- ompi/mpi/c/rget_accumulate.c | 6 +- ompi/mpi/c/rput.c | 6 +- ompi/mpi/c/rsend.c | 6 +- ompi/mpi/c/rsend_init.c | 6 +- ompi/mpi/c/scan.c | 6 +- ompi/mpi/c/scatter.c | 6 +- ompi/mpi/c/scatterv.c | 6 +- ompi/mpi/c/send.c | 6 +- ompi/mpi/c/send_init.c | 6 +- ompi/mpi/c/sendrecv.c | 6 +- ompi/mpi/c/sendrecv_replace.c | 12 +- ompi/mpi/c/ssend.c | 6 +- ompi/mpi/c/ssend_init.c | 6 +- ompi/mpi/c/start.c | 8 +- ompi/mpi/c/startall.c | 8 +- ompi/mpi/c/status_c2f.c | 8 +- ompi/mpi/c/status_f2c.c | 8 +- ompi/mpi/c/status_set_cancelled.c | 8 +- ompi/mpi/c/status_set_elements.c | 8 +- ompi/mpi/c/status_set_elements_x.c | 8 +- ompi/mpi/c/test.c | 8 +- ompi/mpi/c/test_cancelled.c | 8 +- ompi/mpi/c/testall.c | 8 +- ompi/mpi/c/testany.c | 8 +- ompi/mpi/c/testsome.c | 8 +- ompi/mpi/c/topo_test.c | 8 +- ompi/mpi/c/type_c2f.c | 8 +- ompi/mpi/c/type_commit.c | 8 +- ompi/mpi/c/type_contiguous.c | 8 +- ompi/mpi/c/type_create_darray.c | 8 +- ompi/mpi/c/type_create_f90_complex.c | 8 +- ompi/mpi/c/type_create_f90_integer.c | 8 +- ompi/mpi/c/type_create_f90_real.c | 8 +- ompi/mpi/c/type_create_hindexed.c | 8 +- ompi/mpi/c/type_create_hindexed_block.c | 8 +- ompi/mpi/c/type_create_hvector.c | 8 +- ompi/mpi/c/type_create_indexed_block.c | 8 +- ompi/mpi/c/type_create_keyval.c | 8 +- ompi/mpi/c/type_create_resized.c | 8 +- ompi/mpi/c/type_create_struct.c | 8 +- ompi/mpi/c/type_create_subarray.c | 8 +- ompi/mpi/c/type_delete_attr.c | 8 +- ompi/mpi/c/type_dup.c | 8 +- ompi/mpi/c/type_extent.c | 8 +- ompi/mpi/c/type_f2c.c | 8 +- ompi/mpi/c/type_free.c | 8 +- ompi/mpi/c/type_free_keyval.c | 8 +- ompi/mpi/c/type_get_attr.c | 8 +- ompi/mpi/c/type_get_contents.c | 8 +- ompi/mpi/c/type_get_envelope.c | 8 +- ompi/mpi/c/type_get_extent.c | 8 +- ompi/mpi/c/type_get_extent_x.c | 8 +- ompi/mpi/c/type_get_name.c | 8 +- ompi/mpi/c/type_get_true_extent.c | 8 +- ompi/mpi/c/type_get_true_extent_x.c | 8 +- ompi/mpi/c/type_hindexed.c | 12 +- ompi/mpi/c/type_hvector.c | 12 +- ompi/mpi/c/type_indexed.c | 8 +- ompi/mpi/c/type_lb.c | 8 +- ompi/mpi/c/type_match_size.c | 8 +- ompi/mpi/c/type_set_attr.c | 8 +- ompi/mpi/c/type_set_name.c | 8 +- ompi/mpi/c/type_size.c | 8 +- ompi/mpi/c/type_size_x.c | 8 +- ompi/mpi/c/type_struct.c | 11 +- ompi/mpi/c/type_ub.c | 8 +- ompi/mpi/c/type_vector.c | 8 +- ompi/mpi/c/unpack.c | 8 +- ompi/mpi/c/unpack_external.c | 8 +- ompi/mpi/c/unpublish_name.c | 8 +- ompi/mpi/c/wait.c | 8 +- ompi/mpi/c/waitall.c | 8 +- ompi/mpi/c/waitany.c | 8 +- ompi/mpi/c/waitsome.c | 8 +- ompi/mpi/c/win_allocate.c | 8 +- ompi/mpi/c/win_allocate_shared.c | 8 +- ompi/mpi/c/win_attach.c | 8 +- ompi/mpi/c/win_c2f.c | 8 +- ompi/mpi/c/win_call_errhandler.c | 8 +- ompi/mpi/c/win_complete.c | 8 +- ompi/mpi/c/win_create.c | 8 +- ompi/mpi/c/win_create_dynamic.c | 8 +- ompi/mpi/c/win_create_errhandler.c | 8 +- ompi/mpi/c/win_create_keyval.c | 8 +- ompi/mpi/c/win_delete_attr.c | 8 +- ompi/mpi/c/win_detach.c | 6 +- ompi/mpi/c/win_f2c.c | 8 +- ompi/mpi/c/win_fence.c | 8 +- ompi/mpi/c/win_flush.c | 8 +- ompi/mpi/c/win_flush_all.c | 8 +- ompi/mpi/c/win_flush_local.c | 8 +- ompi/mpi/c/win_flush_local_all.c | 8 +- ompi/mpi/c/win_free.c | 8 +- ompi/mpi/c/win_free_keyval.c | 8 +- ompi/mpi/c/win_get_attr.c | 8 +- ompi/mpi/c/win_get_errhandler.c | 8 +- ompi/mpi/c/win_get_group.c | 8 +- ompi/mpi/c/win_get_info.c | 8 +- ompi/mpi/c/win_get_name.c | 8 +- ompi/mpi/c/win_lock.c | 8 +- ompi/mpi/c/win_lock_all.c | 8 +- ompi/mpi/c/win_post.c | 8 +- ompi/mpi/c/win_set_attr.c | 8 +- ompi/mpi/c/win_set_errhandler.c | 8 +- ompi/mpi/c/win_set_info.c | 8 +- ompi/mpi/c/win_set_name.c | 8 +- ompi/mpi/c/win_shared_query.c | 8 +- ompi/mpi/c/win_start.c | 8 +- ompi/mpi/c/win_sync.c | 8 +- ompi/mpi/c/win_test.c | 8 +- ompi/mpi/c/win_unlock.c | 8 +- ompi/mpi/c/win_unlock_all.c | 8 +- ompi/mpi/c/win_wait.c | 8 +- ompi/mpi/c/wtick.c | 9 +- ompi/mpi/c/wtime.c | 9 +- ompi/mpi/fortran/mpif-h/Makefile.am | 8 - ompi/mpi/fortran/mpif-h/abort_f.c | 8 +- ompi/mpi/fortran/mpif-h/accumulate_f.c | 8 +- ompi/mpi/fortran/mpif-h/add_error_class_f.c | 8 +- ompi/mpi/fortran/mpif-h/add_error_code_f.c | 8 +- ompi/mpi/fortran/mpif-h/add_error_string_f.c | 8 +- ompi/mpi/fortran/mpif-h/address_f.c | 8 +- ompi/mpi/fortran/mpif-h/aint_add_f.c | 4 +- ompi/mpi/fortran/mpif-h/aint_diff_f.c | 4 +- ompi/mpi/fortran/mpif-h/allgather_f.c | 8 +- ompi/mpi/fortran/mpif-h/allgatherv_f.c | 8 +- ompi/mpi/fortran/mpif-h/alloc_mem_f.c | 8 +- ompi/mpi/fortran/mpif-h/allreduce_f.c | 8 +- ompi/mpi/fortran/mpif-h/alltoall_f.c | 8 +- ompi/mpi/fortran/mpif-h/alltoallv_f.c | 8 +- ompi/mpi/fortran/mpif-h/alltoallw_f.c | 8 +- ompi/mpi/fortran/mpif-h/attr_delete_f.c | 8 +- ompi/mpi/fortran/mpif-h/attr_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/attr_put_f.c | 8 +- ompi/mpi/fortran/mpif-h/barrier_f.c | 8 +- ompi/mpi/fortran/mpif-h/bcast_f.c | 8 +- ompi/mpi/fortran/mpif-h/bsend_f.c | 8 +- ompi/mpi/fortran/mpif-h/bsend_init_f.c | 8 +- ompi/mpi/fortran/mpif-h/buffer_attach_f.c | 8 +- ompi/mpi/fortran/mpif-h/buffer_detach_f.c | 8 +- ompi/mpi/fortran/mpif-h/cancel_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_coords_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_map_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_rank_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_shift_f.c | 8 +- ompi/mpi/fortran/mpif-h/cart_sub_f.c | 8 +- ompi/mpi/fortran/mpif-h/cartdim_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/close_port_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_accept_f.c | 8 +- .../fortran/mpif-h/comm_call_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_compare_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_connect_f.c | 8 +- .../fortran/mpif-h/comm_create_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_create_group_f.c | 8 +- .../mpi/fortran/mpif-h/comm_create_keyval_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_disconnect_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_dup_f.c | 8 +- .../mpi/fortran/mpif-h/comm_dup_with_info_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_get_attr_f.c | 8 +- .../fortran/mpif-h/comm_get_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_get_info_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_get_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_get_parent_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_group_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_idup_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_join_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_rank_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_remote_group_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_remote_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_set_attr_f.c | 8 +- .../fortran/mpif-h/comm_set_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_set_info_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_set_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_spawn_f.c | 8 +- .../fortran/mpif-h/comm_spawn_multiple_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_split_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_split_type_f.c | 8 +- ompi/mpi/fortran/mpif-h/comm_test_inter_f.c | 8 +- ompi/mpi/fortran/mpif-h/compare_and_swap_f.c | 8 +- ompi/mpi/fortran/mpif-h/dims_create_f.c | 8 +- .../mpif-h/dist_graph_create_adjacent_f.c | 8 +- ompi/mpi/fortran/mpif-h/dist_graph_create_f.c | 8 +- .../mpif-h/dist_graph_neighbors_count_f.c | 8 +- .../fortran/mpif-h/dist_graph_neighbors_f.c | 8 +- ompi/mpi/fortran/mpif-h/errhandler_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/errhandler_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/errhandler_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/errhandler_set_f.c | 8 +- ompi/mpi/fortran/mpif-h/error_class_f.c | 8 +- ompi/mpi/fortran/mpif-h/error_string_f.c | 8 +- ompi/mpi/fortran/mpif-h/exscan_f.c | 8 +- ompi/mpi/fortran/mpif-h/f_sync_reg_f.c | 8 +- ompi/mpi/fortran/mpif-h/fetch_and_op_f.c | 8 +- .../fortran/mpif-h/file_call_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_close_f.c | 8 +- .../fortran/mpif-h/file_create_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_delete_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_amode_f.c | 8 +- .../mpi/fortran/mpif-h/file_get_atomicity_f.c | 8 +- .../fortran/mpif-h/file_get_byte_offset_f.c | 8 +- .../fortran/mpif-h/file_get_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_group_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_info_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_position_f.c | 8 +- .../mpif-h/file_get_position_shared_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_size_f.c | 8 +- .../fortran/mpif-h/file_get_type_extent_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_get_view_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iread_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iread_at_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iread_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iread_shared_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c | 8 +- .../mpi/fortran/mpif-h/file_iwrite_at_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_iwrite_f.c | 8 +- .../mpi/fortran/mpif-h/file_iwrite_shared_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_open_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_preallocate_f.c | 8 +- .../fortran/mpif-h/file_read_all_begin_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_all_end_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_all_f.c | 8 +- .../fortran/mpif-h/file_read_at_all_begin_f.c | 8 +- .../fortran/mpif-h/file_read_at_all_end_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_at_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_at_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_f.c | 8 +- .../mpif-h/file_read_ordered_begin_f.c | 8 +- .../fortran/mpif-h/file_read_ordered_end_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_ordered_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_read_shared_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_seek_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_seek_shared_f.c | 8 +- .../mpi/fortran/mpif-h/file_set_atomicity_f.c | 8 +- .../fortran/mpif-h/file_set_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_set_info_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_set_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_set_view_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_sync_f.c | 8 +- .../fortran/mpif-h/file_write_all_begin_f.c | 8 +- .../mpi/fortran/mpif-h/file_write_all_end_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_write_all_f.c | 8 +- .../mpif-h/file_write_at_all_begin_f.c | 8 +- .../fortran/mpif-h/file_write_at_all_end_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_write_at_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_write_at_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_write_f.c | 8 +- .../mpif-h/file_write_ordered_begin_f.c | 8 +- .../fortran/mpif-h/file_write_ordered_end_f.c | 8 +- .../mpi/fortran/mpif-h/file_write_ordered_f.c | 8 +- ompi/mpi/fortran/mpif-h/file_write_shared_f.c | 8 +- ompi/mpi/fortran/mpif-h/finalize_f.c | 8 +- ompi/mpi/fortran/mpif-h/finalized_f.c | 8 +- ompi/mpi/fortran/mpif-h/free_mem_f.c | 8 +- ompi/mpi/fortran/mpif-h/gather_f.c | 8 +- ompi/mpi/fortran/mpif-h/gatherv_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_accumulate_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_address_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_count_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_elements_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_elements_x_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_f.c | 8 +- .../fortran/mpif-h/get_library_version_f.c | 8 +- .../mpi/fortran/mpif-h/get_processor_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/get_version_f.c | 8 +- ompi/mpi/fortran/mpif-h/graph_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/graph_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/graph_map_f.c | 8 +- .../fortran/mpif-h/graph_neighbors_count_f.c | 8 +- ompi/mpi/fortran/mpif-h/graph_neighbors_f.c | 8 +- ompi/mpi/fortran/mpif-h/graphdims_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/grequest_complete_f.c | 8 +- ompi/mpi/fortran/mpif-h/grequest_start_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_compare_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_difference_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_excl_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_incl_f.c | 8 +- .../mpi/fortran/mpif-h/group_intersection_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_range_excl_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_range_incl_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_rank_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_size_f.c | 8 +- .../fortran/mpif-h/group_translate_ranks_f.c | 8 +- ompi/mpi/fortran/mpif-h/group_union_f.c | 8 +- ompi/mpi/fortran/mpif-h/iallgather_f.c | 8 +- ompi/mpi/fortran/mpif-h/iallgatherv_f.c | 8 +- ompi/mpi/fortran/mpif-h/iallreduce_f.c | 8 +- ompi/mpi/fortran/mpif-h/ialltoall_f.c | 8 +- ompi/mpi/fortran/mpif-h/ialltoallv_f.c | 8 +- ompi/mpi/fortran/mpif-h/ialltoallw_f.c | 8 +- ompi/mpi/fortran/mpif-h/ibarrier_f.c | 8 +- ompi/mpi/fortran/mpif-h/ibcast_f.c | 8 +- ompi/mpi/fortran/mpif-h/ibsend_f.c | 8 +- ompi/mpi/fortran/mpif-h/iexscan_f.c | 8 +- ompi/mpi/fortran/mpif-h/igather_f.c | 8 +- ompi/mpi/fortran/mpif-h/igatherv_f.c | 8 +- ompi/mpi/fortran/mpif-h/improbe_f.c | 10 +- ompi/mpi/fortran/mpif-h/imrecv_f.c | 10 +- .../fortran/mpif-h/ineighbor_allgather_f.c | 8 +- .../fortran/mpif-h/ineighbor_allgatherv_f.c | 8 +- .../mpi/fortran/mpif-h/ineighbor_alltoall_f.c | 8 +- .../fortran/mpif-h/ineighbor_alltoallv_f.c | 8 +- .../fortran/mpif-h/ineighbor_alltoallw_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_delete_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_dup_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_get_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c | 8 +- ompi/mpi/fortran/mpif-h/info_set_f.c | 8 +- ompi/mpi/fortran/mpif-h/init_f.c | 8 +- ompi/mpi/fortran/mpif-h/init_thread_f.c | 8 +- ompi/mpi/fortran/mpif-h/initialized_f.c | 8 +- ompi/mpi/fortran/mpif-h/intercomm_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/intercomm_merge_f.c | 8 +- ompi/mpi/fortran/mpif-h/iprobe_f.c | 8 +- ompi/mpi/fortran/mpif-h/irecv_f.c | 8 +- ompi/mpi/fortran/mpif-h/ireduce_f.c | 8 +- .../fortran/mpif-h/ireduce_scatter_block_f.c | 8 +- ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c | 8 +- ompi/mpi/fortran/mpif-h/irsend_f.c | 8 +- ompi/mpi/fortran/mpif-h/is_thread_main_f.c | 8 +- ompi/mpi/fortran/mpif-h/iscan_f.c | 8 +- ompi/mpi/fortran/mpif-h/iscatter_f.c | 8 +- ompi/mpi/fortran/mpif-h/iscatterv_f.c | 8 +- ompi/mpi/fortran/mpif-h/isend_f.c | 8 +- ompi/mpi/fortran/mpif-h/issend_f.c | 8 +- ompi/mpi/fortran/mpif-h/keyval_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/keyval_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/lookup_name_f.c | 6 +- ompi/mpi/fortran/mpif-h/mprobe_f.c | 10 +- ompi/mpi/fortran/mpif-h/mrecv_f.c | 10 +- .../mpi/fortran/mpif-h/neighbor_allgather_f.c | 8 +- .../fortran/mpif-h/neighbor_allgatherv_f.c | 8 +- ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c | 8 +- .../mpi/fortran/mpif-h/neighbor_alltoallv_f.c | 8 +- .../mpi/fortran/mpif-h/neighbor_alltoallw_f.c | 8 +- ompi/mpi/fortran/mpif-h/op_commutative_f.c | 8 +- ompi/mpi/fortran/mpif-h/op_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/op_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/open_port_f.c | 8 +- ompi/mpi/fortran/mpif-h/pack_external_f.c | 8 +- .../mpi/fortran/mpif-h/pack_external_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/pack_f.c | 8 +- ompi/mpi/fortran/mpif-h/pack_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/pcontrol_f.c | 8 +- ompi/mpi/fortran/mpif-h/probe_f.c | 8 +- ompi/mpi/fortran/mpif-h/profile/Makefile.am | 11 - ompi/mpi/fortran/mpif-h/profile/defines.h | 396 ----------------- ompi/mpi/fortran/mpif-h/publish_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/put_f.c | 8 +- ompi/mpi/fortran/mpif-h/query_thread_f.c | 8 +- ompi/mpi/fortran/mpif-h/raccumulate_f.c | 8 +- ompi/mpi/fortran/mpif-h/recv_f.c | 8 +- ompi/mpi/fortran/mpif-h/recv_init_f.c | 8 +- ompi/mpi/fortran/mpif-h/reduce_f.c | 8 +- ompi/mpi/fortran/mpif-h/reduce_local_f.c | 8 +- .../fortran/mpif-h/reduce_scatter_block_f.c | 8 +- ompi/mpi/fortran/mpif-h/reduce_scatter_f.c | 8 +- ompi/mpi/fortran/mpif-h/register_datarep_f.c | 8 +- ompi/mpi/fortran/mpif-h/request_free_f.c | 8 +- .../mpi/fortran/mpif-h/request_get_status_f.c | 8 +- ompi/mpi/fortran/mpif-h/rget_accumulate_f.c | 8 +- ompi/mpi/fortran/mpif-h/rget_f.c | 8 +- ompi/mpi/fortran/mpif-h/rput_f.c | 8 +- ompi/mpi/fortran/mpif-h/rsend_f.c | 8 +- ompi/mpi/fortran/mpif-h/rsend_init_f.c | 8 +- ompi/mpi/fortran/mpif-h/scan_f.c | 8 +- ompi/mpi/fortran/mpif-h/scatter_f.c | 8 +- ompi/mpi/fortran/mpif-h/scatterv_f.c | 8 +- ompi/mpi/fortran/mpif-h/send_f.c | 8 +- ompi/mpi/fortran/mpif-h/send_init_f.c | 8 +- ompi/mpi/fortran/mpif-h/sendrecv_f.c | 8 +- ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c | 8 +- ompi/mpi/fortran/mpif-h/ssend_f.c | 8 +- ompi/mpi/fortran/mpif-h/ssend_init_f.c | 8 +- ompi/mpi/fortran/mpif-h/start_f.c | 8 +- ompi/mpi/fortran/mpif-h/startall_f.c | 8 +- .../fortran/mpif-h/status_set_cancelled_f.c | 8 +- .../fortran/mpif-h/status_set_elements_f.c | 8 +- .../fortran/mpif-h/status_set_elements_x_f.c | 8 +- ompi/mpi/fortran/mpif-h/test_cancelled_f.c | 8 +- ompi/mpi/fortran/mpif-h/test_f.c | 8 +- ompi/mpi/fortran/mpif-h/testall_f.c | 8 +- ompi/mpi/fortran/mpif-h/testany_f.c | 8 +- ompi/mpi/fortran/mpif-h/testsome_f.c | 8 +- ompi/mpi/fortran/mpif-h/topo_test_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_commit_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_contiguous_f.c | 8 +- .../mpi/fortran/mpif-h/type_create_darray_f.c | 8 +- .../mpif-h/type_create_f90_complex_f.c | 8 +- .../mpif-h/type_create_f90_integer_f.c | 8 +- .../fortran/mpif-h/type_create_f90_real_f.c | 8 +- .../mpif-h/type_create_hindexed_block_f.c | 8 +- .../fortran/mpif-h/type_create_hindexed_f.c | 8 +- .../fortran/mpif-h/type_create_hvector_f.c | 8 +- .../mpif-h/type_create_indexed_block_f.c | 8 +- .../mpi/fortran/mpif-h/type_create_keyval_f.c | 8 +- .../fortran/mpif-h/type_create_resized_f.c | 8 +- .../mpi/fortran/mpif-h/type_create_struct_f.c | 8 +- .../fortran/mpif-h/type_create_subarray_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_delete_attr_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_dup_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_extent_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_free_keyval_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_attr_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_contents_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_envelope_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_extent_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_get_name_f.c | 8 +- .../fortran/mpif-h/type_get_true_extent_f.c | 8 +- .../fortran/mpif-h/type_get_true_extent_x_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_hindexed_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_hvector_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_indexed_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_lb_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_match_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_set_attr_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_set_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_size_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_size_x_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_struct_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_ub_f.c | 8 +- ompi/mpi/fortran/mpif-h/type_vector_f.c | 8 +- ompi/mpi/fortran/mpif-h/unpack_external_f.c | 8 +- ompi/mpi/fortran/mpif-h/unpack_f.c | 8 +- ompi/mpi/fortran/mpif-h/unpublish_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/wait_f.c | 8 +- ompi/mpi/fortran/mpif-h/waitall_f.c | 8 +- ompi/mpi/fortran/mpif-h/waitany_f.c | 8 +- ompi/mpi/fortran/mpif-h/waitsome_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_allocate_f.c | 9 +- .../fortran/mpif-h/win_allocate_shared_f.c | 9 +- ompi/mpi/fortran/mpif-h/win_attach_f.c | 6 +- .../fortran/mpif-h/win_call_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_complete_f.c | 8 +- .../mpi/fortran/mpif-h/win_create_dynamic_f.c | 6 +- .../fortran/mpif-h/win_create_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_create_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_create_keyval_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_delete_attr_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_detach_f.c | 6 +- ompi/mpi/fortran/mpif-h/win_fence_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_flush_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_flush_f.c | 8 +- .../fortran/mpif-h/win_flush_local_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_flush_local_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_free_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_free_keyval_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_get_attr_f.c | 8 +- .../mpi/fortran/mpif-h/win_get_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_get_group_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_get_info_f.c | 6 +- ompi/mpi/fortran/mpif-h/win_get_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_lock_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_lock_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_post_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_set_attr_f.c | 8 +- .../mpi/fortran/mpif-h/win_set_errhandler_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_set_info_f.c | 6 +- ompi/mpi/fortran/mpif-h/win_set_name_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_shared_query_f.c | 9 +- ompi/mpi/fortran/mpif-h/win_start_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_sync_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_test_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_unlock_all_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_unlock_f.c | 8 +- ompi/mpi/fortran/mpif-h/win_wait_f.c | 8 +- ompi/mpi/fortran/mpif-h/wtick_f.c | 8 +- ompi/mpi/fortran/mpif-h/wtime_f.c | 8 +- 755 files changed, 4322 insertions(+), 2388 deletions(-) delete mode 100644 ompi/mpi/c/profile/defines.h delete mode 100644 ompi/mpi/fortran/mpif-h/profile/defines.h diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index 8d533a678f..5ffb8eeed4 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -15,6 +15,8 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -24,15 +26,11 @@ SUBDIRS = profile -# -# OMPI_PRPOFILING_DEFINES flag s enabled when we want our MPI_* symbols -# to be replaced by PMPI_*. In other words, this flag decides -# whether "profile/defines.h" is included or not. "profile/defines.h" -# replaces all MPI_* symbols with PMPI_* symbols. In this directory, -# we need it to be 0 -# +# if OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols +# to be replaced by PMPI_*. +# In this directory, we need it to be 0 -AM_CPPFLAGS = -DOMPI_PROFILING_DEFINES=0 +AM_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=0 # # The top directory always builds MPI_* bindings. The bottom directory diff --git a/ompi/mpi/c/abort.c b/ompi/mpi/c/abort.c index da01440ddd..56d4edcad2 100644 --- a/ompi/mpi/c/abort.c +++ b/ompi/mpi/c/abort.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/memchecker.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Abort = PMPI_Abort #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Abort PMPI_Abort #endif static const char FUNC_NAME[] = "MPI_Abort"; diff --git a/ompi/mpi/c/accumulate.c b/ompi/mpi/c/accumulate.c index c427fe2534..e0e09ca9bc 100644 --- a/ompi/mpi/c/accumulate.c +++ b/ompi/mpi/c/accumulate.c @@ -34,12 +34,12 @@ #include "ompi/datatype/ompi_datatype_internal.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Accumulate = PMPI_Accumulate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Accumulate PMPI_Accumulate #endif static const char FUNC_NAME[] = "MPI_Accumulate"; diff --git a/ompi/mpi/c/add_error_class.c b/ompi/mpi/c/add_error_class.c index 914f113763..d518b00fe5 100644 --- a/ompi/mpi/c/add_error_class.c +++ b/ompi/mpi/c/add_error_class.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Add_error_class = PMPI_Add_error_class #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Add_error_class PMPI_Add_error_class #endif static const char FUNC_NAME[] = "MPI_Add_error_class"; diff --git a/ompi/mpi/c/add_error_code.c b/ompi/mpi/c/add_error_code.c index fde742c986..d7fd26fa12 100644 --- a/ompi/mpi/c/add_error_code.c +++ b/ompi/mpi/c/add_error_code.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errcode.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Add_error_code = PMPI_Add_error_code #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Add_error_code PMPI_Add_error_code #endif static const char FUNC_NAME[] = "MPI_Add_error_code"; diff --git a/ompi/mpi/c/add_error_string.c b/ompi/mpi/c/add_error_string.c index 6fd751022b..b94e33692d 100644 --- a/ompi/mpi/c/add_error_string.c +++ b/ompi/mpi/c/add_error_string.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Add_error_string = PMPI_Add_error_string #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Add_error_string PMPI_Add_error_string #endif static const char FUNC_NAME[] = "MPI_Add_error_string"; diff --git a/ompi/mpi/c/address.c b/ompi/mpi/c/address.c index 1db0ca52e9..e75bb1dbe2 100644 --- a/ompi/mpi/c/address.c +++ b/ompi/mpi/c/address.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Address = PMPI_Address #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Address PMPI_Address #endif static const char FUNC_NAME[] = "MPI_Address"; diff --git a/ompi/mpi/c/allgather.c b/ompi/mpi/c/allgather.c index b23f30e96f..f82bb309fc 100644 --- a/ompi/mpi/c/allgather.c +++ b/ompi/mpi/c/allgather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Allgather = PMPI_Allgather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Allgather PMPI_Allgather #endif static const char FUNC_NAME[] = "MPI_Allgather"; diff --git a/ompi/mpi/c/allgatherv.c b/ompi/mpi/c/allgatherv.c index aa19513ef8..3e687cc196 100644 --- a/ompi/mpi/c/allgatherv.c +++ b/ompi/mpi/c/allgatherv.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Allgatherv = PMPI_Allgatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Allgatherv PMPI_Allgatherv #endif static const char FUNC_NAME[] = "MPI_Allgatherv"; diff --git a/ompi/mpi/c/alloc_mem.c b/ompi/mpi/c/alloc_mem.c index cb2cca2b0a..033ac6a7c2 100644 --- a/ompi/mpi/c/alloc_mem.c +++ b/ompi/mpi/c/alloc_mem.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/info/info.h" #include "opal/mca/mpool/mpool.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Alloc_mem = PMPI_Alloc_mem #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Alloc_mem PMPI_Alloc_mem #endif static const char FUNC_NAME[] = "MPI_Alloc_mem"; diff --git a/ompi/mpi/c/allreduce.c b/ompi/mpi/c/allreduce.c index c8a4a180e1..27a868ee6e 100644 --- a/ompi/mpi/c/allreduce.c +++ b/ompi/mpi/c/allreduce.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Allreduce = PMPI_Allreduce #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Allreduce PMPI_Allreduce #endif static const char FUNC_NAME[] = "MPI_Allreduce"; diff --git a/ompi/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c index 686c643ca3..3c079b8ff5 100644 --- a/ompi/mpi/c/alltoall.c +++ b/ompi/mpi/c/alltoall.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Alltoall = PMPI_Alltoall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Alltoall PMPI_Alltoall #endif static const char FUNC_NAME[] = "MPI_Alltoall"; diff --git a/ompi/mpi/c/alltoallv.c b/ompi/mpi/c/alltoallv.c index 45567f33b3..f0ec9a673c 100644 --- a/ompi/mpi/c/alltoallv.c +++ b/ompi/mpi/c/alltoallv.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Alltoallv = PMPI_Alltoallv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Alltoallv PMPI_Alltoallv #endif static const char FUNC_NAME[] = "MPI_Alltoallv"; diff --git a/ompi/mpi/c/alltoallw.c b/ompi/mpi/c/alltoallw.c index cfd0efa5f3..1d45f44265 100644 --- a/ompi/mpi/c/alltoallw.c +++ b/ompi/mpi/c/alltoallw.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Alltoallw = PMPI_Alltoallw #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Alltoallw PMPI_Alltoallw #endif static const char FUNC_NAME[] = "MPI_Alltoallw"; diff --git a/ompi/mpi/c/attr_delete.c b/ompi/mpi/c/attr_delete.c index a8b6232d60..841a060451 100644 --- a/ompi/mpi/c/attr_delete.c +++ b/ompi/mpi/c/attr_delete.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Attr_delete = PMPI_Attr_delete #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Attr_delete PMPI_Attr_delete #endif static const char FUNC_NAME[] = "MPI_Attr_delete"; diff --git a/ompi/mpi/c/attr_get.c b/ompi/mpi/c/attr_get.c index d79c71f261..0db0fdf04d 100644 --- a/ompi/mpi/c/attr_get.c +++ b/ompi/mpi/c/attr_get.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Attr_get = PMPI_Attr_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Attr_get PMPI_Attr_get #endif static const char FUNC_NAME[] = "MPI_Attr_get"; diff --git a/ompi/mpi/c/attr_put.c b/ompi/mpi/c/attr_put.c index 0641eb3f18..6c853e34b2 100644 --- a/ompi/mpi/c/attr_put.c +++ b/ompi/mpi/c/attr_put.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Attr_put = PMPI_Attr_put #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Attr_put PMPI_Attr_put #endif static const char FUNC_NAME[] = "MPI_Attr_put"; diff --git a/ompi/mpi/c/barrier.c b/ompi/mpi/c/barrier.c index 05a21046c9..b89938a4f1 100644 --- a/ompi/mpi/c/barrier.c +++ b/ompi/mpi/c/barrier.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Barrier = PMPI_Barrier #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Barrier PMPI_Barrier #endif static const char FUNC_NAME[] = "MPI_Barrier"; diff --git a/ompi/mpi/c/bcast.c b/ompi/mpi/c/bcast.c index a38a792361..44475b16da 100644 --- a/ompi/mpi/c/bcast.c +++ b/ompi/mpi/c/bcast.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Bcast = PMPI_Bcast #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Bcast PMPI_Bcast #endif static const char FUNC_NAME[] = "MPI_Bcast"; diff --git a/ompi/mpi/c/bsend.c b/ompi/mpi/c/bsend.c index a51d75f5d6..c269930d9f 100644 --- a/ompi/mpi/c/bsend.c +++ b/ompi/mpi/c/bsend.c @@ -32,12 +32,12 @@ #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Bsend = PMPI_Bsend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Bsend PMPI_Bsend #endif static const char FUNC_NAME[] = "MPI_Bsend"; diff --git a/ompi/mpi/c/bsend_init.c b/ompi/mpi/c/bsend_init.c index 40ffbf73b5..7c234b3722 100644 --- a/ompi/mpi/c/bsend_init.c +++ b/ompi/mpi/c/bsend_init.c @@ -32,12 +32,12 @@ #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Bsend_init = PMPI_Bsend_init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Bsend_init PMPI_Bsend_init #endif static const char FUNC_NAME[] = "MPI_Bsend_init"; diff --git a/ompi/mpi/c/buffer_attach.c b/ompi/mpi/c/buffer_attach.c index 87aeb54eb6..0b847fd49d 100644 --- a/ompi/mpi/c/buffer_attach.c +++ b/ompi/mpi/c/buffer_attach.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Buffer_attach = PMPI_Buffer_attach #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Buffer_attach PMPI_Buffer_attach #endif static const char FUNC_NAME[] = "MPI_Buffer_attach"; diff --git a/ompi/mpi/c/buffer_detach.c b/ompi/mpi/c/buffer_detach.c index e6a4cf1e4d..096ce26a33 100644 --- a/ompi/mpi/c/buffer_detach.c +++ b/ompi/mpi/c/buffer_detach.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Buffer_detach = PMPI_Buffer_detach #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Buffer_detach PMPI_Buffer_detach #endif static const char FUNC_NAME[] = "MPI_Buffer_detach"; diff --git a/ompi/mpi/c/cancel.c b/ompi/mpi/c/cancel.c index 2f9f80ea71..5033d12d4b 100644 --- a/ompi/mpi/c/cancel.c +++ b/ompi/mpi/c/cancel.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cancel = PMPI_Cancel #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cancel PMPI_Cancel #endif static const char FUNC_NAME[] = "MPI_Cancel"; diff --git a/ompi/mpi/c/cart_coords.c b/ompi/mpi/c/cart_coords.c index c4e9279ed9..7e6d772818 100644 --- a/ompi/mpi/c/cart_coords.c +++ b/ompi/mpi/c/cart_coords.c @@ -12,6 +12,8 @@ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos Nat Security, LLC. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/group/group.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_coords = PMPI_Cart_coords #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_coords PMPI_Cart_coords #endif static const char FUNC_NAME[] = "MPI_Cart_coords"; diff --git a/ompi/mpi/c/cart_create.c b/ompi/mpi/c/cart_create.c index 412eb68c30..8ac7e82072 100644 --- a/ompi/mpi/c/cart_create.c +++ b/ompi/mpi/c/cart_create.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/base/base.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_create = PMPI_Cart_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_create PMPI_Cart_create #endif static const char FUNC_NAME[] = "MPI_Cart_create"; diff --git a/ompi/mpi/c/cart_get.c b/ompi/mpi/c/cart_get.c index 8f65e549a7..171d77032c 100644 --- a/ompi/mpi/c/cart_get.c +++ b/ompi/mpi/c/cart_get.c @@ -12,6 +12,8 @@ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos Nat Security, LLC. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_get = PMPI_Cart_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_get PMPI_Cart_get #endif static const char FUNC_NAME[] = "MPI_Cart_get"; diff --git a/ompi/mpi/c/cart_map.c b/ompi/mpi/c/cart_map.c index e50afe46c1..7db4a03563 100644 --- a/ompi/mpi/c/cart_map.c +++ b/ompi/mpi/c/cart_map.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_map = PMPI_Cart_map #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_map PMPI_Cart_map #endif static const char FUNC_NAME[] = "MPI_Cart_map"; diff --git a/ompi/mpi/c/cart_rank.c b/ompi/mpi/c/cart_rank.c index a78bf35c09..c9d1337718 100644 --- a/ompi/mpi/c/cart_rank.c +++ b/ompi/mpi/c/cart_rank.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_rank = PMPI_Cart_rank #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_rank PMPI_Cart_rank #endif static const char FUNC_NAME[] = "MPI_Cart_rank"; diff --git a/ompi/mpi/c/cart_shift.c b/ompi/mpi/c/cart_shift.c index fd27212fea..5d5ae7d74f 100644 --- a/ompi/mpi/c/cart_shift.c +++ b/ompi/mpi/c/cart_shift.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_shift = PMPI_Cart_shift #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_shift PMPI_Cart_shift #endif static const char FUNC_NAME[] = "MPI_Cart_shift"; diff --git a/ompi/mpi/c/cart_sub.c b/ompi/mpi/c/cart_sub.c index e590161a87..f16f26070a 100644 --- a/ompi/mpi/c/cart_sub.c +++ b/ompi/mpi/c/cart_sub.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cart_sub = PMPI_Cart_sub #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cart_sub PMPI_Cart_sub #endif static const char FUNC_NAME[] = "MPI_Cart_sub"; diff --git a/ompi/mpi/c/cartdim_get.c b/ompi/mpi/c/cartdim_get.c index 1cfd3d1c8b..4f5d5fcc7a 100644 --- a/ompi/mpi/c/cartdim_get.c +++ b/ompi/mpi/c/cartdim_get.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Cartdim_get PMPI_Cartdim_get #endif diff --git a/ompi/mpi/c/close_port.c b/ompi/mpi/c/close_port.c index e81bbedda6..c1931d0a1a 100644 --- a/ompi/mpi/c/close_port.c +++ b/ompi/mpi/c/close_port.c @@ -13,6 +13,8 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/dpm/dpm.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Close_port = PMPI_Close_port #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Close_port PMPI_Close_port #endif static const char FUNC_NAME[] = "MPI_Close_port"; diff --git a/ompi/mpi/c/comm_accept.c b/ompi/mpi/c/comm_accept.c index eb61126549..2f46e5c526 100644 --- a/ompi/mpi/c/comm_accept.c +++ b/ompi/mpi/c/comm_accept.c @@ -15,6 +15,8 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ #include "ompi/dpm/dpm.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_accept = PMPI_Comm_accept #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_accept PMPI_Comm_accept #endif static const char FUNC_NAME[] = "MPI_Comm_accept"; diff --git a/ompi/mpi/c/comm_c2f.c b/ompi/mpi/c/comm_c2f.c index de631311cf..917af41ada 100644 --- a/ompi/mpi/c/comm_c2f.c +++ b/ompi/mpi/c/comm_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_c2f PMPI_Comm_c2f #endif static const char FUNC_NAME[] = "MPI_Comm_c2f"; diff --git a/ompi/mpi/c/comm_call_errhandler.c b/ompi/mpi/c/comm_call_errhandler.c index 83c4351bfa..1d841ec218 100644 --- a/ompi/mpi/c/comm_call_errhandler.c +++ b/ompi/mpi/c/comm_call_errhandler.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler #endif diff --git a/ompi/mpi/c/comm_compare.c b/ompi/mpi/c/comm_compare.c index 3ac26ba9d1..dbb015df2b 100644 --- a/ompi/mpi/c/comm_compare.c +++ b/ompi/mpi/c/comm_compare.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_compare = PMPI_Comm_compare #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_compare PMPI_Comm_compare #endif static const char FUNC_NAME[] = "MPI_Comm_compare"; diff --git a/ompi/mpi/c/comm_connect.c b/ompi/mpi/c/comm_connect.c index 577f4feac3..7d1041682d 100644 --- a/ompi/mpi/c/comm_connect.c +++ b/ompi/mpi/c/comm_connect.c @@ -15,6 +15,8 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ #include "ompi/dpm/dpm.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_connect = PMPI_Comm_connect #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_connect PMPI_Comm_connect #endif static const char FUNC_NAME[] = "MPI_Comm_connect"; diff --git a/ompi/mpi/c/comm_create.c b/ompi/mpi/c/comm_create.c index 5c73e9448e..56465f2523 100644 --- a/ompi/mpi/c/comm_create.c +++ b/ompi/mpi/c/comm_create.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2008 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_create = PMPI_Comm_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_create PMPI_Comm_create #endif static const char FUNC_NAME[] = "MPI_Comm_create"; diff --git a/ompi/mpi/c/comm_create_errhandler.c b/ompi/mpi/c/comm_create_errhandler.c index 35e021dba4..35aff0dc35 100644 --- a/ompi/mpi/c/comm_create_errhandler.c +++ b/ompi/mpi/c/comm_create_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler #endif diff --git a/ompi/mpi/c/comm_create_group.c b/ompi/mpi/c/comm_create_group.c index bd5c134e27..181b7afd59 100644 --- a/ompi/mpi/c/comm_create_group.c +++ b/ompi/mpi/c/comm_create_group.c @@ -13,6 +13,8 @@ * Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_create_group = PMPI_Comm_create_group #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_create_group PMPI_Comm_create_group #endif static const char FUNC_NAME[] = "MPI_Comm_create_group"; diff --git a/ompi/mpi/c/comm_create_keyval.c b/ompi/mpi/c/comm_create_keyval.c index 73d426578e..72ac291906 100644 --- a/ompi/mpi/c/comm_create_keyval.c +++ b/ompi/mpi/c/comm_create_keyval.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_create_keyval = PMPI_Comm_create_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_create_keyval PMPI_Comm_create_keyval #endif static const char FUNC_NAME[] = "MPI_Comm_create_keyval"; diff --git a/ompi/mpi/c/comm_delete_attr.c b/ompi/mpi/c/comm_delete_attr.c index 84dc65148f..3c3d7e828b 100644 --- a/ompi/mpi/c/comm_delete_attr.c +++ b/ompi/mpi/c/comm_delete_attr.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_delete_attr PMPI_Comm_delete_attr #endif static const char FUNC_NAME[] = "MPI_Comm_delete_attr"; diff --git a/ompi/mpi/c/comm_disconnect.c b/ompi/mpi/c/comm_disconnect.c index 6a0ddba187..3ac6672543 100644 --- a/ompi/mpi/c/comm_disconnect.c +++ b/ompi/mpi/c/comm_disconnect.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_disconnect PMPI_Comm_disconnect #endif #include "ompi/dpm/dpm.h" diff --git a/ompi/mpi/c/comm_dup.c b/ompi/mpi/c/comm_dup.c index 6a6b85df07..002e0a70ee 100644 --- a/ompi/mpi/c/comm_dup.c +++ b/ompi/mpi/c/comm_dup.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2008 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_dup = PMPI_Comm_dup #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_dup PMPI_Comm_dup #endif static const char FUNC_NAME[] = "MPI_Comm_dup"; diff --git a/ompi/mpi/c/comm_dup_with_info.c b/ompi/mpi/c/comm_dup_with_info.c index cdd5e9b876..030db141cb 100644 --- a/ompi/mpi/c/comm_dup_with_info.c +++ b/ompi/mpi/c/comm_dup_with_info.c @@ -14,6 +14,8 @@ * Copyright (c) 2006-2008 University of Houston. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_dup_with_info = PMPI_Comm_dup_with_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info #endif static const char FUNC_NAME[] = "MPI_Comm_dup_with_info"; diff --git a/ompi/mpi/c/comm_f2c.c b/ompi/mpi/c/comm_f2c.c index 63413d2b54..709dcbfb46 100644 --- a/ompi/mpi/c/comm_f2c.c +++ b/ompi/mpi/c/comm_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/mpi/fortran/base/fint_2_int.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_f2c = PMPI_Comm_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_f2c PMPI_Comm_f2c #endif static const char FUNC_NAME[] = "MPI_Comm_f2c"; diff --git a/ompi/mpi/c/comm_free.c b/ompi/mpi/c/comm_free.c index 9ac52d9403..a2021a52ae 100644 --- a/ompi/mpi/c/comm_free.c +++ b/ompi/mpi/c/comm_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_free = PMPI_Comm_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_free PMPI_Comm_free #endif static const char FUNC_NAME[] = "MPI_Comm_free"; diff --git a/ompi/mpi/c/comm_free_keyval.c b/ompi/mpi/c/comm_free_keyval.c index 2bbab5438c..c10a4bcab0 100644 --- a/ompi/mpi/c/comm_free_keyval.c +++ b/ompi/mpi/c/comm_free_keyval.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_free_keyval PMPI_Comm_free_keyval #endif static const char FUNC_NAME[] = "MPI_Comm_free_keyval"; diff --git a/ompi/mpi/c/comm_get_attr.c b/ompi/mpi/c/comm_get_attr.c index b7addd4a5b..459db75202 100644 --- a/ompi/mpi/c/comm_get_attr.c +++ b/ompi/mpi/c/comm_get_attr.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_get_attr PMPI_Comm_get_attr #endif static const char FUNC_NAME[] = "MPI_Comm_get_attr"; diff --git a/ompi/mpi/c/comm_get_errhandler.c b/ompi/mpi/c/comm_get_errhandler.c index b35b2c38d0..4a5c8ba9db 100644 --- a/ompi/mpi/c/comm_get_errhandler.c +++ b/ompi/mpi/c/comm_get_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler #endif diff --git a/ompi/mpi/c/comm_get_info.c b/ompi/mpi/c/comm_get_info.c index 533831ce72..cb4ee427dc 100644 --- a/ompi/mpi/c/comm_get_info.c +++ b/ompi/mpi/c/comm_get_info.c @@ -1,6 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,12 +20,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_get_info = PMPI_Comm_get_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_get_info PMPI_Comm_get_info #endif static const char FUNC_NAME[] = "MPI_Comm_get_info"; diff --git a/ompi/mpi/c/comm_get_name.c b/ompi/mpi/c/comm_get_name.c index e9427e650a..8cf7d2c2e0 100644 --- a/ompi/mpi/c/comm_get_name.c +++ b/ompi/mpi/c/comm_get_name.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "opal/threads/mutex.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_get_name = PMPI_Comm_get_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_get_name PMPI_Comm_get_name #endif static const char FUNC_NAME[] = "MPI_Comm_get_name"; diff --git a/ompi/mpi/c/comm_get_parent.c b/ompi/mpi/c/comm_get_parent.c index 420a8aa195..eb4f05b74c 100644 --- a/ompi/mpi/c/comm_get_parent.c +++ b/ompi/mpi/c/comm_get_parent.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,12 +25,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_get_parent PMPI_Comm_get_parent #endif static const char FUNC_NAME[] = "MPI_Comm_get_parent"; diff --git a/ompi/mpi/c/comm_group.c b/ompi/mpi/c/comm_group.c index e4b85807b2..070e772144 100644 --- a/ompi/mpi/c/comm_group.c +++ b/ompi/mpi/c/comm_group.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_group = PMPI_Comm_group #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_group PMPI_Comm_group #endif static const char FUNC_NAME[] = "MPI_Comm_group"; diff --git a/ompi/mpi/c/comm_idup.c b/ompi/mpi/c/comm_idup.c index 1b0ed7f957..f7bd193912 100644 --- a/ompi/mpi/c/comm_idup.c +++ b/ompi/mpi/c/comm_idup.c @@ -14,6 +14,8 @@ * Copyright (c) 2006-2008 University of Houston. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_idup = PMPI_Comm_idup #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_idup PMPI_Comm_idup #endif static const char FUNC_NAME[] = "MPI_Comm_idup"; diff --git a/ompi/mpi/c/comm_join.c b/ompi/mpi/c/comm_join.c index f1538ed117..d90a7b35ef 100644 --- a/ompi/mpi/c/comm_join.c +++ b/ompi/mpi/c/comm_join.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,12 +43,12 @@ #include "ompi/dpm/dpm.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_join = PMPI_Comm_join #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_join PMPI_Comm_join #endif static const char FUNC_NAME[] = "MPI_Comm_join"; diff --git a/ompi/mpi/c/comm_rank.c b/ompi/mpi/c/comm_rank.c index 09c3408a67..d898c12efc 100644 --- a/ompi/mpi/c/comm_rank.c +++ b/ompi/mpi/c/comm_rank.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_rank = PMPI_Comm_rank #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_rank PMPI_Comm_rank #endif static const char FUNC_NAME[] = "MPI_Comm_rank"; diff --git a/ompi/mpi/c/comm_remote_group.c b/ompi/mpi/c/comm_remote_group.c index 30d537cec5..6cf722f42d 100644 --- a/ompi/mpi/c/comm_remote_group.c +++ b/ompi/mpi/c/comm_remote_group.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_remote_group PMPI_Comm_remote_group #endif diff --git a/ompi/mpi/c/comm_remote_size.c b/ompi/mpi/c/comm_remote_size.c index e74e2c55ff..f964fa74e9 100644 --- a/ompi/mpi/c/comm_remote_size.c +++ b/ompi/mpi/c/comm_remote_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_remote_size PMPI_Comm_remote_size #endif diff --git a/ompi/mpi/c/comm_set_attr.c b/ompi/mpi/c/comm_set_attr.c index a59d81ffb9..ea3c1bc873 100644 --- a/ompi/mpi/c/comm_set_attr.c +++ b/ompi/mpi/c/comm_set_attr.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_set_attr PMPI_Comm_set_attr #endif static const char FUNC_NAME[] = "MPI_Comm_set_attr"; diff --git a/ompi/mpi/c/comm_set_errhandler.c b/ompi/mpi/c/comm_set_errhandler.c index 57301b11cf..6ea59248e3 100644 --- a/ompi/mpi/c/comm_set_errhandler.c +++ b/ompi/mpi/c/comm_set_errhandler.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler #endif static const char FUNC_NAME[] = "MPI_Comm_set_errhandler"; diff --git a/ompi/mpi/c/comm_set_info.c b/ompi/mpi/c/comm_set_info.c index ba6c927fa0..3f8fca14e1 100644 --- a/ompi/mpi/c/comm_set_info.c +++ b/ompi/mpi/c/comm_set_info.c @@ -1,6 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,12 +20,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_set_info = PMPI_Comm_set_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_set_info PMPI_Comm_set_info #endif static const char FUNC_NAME[] = "MPI_Comm_set_info"; diff --git a/ompi/mpi/c/comm_set_name.c b/ompi/mpi/c/comm_set_name.c index c87d9d887c..0d4e6141e1 100644 --- a/ompi/mpi/c/comm_set_name.c +++ b/ompi/mpi/c/comm_set_name.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,12 +33,12 @@ #include "ompi/totalview.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_set_name PMPI_Comm_set_name #endif static const char FUNC_NAME[] = "MPI_Comm_set_name"; @@ -73,8 +75,8 @@ int MPI_Comm_set_name(MPI_Comm comm, const char *name) ++ompi_tv_comm_sequence_number; #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_set_name PMPI_Comm_set_name #endif OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME); } diff --git a/ompi/mpi/c/comm_size.c b/ompi/mpi/c/comm_size.c index b899bec66b..42edd028a7 100644 --- a/ompi/mpi/c/comm_size.c +++ b/ompi/mpi/c/comm_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_size = PMPI_Comm_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_size PMPI_Comm_size #endif static const char FUNC_NAME[] = "MPI_Comm_size"; diff --git a/ompi/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c index b16d64dfd3..abf52fe592 100644 --- a/ompi/mpi/c/comm_spawn.c +++ b/ompi/mpi/c/comm_spawn.c @@ -15,6 +15,8 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ #include "ompi/dpm/dpm.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_spawn PMPI_Comm_spawn #endif static const char FUNC_NAME[] = "MPI_Comm_spawn"; diff --git a/ompi/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c index 0abf28cd52..82348dfd46 100644 --- a/ompi/mpi/c/comm_spawn_multiple.c +++ b/ompi/mpi/c/comm_spawn_multiple.c @@ -15,6 +15,8 @@ * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ #include "ompi/dpm/dpm.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple #endif static const char FUNC_NAME[] = "MPI_Comm_spawn_multiple"; diff --git a/ompi/mpi/c/comm_split.c b/ompi/mpi/c/comm_split.c index 174dee1dfc..aadde1c78a 100644 --- a/ompi/mpi/c/comm_split.c +++ b/ompi/mpi/c/comm_split.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_split = PMPI_Comm_split #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_split PMPI_Comm_split #endif static const char FUNC_NAME[] = "MPI_Comm_split"; diff --git a/ompi/mpi/c/comm_split_type.c b/ompi/mpi/c/comm_split_type.c index d3d1fbd246..75c6a75ea9 100644 --- a/ompi/mpi/c/comm_split_type.c +++ b/ompi/mpi/c/comm_split_type.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/info/info.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_split_type = PMPI_Comm_split_type #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_split_type PMPI_Comm_split_type #endif static const char FUNC_NAME[] = "MPI_Comm_split_type"; diff --git a/ompi/mpi/c/comm_test_inter.c b/ompi/mpi/c/comm_test_inter.c index a3fc94cc5d..380244bb61 100644 --- a/ompi/mpi/c/comm_test_inter.c +++ b/ompi/mpi/c/comm_test_inter.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Comm_test_inter PMPI_Comm_test_inter #endif static const char FUNC_NAME[] = "MPI_Comm_test_inter"; diff --git a/ompi/mpi/c/compare_and_swap.c b/ompi/mpi/c/compare_and_swap.c index bb6ab8e63a..b775912e66 100644 --- a/ompi/mpi/c/compare_and_swap.c +++ b/ompi/mpi/c/compare_and_swap.c @@ -33,12 +33,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Compare_and_swap = PMPI_Compare_and_swap #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Compare_and_swap PMPI_Compare_and_swap #endif static const char FUNC_NAME[] = "MPI_Compare_and_swap"; diff --git a/ompi/mpi/c/dims_create.c b/ompi/mpi/c/dims_create.c index b50f526ad2..a4a6f82bc9 100644 --- a/ompi/mpi/c/dims_create.c +++ b/ompi/mpi/c/dims_create.c @@ -13,6 +13,8 @@ * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Dims_create = PMPI_Dims_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Dims_create PMPI_Dims_create #endif static const char FUNC_NAME[] = "MPI_Dims_create"; diff --git a/ompi/mpi/c/dist_graph_create.c b/ompi/mpi/c/dist_graph_create.c index a578dce8fd..2af438296a 100644 --- a/ompi/mpi/c/dist_graph_create.c +++ b/ompi/mpi/c/dist_graph_create.c @@ -8,6 +8,9 @@ * reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow * */ @@ -21,12 +24,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Dist_graph_create = PMPI_Dist_graph_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Dist_graph_create PMPI_Dist_graph_create #endif static const char FUNC_NAME[] = "MPI_Dist_graph_create"; diff --git a/ompi/mpi/c/dist_graph_create_adjacent.c b/ompi/mpi/c/dist_graph_create_adjacent.c index 0b8b31b125..20a9818d8e 100644 --- a/ompi/mpi/c/dist_graph_create_adjacent.c +++ b/ompi/mpi/c/dist_graph_create_adjacent.c @@ -12,6 +12,9 @@ * Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow * * Author(s): Torsten Hoefler * @@ -27,12 +30,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Dist_graph_create_adjacent = PMPI_Dist_graph_create_adjacent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent #endif static const char FUNC_NAME[] = "MPI_Dist_graph_create_adjacent"; diff --git a/ompi/mpi/c/dist_graph_neighbors.c b/ompi/mpi/c/dist_graph_neighbors.c index f0e486ea61..955c573109 100644 --- a/ompi/mpi/c/dist_graph_neighbors.c +++ b/ompi/mpi/c/dist_graph_neighbors.c @@ -7,6 +7,11 @@ * reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow * */ @@ -20,12 +25,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Dist_graph_neighbors = PMPI_Dist_graph_neighbors #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors #endif static const char FUNC_NAME[] = "MPI_Dist_graph_neighbors"; diff --git a/ompi/mpi/c/dist_graph_neighbors_count.c b/ompi/mpi/c/dist_graph_neighbors_count.c index b00b43c164..941672169b 100644 --- a/ompi/mpi/c/dist_graph_neighbors_count.c +++ b/ompi/mpi/c/dist_graph_neighbors_count.c @@ -7,6 +7,11 @@ * reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow * */ #include @@ -22,12 +27,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Dist_graph_neighbors_count = PMPI_Dist_graph_neighbors_count #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count #endif static const char FUNC_NAME[] = "MPI_Dist_graph_neighbors_count"; diff --git a/ompi/mpi/c/errhandler_c2f.c b/ompi/mpi/c/errhandler_c2f.c index 9f59fe96c0..a11c024883 100644 --- a/ompi/mpi/c/errhandler_c2f.c +++ b/ompi/mpi/c/errhandler_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/mpi/fortran/base/fint_2_int.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_c2f = PMPI_Errhandler_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_c2f PMPI_Errhandler_c2f #endif static const char FUNC_NAME[] = "MPI_Errhandler_c2f"; diff --git a/ompi/mpi/c/errhandler_create.c b/ompi/mpi/c/errhandler_create.c index 5878c6977f..142f179101 100644 --- a/ompi/mpi/c/errhandler_create.c +++ b/ompi/mpi/c/errhandler_create.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,14 +24,17 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_create = PMPI_Errhandler_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_create PMPI_Errhandler_create #endif +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler +#endif int MPI_Errhandler_create(MPI_Handler_function *function, MPI_Errhandler *errhandler) diff --git a/ompi/mpi/c/errhandler_f2c.c b/ompi/mpi/c/errhandler_f2c.c index 0f83a2991d..be3d6a9553 100644 --- a/ompi/mpi/c/errhandler_f2c.c +++ b/ompi/mpi/c/errhandler_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/mpi/fortran/base/fint_2_int.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_f2c = PMPI_Errhandler_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_f2c PMPI_Errhandler_f2c #endif static const char FUNC_NAME[] = "MPI_Errhandler_f2c"; diff --git a/ompi/mpi/c/errhandler_free.c b/ompi/mpi/c/errhandler_free.c index b772c3873d..5dba1ebb44 100644 --- a/ompi/mpi/c/errhandler_free.c +++ b/ompi/mpi/c/errhandler_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,12 +25,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_free PMPI_Errhandler_free #endif static const char FUNC_NAME[] = "MPI_Errhandler_free"; diff --git a/ompi/mpi/c/errhandler_get.c b/ompi/mpi/c/errhandler_get.c index dcb13c532d..8cdff57372 100644 --- a/ompi/mpi/c/errhandler_get.c +++ b/ompi/mpi/c/errhandler_get.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,16 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_get PMPI_Errhandler_get +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler #endif static const char FUNC_NAME[] = "MPI_Errhandler_get"; diff --git a/ompi/mpi/c/errhandler_set.c b/ompi/mpi/c/errhandler_set.c index 5216595aed..fac741cab1 100644 --- a/ompi/mpi/c/errhandler_set.c +++ b/ompi/mpi/c/errhandler_set.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,16 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Errhandler_set PMPI_Errhandler_set +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler #endif static const char FUNC_NAME[] = "MPI_Errhandler_set"; diff --git a/ompi/mpi/c/error_class.c b/ompi/mpi/c/error_class.c index 384595c121..326ee37dba 100644 --- a/ompi/mpi/c/error_class.c +++ b/ompi/mpi/c/error_class.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Error_class = PMPI_Error_class #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Error_class PMPI_Error_class #endif static const char FUNC_NAME[] = "MPI_Error_class"; diff --git a/ompi/mpi/c/error_string.c b/ompi/mpi/c/error_string.c index d1e85db015..5ae6fd32ac 100644 --- a/ompi/mpi/c/error_string.c +++ b/ompi/mpi/c/error_string.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Error_string = PMPI_Error_string #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Error_string PMPI_Error_string #endif static const char FUNC_NAME[] = "MPI_Error_string"; diff --git a/ompi/mpi/c/exscan.c b/ompi/mpi/c/exscan.c index 0be98432af..92c8dfa18f 100644 --- a/ompi/mpi/c/exscan.c +++ b/ompi/mpi/c/exscan.c @@ -31,12 +31,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Exscan = PMPI_Exscan #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Exscan PMPI_Exscan #endif static const char FUNC_NAME[] = "MPI_Exscan"; diff --git a/ompi/mpi/c/fetch_and_op.c b/ompi/mpi/c/fetch_and_op.c index 2b1278ba4d..dc6af07dde 100644 --- a/ompi/mpi/c/fetch_and_op.c +++ b/ompi/mpi/c/fetch_and_op.c @@ -33,12 +33,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Fetch_and_op = PMPI_Fetch_and_op #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Fetch_and_op PMPI_Fetch_and_op #endif static const char FUNC_NAME[] = "MPI_Fetch_and_op"; diff --git a/ompi/mpi/c/file_c2f.c b/ompi/mpi/c/file_c2f.c index 62b8c99583..8456621a24 100644 --- a/ompi/mpi/c/file_c2f.c +++ b/ompi/mpi/c/file_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_c2f = PMPI_File_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_c2f PMPI_File_c2f #endif static const char FUNC_NAME[] = "MPI_File_c2f"; diff --git a/ompi/mpi/c/file_call_errhandler.c b/ompi/mpi/c/file_call_errhandler.c index 27b92813fe..1ab9cda4e2 100644 --- a/ompi/mpi/c/file_call_errhandler.c +++ b/ompi/mpi/c/file_call_errhandler.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_call_errhandler = PMPI_File_call_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_call_errhandler PMPI_File_call_errhandler #endif static const char FUNC_NAME[] = "MPI_File_call_errhandler"; diff --git a/ompi/mpi/c/file_close.c b/ompi/mpi/c/file_close.c index cedc1bf2ad..7387a98671 100644 --- a/ompi/mpi/c/file_close.c +++ b/ompi/mpi/c/file_close.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,12 +25,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_close = PMPI_File_close #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_close PMPI_File_close #endif static const char FUNC_NAME[] = "MPI_File_close"; diff --git a/ompi/mpi/c/file_create_errhandler.c b/ompi/mpi/c/file_create_errhandler.c index ef63a9bc35..aee9673a01 100644 --- a/ompi/mpi/c/file_create_errhandler.c +++ b/ompi/mpi/c/file_create_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_create_errhandler = PMPI_File_create_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_create_errhandler PMPI_File_create_errhandler #endif static const char FUNC_NAME[] = "MPI_File_create_errhandler"; diff --git a/ompi/mpi/c/file_delete.c b/ompi/mpi/c/file_delete.c index 8fb1ddae68..fa33a17790 100644 --- a/ompi/mpi/c/file_delete.c +++ b/ompi/mpi/c/file_delete.c @@ -31,12 +31,12 @@ #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_delete = PMPI_File_delete #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_delete PMPI_File_delete #endif static const char FUNC_NAME[] = "MPI_File_delete"; diff --git a/ompi/mpi/c/file_f2c.c b/ompi/mpi/c/file_f2c.c index 3e44b3e4f7..c3ab9fda40 100644 --- a/ompi/mpi/c/file_f2c.c +++ b/ompi/mpi/c/file_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_f2c = PMPI_File_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_f2c PMPI_File_f2c #endif static const char FUNC_NAME[] = "MPI_File_f2c"; diff --git a/ompi/mpi/c/file_get_amode.c b/ompi/mpi/c/file_get_amode.c index 6b5e9f2552..77a53130c2 100644 --- a/ompi/mpi/c/file_get_amode.c +++ b/ompi/mpi/c/file_get_amode.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_amode = PMPI_File_get_amode #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_amode PMPI_File_get_amode #endif static const char FUNC_NAME[] = "MPI_File_get_amode"; diff --git a/ompi/mpi/c/file_get_atomicity.c b/ompi/mpi/c/file_get_atomicity.c index 89e2047fa4..fe98db52a3 100644 --- a/ompi/mpi/c/file_get_atomicity.c +++ b/ompi/mpi/c/file_get_atomicity.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_atomicity PMPI_File_get_atomicity #endif static const char FUNC_NAME[] = "MPI_File_get_atomicity"; diff --git a/ompi/mpi/c/file_get_byte_offset.c b/ompi/mpi/c/file_get_byte_offset.c index b11be1aa30..fd4144ffba 100644 --- a/ompi/mpi/c/file_get_byte_offset.c +++ b/ompi/mpi/c/file_get_byte_offset.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_byte_offset PMPI_File_get_byte_offset #endif static const char FUNC_NAME[] = "MPI_File_get_byte_offset"; diff --git a/ompi/mpi/c/file_get_errhandler.c b/ompi/mpi/c/file_get_errhandler.c index 1820bbf145..73b1c18d53 100644 --- a/ompi/mpi/c/file_get_errhandler.c +++ b/ompi/mpi/c/file_get_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_errhandler = PMPI_File_get_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_errhandler PMPI_File_get_errhandler #endif static const char FUNC_NAME[] = "MPI_File_get_errhandler"; diff --git a/ompi/mpi/c/file_get_group.c b/ompi/mpi/c/file_get_group.c index 1cd39acd13..8e1bca2011 100644 --- a/ompi/mpi/c/file_get_group.c +++ b/ompi/mpi/c/file_get_group.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_group = PMPI_File_get_group #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_group PMPI_File_get_group #endif static const char FUNC_NAME[] = "MPI_File_get_group"; diff --git a/ompi/mpi/c/file_get_info.c b/ompi/mpi/c/file_get_info.c index 91caeb522d..906d63ec47 100644 --- a/ompi/mpi/c/file_get_info.c +++ b/ompi/mpi/c/file_get_info.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_info = PMPI_File_get_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_info PMPI_File_get_info #endif static const char FUNC_NAME[] = "MPI_File_get_info"; diff --git a/ompi/mpi/c/file_get_position.c b/ompi/mpi/c/file_get_position.c index ef83ef027c..1a32ad7163 100644 --- a/ompi/mpi/c/file_get_position.c +++ b/ompi/mpi/c/file_get_position.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_position = PMPI_File_get_position #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_position PMPI_File_get_position #endif static const char FUNC_NAME[] = "MPI_File_get_position"; diff --git a/ompi/mpi/c/file_get_position_shared.c b/ompi/mpi/c/file_get_position_shared.c index 26d7fd8543..cf6cfe4533 100644 --- a/ompi/mpi/c/file_get_position_shared.c +++ b/ompi/mpi/c/file_get_position_shared.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_position_shared PMPI_File_get_position_shared #endif static const char FUNC_NAME[] = "MPI_File_get_position_shared"; diff --git a/ompi/mpi/c/file_get_size.c b/ompi/mpi/c/file_get_size.c index 0fdb9c951d..d0e3628ab7 100644 --- a/ompi/mpi/c/file_get_size.c +++ b/ompi/mpi/c/file_get_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_size = PMPI_File_get_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_size PMPI_File_get_size #endif static const char FUNC_NAME[] = "MPI_File_get_size"; diff --git a/ompi/mpi/c/file_get_type_extent.c b/ompi/mpi/c/file_get_type_extent.c index adafa1b64e..510bd7ec81 100644 --- a/ompi/mpi/c/file_get_type_extent.c +++ b/ompi/mpi/c/file_get_type_extent.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/file/file.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_type_extent = PMPI_File_get_type_extent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_type_extent PMPI_File_get_type_extent #endif static const char FUNC_NAME[] = "MPI_File_get_type_extent"; diff --git a/ompi/mpi/c/file_get_view.c b/ompi/mpi/c/file_get_view.c index 275430493d..8e87f73fc6 100644 --- a/ompi/mpi/c/file_get_view.c +++ b/ompi/mpi/c/file_get_view.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_get_view = PMPI_File_get_view #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_get_view PMPI_File_get_view #endif static const char FUNC_NAME[] = "MPI_File_get_view"; diff --git a/ompi/mpi/c/file_iread.c b/ompi/mpi/c/file_iread.c index 1e8ac044d0..5b18f4e327 100644 --- a/ompi/mpi/c/file_iread.c +++ b/ompi/mpi/c/file_iread.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iread = PMPI_File_iread #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iread PMPI_File_iread #endif static const char FUNC_NAME[] = "MPI_File_iread"; diff --git a/ompi/mpi/c/file_iread_all.c b/ompi/mpi/c/file_iread_all.c index 1f48a7fb24..bce37eca2e 100644 --- a/ompi/mpi/c/file_iread_all.c +++ b/ompi/mpi/c/file_iread_all.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2015 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iread_all = PMPI_File_iread_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iread_all PMPI_File_iread_all #endif static const char FUNC_NAME[] = "MPI_File_iread_all"; diff --git a/ompi/mpi/c/file_iread_at.c b/ompi/mpi/c/file_iread_at.c index c2f11d047e..832b1263dd 100644 --- a/ompi/mpi/c/file_iread_at.c +++ b/ompi/mpi/c/file_iread_at.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iread_at = PMPI_File_iread_at #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iread_at PMPI_File_iread_at #endif static const char FUNC_NAME[] = "MPI_File_iread_at"; diff --git a/ompi/mpi/c/file_iread_at_all.c b/ompi/mpi/c/file_iread_at_all.c index 4c162b2467..4cc324c308 100644 --- a/ompi/mpi/c/file_iread_at_all.c +++ b/ompi/mpi/c/file_iread_at_all.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2015 University of Houston. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iread_at_all = PMPI_File_iread_at_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iread_at_all PMPI_File_iread_at_all #endif static const char FUNC_NAME[] = "MPI_File_iread_at_all"; diff --git a/ompi/mpi/c/file_iread_shared.c b/ompi/mpi/c/file_iread_shared.c index 0d311cabbc..5e91f80b23 100644 --- a/ompi/mpi/c/file_iread_shared.c +++ b/ompi/mpi/c/file_iread_shared.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iread_shared = PMPI_File_iread_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iread_shared PMPI_File_iread_shared #endif static const char FUNC_NAME[] = "MPI_File_iread_shared"; diff --git a/ompi/mpi/c/file_iwrite.c b/ompi/mpi/c/file_iwrite.c index 22028d5113..14e4d8807c 100644 --- a/ompi/mpi/c/file_iwrite.c +++ b/ompi/mpi/c/file_iwrite.c @@ -33,12 +33,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iwrite = PMPI_File_iwrite #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iwrite PMPI_File_iwrite #endif static const char FUNC_NAME[] = "MPI_File_iwrite"; diff --git a/ompi/mpi/c/file_iwrite_all.c b/ompi/mpi/c/file_iwrite_all.c index 229036622c..4768567e74 100644 --- a/ompi/mpi/c/file_iwrite_all.c +++ b/ompi/mpi/c/file_iwrite_all.c @@ -34,12 +34,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iwrite_all = PMPI_File_iwrite_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iwrite_all PMPI_File_iwrite_all #endif static const char FUNC_NAME[] = "MPI_File_iwrite_all"; diff --git a/ompi/mpi/c/file_iwrite_at.c b/ompi/mpi/c/file_iwrite_at.c index f29d41138f..7d5ef43cf2 100644 --- a/ompi/mpi/c/file_iwrite_at.c +++ b/ompi/mpi/c/file_iwrite_at.c @@ -33,12 +33,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iwrite_at = PMPI_File_iwrite_at #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iwrite_at PMPI_File_iwrite_at #endif static const char FUNC_NAME[] = "MPI_File_iwrite_at"; diff --git a/ompi/mpi/c/file_iwrite_at_all.c b/ompi/mpi/c/file_iwrite_at_all.c index 955b5c1564..272660dba5 100644 --- a/ompi/mpi/c/file_iwrite_at_all.c +++ b/ompi/mpi/c/file_iwrite_at_all.c @@ -34,12 +34,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iwrite_at_all = PMPI_File_iwrite_at_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all #endif static const char FUNC_NAME[] = "MPI_File_iwrite_at_all"; diff --git a/ompi/mpi/c/file_iwrite_shared.c b/ompi/mpi/c/file_iwrite_shared.c index 544e3ae1e5..f7501b2864 100644 --- a/ompi/mpi/c/file_iwrite_shared.c +++ b/ompi/mpi/c/file_iwrite_shared.c @@ -33,12 +33,12 @@ #include "ompi/mca/io/base/io_base_request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_iwrite_shared = PMPI_File_iwrite_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_iwrite_shared PMPI_File_iwrite_shared #endif static const char FUNC_NAME[] = "MPI_File_iwrite_shared"; diff --git a/ompi/mpi/c/file_open.c b/ompi/mpi/c/file_open.c index 9fb944ba51..86e8bec979 100644 --- a/ompi/mpi/c/file_open.c +++ b/ompi/mpi/c/file_open.c @@ -34,12 +34,12 @@ #include "ompi/mca/io/base/base.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_open = PMPI_File_open #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_open PMPI_File_open #endif static const char FUNC_NAME[] = "MPI_File_open"; diff --git a/ompi/mpi/c/file_preallocate.c b/ompi/mpi/c/file_preallocate.c index c7441b262e..68c6cdb0f0 100644 --- a/ompi/mpi/c/file_preallocate.c +++ b/ompi/mpi/c/file_preallocate.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_preallocate = PMPI_File_preallocate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_preallocate PMPI_File_preallocate #endif static const char FUNC_NAME[] = "MPI_File_preallocate"; diff --git a/ompi/mpi/c/file_read.c b/ompi/mpi/c/file_read.c index 85c404a329..f437aa0d0e 100644 --- a/ompi/mpi/c/file_read.c +++ b/ompi/mpi/c/file_read.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read = PMPI_File_read #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read PMPI_File_read #endif static const char FUNC_NAME[] = "MPI_File_read"; diff --git a/ompi/mpi/c/file_read_all.c b/ompi/mpi/c/file_read_all.c index 8ff2a02149..cffe051824 100644 --- a/ompi/mpi/c/file_read_all.c +++ b/ompi/mpi/c/file_read_all.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_all = PMPI_File_read_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_all PMPI_File_read_all #endif static const char FUNC_NAME[] = "MPI_File_read_all"; diff --git a/ompi/mpi/c/file_read_all_begin.c b/ompi/mpi/c/file_read_all_begin.c index 11b9f54330..0e7bfc6606 100644 --- a/ompi/mpi/c/file_read_all_begin.c +++ b/ompi/mpi/c/file_read_all_begin.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_all_begin = PMPI_File_read_all_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_all_begin PMPI_File_read_all_begin #endif static const char FUNC_NAME[] = "MPI_File_read_all_begin"; diff --git a/ompi/mpi/c/file_read_all_end.c b/ompi/mpi/c/file_read_all_end.c index 9b62a32462..683a0aadf0 100644 --- a/ompi/mpi/c/file_read_all_end.c +++ b/ompi/mpi/c/file_read_all_end.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_all_end = PMPI_File_read_all_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_all_end PMPI_File_read_all_end #endif static const char FUNC_NAME[] = "MPI_File_read_all_end"; diff --git a/ompi/mpi/c/file_read_at.c b/ompi/mpi/c/file_read_at.c index a5a9a78c3b..e5a7cfbfc0 100644 --- a/ompi/mpi/c/file_read_at.c +++ b/ompi/mpi/c/file_read_at.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_at = PMPI_File_read_at #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_at PMPI_File_read_at #endif static const char FUNC_NAME[] = "MPI_File_read_at"; diff --git a/ompi/mpi/c/file_read_at_all.c b/ompi/mpi/c/file_read_at_all.c index 51eb3efd7f..19cc2342e3 100644 --- a/ompi/mpi/c/file_read_at_all.c +++ b/ompi/mpi/c/file_read_at_all.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_at_all = PMPI_File_read_at_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_at_all PMPI_File_read_at_all #endif static const char FUNC_NAME[] = "MPI_File_read_at_all"; diff --git a/ompi/mpi/c/file_read_at_all_begin.c b/ompi/mpi/c/file_read_at_all_begin.c index 86f739c9e7..66f7656aba 100644 --- a/ompi/mpi/c/file_read_at_all_begin.c +++ b/ompi/mpi/c/file_read_at_all_begin.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_at_all_begin = PMPI_File_read_at_all_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_at_all_begin PMPI_File_read_at_all_begin #endif static const char FUNC_NAME[] = "MPI_File_read_at_all_begin"; diff --git a/ompi/mpi/c/file_read_at_all_end.c b/ompi/mpi/c/file_read_at_all_end.c index 8e0056ec2e..a5093061e0 100644 --- a/ompi/mpi/c/file_read_at_all_end.c +++ b/ompi/mpi/c/file_read_at_all_end.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_at_all_end = PMPI_File_read_at_all_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_at_all_end PMPI_File_read_at_all_end #endif static const char FUNC_NAME[] = "MPI_File_read_at_all_end"; diff --git a/ompi/mpi/c/file_read_ordered.c b/ompi/mpi/c/file_read_ordered.c index f72e03e857..801cc57bb9 100644 --- a/ompi/mpi/c/file_read_ordered.c +++ b/ompi/mpi/c/file_read_ordered.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/file/file.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_ordered = PMPI_File_read_ordered #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_ordered PMPI_File_read_ordered #endif static const char FUNC_NAME[] = "MPI_File_read_ordered"; diff --git a/ompi/mpi/c/file_read_ordered_begin.c b/ompi/mpi/c/file_read_ordered_begin.c index adf72e22eb..d31cd7f32d 100644 --- a/ompi/mpi/c/file_read_ordered_begin.c +++ b/ompi/mpi/c/file_read_ordered_begin.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_ordered_begin = PMPI_File_read_ordered_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_ordered_begin PMPI_File_read_ordered_begin #endif static const char FUNC_NAME[] = "MPI_File_read_ordered_begin"; diff --git a/ompi/mpi/c/file_read_ordered_end.c b/ompi/mpi/c/file_read_ordered_end.c index 402d01c9da..2c29655afb 100644 --- a/ompi/mpi/c/file_read_ordered_end.c +++ b/ompi/mpi/c/file_read_ordered_end.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_ordered_end = PMPI_File_read_ordered_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_ordered_end PMPI_File_read_ordered_end #endif static const char FUNC_NAME[] = "MPI_File_read_ordered_end"; diff --git a/ompi/mpi/c/file_read_shared.c b/ompi/mpi/c/file_read_shared.c index 597a136ccb..7a90a0ad5e 100644 --- a/ompi/mpi/c/file_read_shared.c +++ b/ompi/mpi/c/file_read_shared.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_read_shared = PMPI_File_read_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_read_shared PMPI_File_read_shared #endif static const char FUNC_NAME[] = "MPI_File_read_shared"; diff --git a/ompi/mpi/c/file_seek.c b/ompi/mpi/c/file_seek.c index be1bdecb4f..5561b04fcc 100644 --- a/ompi/mpi/c/file_seek.c +++ b/ompi/mpi/c/file_seek.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_seek = PMPI_File_seek #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_seek PMPI_File_seek #endif static const char FUNC_NAME[] = "MPI_File_seek"; diff --git a/ompi/mpi/c/file_seek_shared.c b/ompi/mpi/c/file_seek_shared.c index 81284a098d..6603842e38 100644 --- a/ompi/mpi/c/file_seek_shared.c +++ b/ompi/mpi/c/file_seek_shared.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_seek_shared = PMPI_File_seek_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_seek_shared PMPI_File_seek_shared #endif static const char FUNC_NAME[] = "MPI_File_seek_shared"; diff --git a/ompi/mpi/c/file_set_atomicity.c b/ompi/mpi/c/file_set_atomicity.c index 9c81c87f74..fad4a37f7b 100644 --- a/ompi/mpi/c/file_set_atomicity.c +++ b/ompi/mpi/c/file_set_atomicity.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_set_atomicity = PMPI_File_set_atomicity #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_set_atomicity PMPI_File_set_atomicity #endif static const char FUNC_NAME[] = "MPI_File_set_atomicity"; diff --git a/ompi/mpi/c/file_set_errhandler.c b/ompi/mpi/c/file_set_errhandler.c index 074020aa6b..07973097e1 100644 --- a/ompi/mpi/c/file_set_errhandler.c +++ b/ompi/mpi/c/file_set_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_set_errhandler = PMPI_File_set_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_set_errhandler PMPI_File_set_errhandler #endif static const char FUNC_NAME[] = "MPI_File_set_errhandler"; diff --git a/ompi/mpi/c/file_set_info.c b/ompi/mpi/c/file_set_info.c index 7b1d008e84..46474ed240 100644 --- a/ompi/mpi/c/file_set_info.c +++ b/ompi/mpi/c/file_set_info.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/info/info.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_set_info = PMPI_File_set_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_set_info PMPI_File_set_info #endif static const char FUNC_NAME[] = "MPI_File_set_info"; diff --git a/ompi/mpi/c/file_set_size.c b/ompi/mpi/c/file_set_size.c index 2f29e5f733..744c368208 100644 --- a/ompi/mpi/c/file_set_size.c +++ b/ompi/mpi/c/file_set_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_set_size = PMPI_File_set_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_set_size PMPI_File_set_size #endif static const char FUNC_NAME[] = "MPI_File_set_size"; diff --git a/ompi/mpi/c/file_set_view.c b/ompi/mpi/c/file_set_view.c index 9212405e42..b270cff5e9 100644 --- a/ompi/mpi/c/file_set_view.c +++ b/ompi/mpi/c/file_set_view.c @@ -32,12 +32,12 @@ #include "ompi/file/file.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_set_view = PMPI_File_set_view #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_set_view PMPI_File_set_view #endif static const char FUNC_NAME[] = "MPI_File_set_view"; diff --git a/ompi/mpi/c/file_sync.c b/ompi/mpi/c/file_sync.c index c30e127a15..8f71bc7800 100644 --- a/ompi/mpi/c/file_sync.c +++ b/ompi/mpi/c/file_sync.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_sync = PMPI_File_sync #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_sync PMPI_File_sync #endif static const char FUNC_NAME[] = "MPI_File_sync"; diff --git a/ompi/mpi/c/file_write.c b/ompi/mpi/c/file_write.c index 85adee2a36..0ba0ee1830 100644 --- a/ompi/mpi/c/file_write.c +++ b/ompi/mpi/c/file_write.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write = PMPI_File_write #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write PMPI_File_write #endif static const char FUNC_NAME[] = "MPI_File_write"; diff --git a/ompi/mpi/c/file_write_all.c b/ompi/mpi/c/file_write_all.c index 3eaf7264f7..b16521dd62 100644 --- a/ompi/mpi/c/file_write_all.c +++ b/ompi/mpi/c/file_write_all.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_all = PMPI_File_write_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_all PMPI_File_write_all #endif static const char FUNC_NAME[] = "MPI_File_write_all"; diff --git a/ompi/mpi/c/file_write_all_begin.c b/ompi/mpi/c/file_write_all_begin.c index 0112731a5c..ca935fc491 100644 --- a/ompi/mpi/c/file_write_all_begin.c +++ b/ompi/mpi/c/file_write_all_begin.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_all_begin = PMPI_File_write_all_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_all_begin PMPI_File_write_all_begin #endif static const char FUNC_NAME[] = "MPI_File_write_all_begin"; diff --git a/ompi/mpi/c/file_write_all_end.c b/ompi/mpi/c/file_write_all_end.c index 639499c073..759daf8b77 100644 --- a/ompi/mpi/c/file_write_all_end.c +++ b/ompi/mpi/c/file_write_all_end.c @@ -29,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_all_end = PMPI_File_write_all_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_all_end PMPI_File_write_all_end #endif static const char FUNC_NAME[] = "MPI_File_write_all_end"; diff --git a/ompi/mpi/c/file_write_at.c b/ompi/mpi/c/file_write_at.c index 3d58ecbc03..c824634e25 100644 --- a/ompi/mpi/c/file_write_at.c +++ b/ompi/mpi/c/file_write_at.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_at = PMPI_File_write_at #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_at PMPI_File_write_at #endif static const char FUNC_NAME[] = "MPI_File_write_at"; diff --git a/ompi/mpi/c/file_write_at_all.c b/ompi/mpi/c/file_write_at_all.c index cc2fe5cfb3..a49eed376a 100644 --- a/ompi/mpi/c/file_write_at_all.c +++ b/ompi/mpi/c/file_write_at_all.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_at_all = PMPI_File_write_at_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_at_all PMPI_File_write_at_all #endif static const char FUNC_NAME[] = "MPI_File_write_at_all"; diff --git a/ompi/mpi/c/file_write_at_all_begin.c b/ompi/mpi/c/file_write_at_all_begin.c index cbc15abdd2..7d9ea18748 100644 --- a/ompi/mpi/c/file_write_at_all_begin.c +++ b/ompi/mpi/c/file_write_at_all_begin.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_at_all_begin = PMPI_File_write_at_all_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_at_all_begin PMPI_File_write_at_all_begin #endif static const char FUNC_NAME[] = "MPI_File_write_at_all_begin"; diff --git a/ompi/mpi/c/file_write_at_all_end.c b/ompi/mpi/c/file_write_at_all_end.c index 4410c71ce4..3cf605879d 100644 --- a/ompi/mpi/c/file_write_at_all_end.c +++ b/ompi/mpi/c/file_write_at_all_end.c @@ -29,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_at_all_end = PMPI_File_write_at_all_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_at_all_end PMPI_File_write_at_all_end #endif static const char FUNC_NAME[] = "MPI_File_write_at_all_end"; diff --git a/ompi/mpi/c/file_write_ordered.c b/ompi/mpi/c/file_write_ordered.c index 1a548976f2..bc09edd82e 100644 --- a/ompi/mpi/c/file_write_ordered.c +++ b/ompi/mpi/c/file_write_ordered.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_ordered = PMPI_File_write_ordered #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_ordered PMPI_File_write_ordered #endif static const char FUNC_NAME[] = "MPI_File_write_ordered"; diff --git a/ompi/mpi/c/file_write_ordered_begin.c b/ompi/mpi/c/file_write_ordered_begin.c index 44c511ad58..a50049a0e5 100644 --- a/ompi/mpi/c/file_write_ordered_begin.c +++ b/ompi/mpi/c/file_write_ordered_begin.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_ordered_begin = PMPI_File_write_ordered_begin #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_ordered_begin PMPI_File_write_ordered_begin #endif static const char FUNC_NAME[] = "MPI_File_write_ordered_begin"; diff --git a/ompi/mpi/c/file_write_ordered_end.c b/ompi/mpi/c/file_write_ordered_end.c index 55185ff9db..f80f7eb39c 100644 --- a/ompi/mpi/c/file_write_ordered_end.c +++ b/ompi/mpi/c/file_write_ordered_end.c @@ -29,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_ordered_end = PMPI_File_write_ordered_end #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_ordered_end PMPI_File_write_ordered_end #endif static const char FUNC_NAME[] = "MPI_File_write_ordered_end"; diff --git a/ompi/mpi/c/file_write_shared.c b/ompi/mpi/c/file_write_shared.c index 41adedb19c..34f8ed7a50 100644 --- a/ompi/mpi/c/file_write_shared.c +++ b/ompi/mpi/c/file_write_shared.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_File_write_shared = PMPI_File_write_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_File_write_shared PMPI_File_write_shared #endif static const char FUNC_NAME[] = "MPI_File_write_shared"; diff --git a/ompi/mpi/c/finalize.c b/ompi/mpi/c/finalize.c index b844f02293..485dbbf229 100644 --- a/ompi/mpi/c/finalize.c +++ b/ompi/mpi/c/finalize.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,12 +24,12 @@ #include "ompi/runtime/params.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Finalize = PMPI_Finalize #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Finalize PMPI_Finalize #endif static const char FUNC_NAME[] = "MPI_Finalize"; diff --git a/ompi/mpi/c/finalized.c b/ompi/mpi/c/finalized.c index c1de8eeb0c..8b11cc56e0 100644 --- a/ompi/mpi/c/finalized.c +++ b/ompi/mpi/c/finalized.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +26,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Finalized = PMPI_Finalized #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Finalized PMPI_Finalized #endif static const char FUNC_NAME[] = "MPI_Finalized"; diff --git a/ompi/mpi/c/free_mem.c b/ompi/mpi/c/free_mem.c index f555959f25..9d472908bf 100644 --- a/ompi/mpi/c/free_mem.c +++ b/ompi/mpi/c/free_mem.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "opal/mca/mpool/mpool.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Free_mem = PMPI_Free_mem #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Free_mem PMPI_Free_mem #endif static const char FUNC_NAME[] = "MPI_Free_mem"; diff --git a/ompi/mpi/c/gather.c b/ompi/mpi/c/gather.c index 49f01709a1..f264bb0aa8 100644 --- a/ompi/mpi/c/gather.c +++ b/ompi/mpi/c/gather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Gather = PMPI_Gather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Gather PMPI_Gather #endif static const char FUNC_NAME[] = "MPI_Gather"; diff --git a/ompi/mpi/c/gatherv.c b/ompi/mpi/c/gatherv.c index 9b926f96dd..bd2941d41e 100644 --- a/ompi/mpi/c/gatherv.c +++ b/ompi/mpi/c/gatherv.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Gatherv = PMPI_Gatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Gatherv PMPI_Gatherv #endif static const char FUNC_NAME[] = "MPI_Gatherv"; diff --git a/ompi/mpi/c/get.c b/ompi/mpi/c/get.c index 30161daacf..8faa540a2c 100644 --- a/ompi/mpi/c/get.c +++ b/ompi/mpi/c/get.c @@ -31,12 +31,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get = PMPI_Get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get PMPI_Get #endif static const char FUNC_NAME[] = "MPI_Get"; diff --git a/ompi/mpi/c/get_accumulate.c b/ompi/mpi/c/get_accumulate.c index fdb3ab911a..d01cea8926 100644 --- a/ompi/mpi/c/get_accumulate.c +++ b/ompi/mpi/c/get_accumulate.c @@ -35,12 +35,12 @@ #include "ompi/datatype/ompi_datatype_internal.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_accumulate = PMPI_Get_accumulate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_accumulate PMPI_Get_accumulate #endif static const char FUNC_NAME[] = "MPI_Get_accumulate"; diff --git a/ompi/mpi/c/get_address.c b/ompi/mpi/c/get_address.c index b2d28e8562..b5d7d0dd6c 100644 --- a/ompi/mpi/c/get_address.c +++ b/ompi/mpi/c/get_address.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_address = PMPI_Get_address #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_address PMPI_Get_address #endif static const char FUNC_NAME[] = "MPI_Get_address"; diff --git a/ompi/mpi/c/get_count.c b/ompi/mpi/c/get_count.c index afc4589016..f5bb19a075 100644 --- a/ompi/mpi/c/get_count.c +++ b/ompi/mpi/c/get_count.c @@ -13,6 +13,8 @@ * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_count = PMPI_Get_count #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_count PMPI_Get_count #endif static const char FUNC_NAME[] = "MPI_Get_count"; diff --git a/ompi/mpi/c/get_elements.c b/ompi/mpi/c/get_elements.c index 4ddfb8f61f..a610198658 100644 --- a/ompi/mpi/c/get_elements.c +++ b/ompi/mpi/c/get_elements.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_elements = PMPI_Get_elements #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_elements PMPI_Get_elements #endif static const char FUNC_NAME[] = "MPI_Get_elements"; diff --git a/ompi/mpi/c/get_elements_x.c b/ompi/mpi/c/get_elements_x.c index 0a8867f0a4..88faa77d3b 100644 --- a/ompi/mpi/c/get_elements_x.c +++ b/ompi/mpi/c/get_elements_x.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_elements_x = PMPI_Get_elements_x #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_elements_x PMPI_Get_elements_x #endif static const char FUNC_NAME[] = "MPI_Get_elements_x"; diff --git a/ompi/mpi/c/get_library_version.c b/ompi/mpi/c/get_library_version.c index c72afe6962..cabf28c985 100644 --- a/ompi/mpi/c/get_library_version.c +++ b/ompi/mpi/c/get_library_version.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_library_version = PMPI_Get_library_version #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_library_version PMPI_Get_library_version #endif static const char FUNC_NAME[] = "MPI_Get_library_version"; diff --git a/ompi/mpi/c/get_processor_name.c b/ompi/mpi/c/get_processor_name.c index d4b2028455..8729c6c722 100644 --- a/ompi/mpi/c/get_processor_name.c +++ b/ompi/mpi/c/get_processor_name.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_processor_name = PMPI_Get_processor_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_processor_name PMPI_Get_processor_name #endif static const char FUNC_NAME[] = "MPI_Get_processor_name"; diff --git a/ompi/mpi/c/get_version.c b/ompi/mpi/c/get_version.c index 20291ca577..b9f121ef59 100644 --- a/ompi/mpi/c/get_version.c +++ b/ompi/mpi/c/get_version.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,12 +25,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Get_version = PMPI_Get_version #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Get_version PMPI_Get_version #endif static const char FUNC_NAME[] = "MPI_Get_version"; diff --git a/ompi/mpi/c/graph_create.c b/ompi/mpi/c/graph_create.c index aa718f3e14..2721ad5a92 100644 --- a/ompi/mpi/c/graph_create.c +++ b/ompi/mpi/c/graph_create.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/base/base.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graph_create = PMPI_Graph_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graph_create PMPI_Graph_create #endif static const char FUNC_NAME[] = "MPI_Graph_create"; diff --git a/ompi/mpi/c/graph_get.c b/ompi/mpi/c/graph_get.c index 43be3391b4..9ea6ed9d01 100644 --- a/ompi/mpi/c/graph_get.c +++ b/ompi/mpi/c/graph_get.c @@ -12,6 +12,8 @@ * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos Nat Security, LLC. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graph_get = PMPI_Graph_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graph_get PMPI_Graph_get #endif static const char FUNC_NAME[] = "MPI_Graph_get"; diff --git a/ompi/mpi/c/graph_map.c b/ompi/mpi/c/graph_map.c index e87458043b..c5a84e1d56 100644 --- a/ompi/mpi/c/graph_map.c +++ b/ompi/mpi/c/graph_map.c @@ -32,12 +32,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graph_map = PMPI_Graph_map #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graph_map PMPI_Graph_map #endif static const char FUNC_NAME[] = "MPI_Graph_map"; diff --git a/ompi/mpi/c/graph_neighbors.c b/ompi/mpi/c/graph_neighbors.c index c10783a366..f300eb70cf 100644 --- a/ompi/mpi/c/graph_neighbors.c +++ b/ompi/mpi/c/graph_neighbors.c @@ -12,6 +12,8 @@ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos Nat Security, LLC. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graph_neighbors = PMPI_Graph_neighbors #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graph_neighbors PMPI_Graph_neighbors #endif static const char FUNC_NAME[] = "MPI_Graph_neighbors"; diff --git a/ompi/mpi/c/graph_neighbors_count.c b/ompi/mpi/c/graph_neighbors_count.c index c6cc7aa47e..706436ee87 100644 --- a/ompi/mpi/c/graph_neighbors_count.c +++ b/ompi/mpi/c/graph_neighbors_count.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graph_neighbors_count = PMPI_Graph_neighbors_count #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graph_neighbors_count PMPI_Graph_neighbors_count #endif static const char FUNC_NAME[] = "MPI_Graph_neighbors_count"; diff --git a/ompi/mpi/c/graphdims_get.c b/ompi/mpi/c/graphdims_get.c index caf8af0448..5cebe7ffa8 100644 --- a/ompi/mpi/c/graphdims_get.c +++ b/ompi/mpi/c/graphdims_get.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Graphdims_get = PMPI_Graphdims_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Graphdims_get PMPI_Graphdims_get #endif static const char FUNC_NAME[] = "MPI_Graphdims_get"; diff --git a/ompi/mpi/c/grequest_complete.c b/ompi/mpi/c/grequest_complete.c index f28b507c46..7ca0527e97 100644 --- a/ompi/mpi/c/grequest_complete.c +++ b/ompi/mpi/c/grequest_complete.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/grequest.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Grequest_complete = PMPI_Grequest_complete #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Grequest_complete PMPI_Grequest_complete #endif static const char FUNC_NAME[] = "MPI_Grequest_complete"; diff --git a/ompi/mpi/c/grequest_start.c b/ompi/mpi/c/grequest_start.c index 6f8266f07b..2483a4e2b5 100644 --- a/ompi/mpi/c/grequest_start.c +++ b/ompi/mpi/c/grequest_start.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/request/grequest.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Grequest_start = PMPI_Grequest_start #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Grequest_start PMPI_Grequest_start #endif static const char FUNC_NAME[] = "MPI_Grequest_start"; diff --git a/ompi/mpi/c/group_c2f.c b/ompi/mpi/c/group_c2f.c index c71e2915f9..1a068e3a4d 100644 --- a/ompi/mpi/c/group_c2f.c +++ b/ompi/mpi/c/group_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_c2f = PMPI_Group_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_c2f PMPI_Group_c2f #endif static const char FUNC_NAME[] = "MPI_Group_c2f"; diff --git a/ompi/mpi/c/group_compare.c b/ompi/mpi/c/group_compare.c index 54b5332883..09cfa303f3 100644 --- a/ompi/mpi/c/group_compare.c +++ b/ompi/mpi/c/group_compare.c @@ -12,6 +12,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 University of Houston. All rights reserved. * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_compare = PMPI_Group_compare #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_compare PMPI_Group_compare #endif static const char FUNC_NAME[] = "MPI_Group_compare"; diff --git a/ompi/mpi/c/group_difference.c b/ompi/mpi/c/group_difference.c index b8c53919ac..4f02482163 100644 --- a/ompi/mpi/c/group_difference.c +++ b/ompi/mpi/c/group_difference.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_difference = PMPI_Group_difference #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_difference PMPI_Group_difference #endif static const char FUNC_NAME[] = "MPI_Group_difference"; diff --git a/ompi/mpi/c/group_excl.c b/ompi/mpi/c/group_excl.c index 14972b7858..0f17285618 100644 --- a/ompi/mpi/c/group_excl.c +++ b/ompi/mpi/c/group_excl.c @@ -28,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_excl = PMPI_Group_excl #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_excl PMPI_Group_excl #endif static const char FUNC_NAME[] = "MPI_Group_excl"; diff --git a/ompi/mpi/c/group_f2c.c b/ompi/mpi/c/group_f2c.c index 65b088e4c4..ef1beaa7fd 100644 --- a/ompi/mpi/c/group_f2c.c +++ b/ompi/mpi/c/group_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_f2c = PMPI_Group_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_f2c PMPI_Group_f2c #endif static const char FUNC_NAME[] = "MPI_Group_f2c"; diff --git a/ompi/mpi/c/group_free.c b/ompi/mpi/c/group_free.c index ee57a2e0ed..59508405bd 100644 --- a/ompi/mpi/c/group_free.c +++ b/ompi/mpi/c/group_free.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_free = PMPI_Group_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_free PMPI_Group_free #endif static const char FUNC_NAME[] = "MPI_Group_free"; diff --git a/ompi/mpi/c/group_incl.c b/ompi/mpi/c/group_incl.c index 92456e0f1c..b6c253347e 100644 --- a/ompi/mpi/c/group_incl.c +++ b/ompi/mpi/c/group_incl.c @@ -29,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_incl = PMPI_Group_incl #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_incl PMPI_Group_incl #endif static const char FUNC_NAME[] = "MPI_Group_incl"; diff --git a/ompi/mpi/c/group_intersection.c b/ompi/mpi/c/group_intersection.c index eb16cd94ff..74f5e0a4a3 100644 --- a/ompi/mpi/c/group_intersection.c +++ b/ompi/mpi/c/group_intersection.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_intersection = PMPI_Group_intersection #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_intersection PMPI_Group_intersection #endif static const char FUNC_NAME[] = "MPI_Group_intersection"; diff --git a/ompi/mpi/c/group_range_excl.c b/ompi/mpi/c/group_range_excl.c index 50356ef1d4..1de5f7be64 100644 --- a/ompi/mpi/c/group_range_excl.c +++ b/ompi/mpi/c/group_range_excl.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_range_excl = PMPI_Group_range_excl #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_range_excl PMPI_Group_range_excl #endif static const char FUNC_NAME[] = "MPI_Group_range_excl"; diff --git a/ompi/mpi/c/group_range_incl.c b/ompi/mpi/c/group_range_incl.c index 03545b304c..04cf2b0c3a 100644 --- a/ompi/mpi/c/group_range_incl.c +++ b/ompi/mpi/c/group_range_incl.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_range_incl = PMPI_Group_range_incl #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_range_incl PMPI_Group_range_incl #endif static const char FUNC_NAME[] = "MPI_Group_range_incl"; diff --git a/ompi/mpi/c/group_rank.c b/ompi/mpi/c/group_rank.c index 37552ce930..2b63ed0638 100644 --- a/ompi/mpi/c/group_rank.c +++ b/ompi/mpi/c/group_rank.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_rank = PMPI_Group_rank #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_rank PMPI_Group_rank #endif static const char FUNC_NAME[] = "MPI_Group_rank"; diff --git a/ompi/mpi/c/group_size.c b/ompi/mpi/c/group_size.c index 14c7852e32..05b08e99de 100644 --- a/ompi/mpi/c/group_size.c +++ b/ompi/mpi/c/group_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_size = PMPI_Group_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_size PMPI_Group_size #endif static const char FUNC_NAME[] = "MPI_Group_size"; diff --git a/ompi/mpi/c/group_translate_ranks.c b/ompi/mpi/c/group_translate_ranks.c index 82fccba122..1a63a770d0 100644 --- a/ompi/mpi/c/group_translate_ranks.c +++ b/ompi/mpi/c/group_translate_ranks.c @@ -13,6 +13,8 @@ * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_translate_ranks = PMPI_Group_translate_ranks #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_translate_ranks PMPI_Group_translate_ranks #endif static const char FUNC_NAME[] = "MPI_Group_translate_ranks"; diff --git a/ompi/mpi/c/group_union.c b/ompi/mpi/c/group_union.c index cf4cd226ff..48bd990684 100644 --- a/ompi/mpi/c/group_union.c +++ b/ompi/mpi/c/group_union.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006 University of Houston. All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Group_union = PMPI_Group_union #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Group_union PMPI_Group_union #endif static const char FUNC_NAME[] = "MPI_Group_union"; diff --git a/ompi/mpi/c/iallgather.c b/ompi/mpi/c/iallgather.c index 69dea30695..6c7f84ae58 100644 --- a/ompi/mpi/c/iallgather.c +++ b/ompi/mpi/c/iallgather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iallgather = PMPI_Iallgather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iallgather PMPI_Iallgather #endif static const char FUNC_NAME[] = "MPI_Iallgather"; diff --git a/ompi/mpi/c/iallgatherv.c b/ompi/mpi/c/iallgatherv.c index 87d3b65066..23226a95d7 100644 --- a/ompi/mpi/c/iallgatherv.c +++ b/ompi/mpi/c/iallgatherv.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iallgatherv = PMPI_Iallgatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iallgatherv PMPI_Iallgatherv #endif static const char FUNC_NAME[] = "MPI_Iallgatherv"; diff --git a/ompi/mpi/c/iallreduce.c b/ompi/mpi/c/iallreduce.c index aed246341c..1c0f3fe070 100644 --- a/ompi/mpi/c/iallreduce.c +++ b/ompi/mpi/c/iallreduce.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iallreduce = PMPI_Iallreduce #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iallreduce PMPI_Iallreduce #endif static const char FUNC_NAME[] = "MPI_Iallreduce"; diff --git a/ompi/mpi/c/ialltoall.c b/ompi/mpi/c/ialltoall.c index d41cf73303..08822d1fb6 100644 --- a/ompi/mpi/c/ialltoall.c +++ b/ompi/mpi/c/ialltoall.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ialltoall = PMPI_Ialltoall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ialltoall PMPI_Ialltoall #endif static const char FUNC_NAME[] = "MPI_Ialltoall"; diff --git a/ompi/mpi/c/ialltoallv.c b/ompi/mpi/c/ialltoallv.c index 2635aa30fb..d08424838f 100644 --- a/ompi/mpi/c/ialltoallv.c +++ b/ompi/mpi/c/ialltoallv.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ialltoallv = PMPI_Ialltoallv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ialltoallv PMPI_Ialltoallv #endif static const char FUNC_NAME[] = "MPI_Ialltoallv"; diff --git a/ompi/mpi/c/ialltoallw.c b/ompi/mpi/c/ialltoallw.c index ab7196afe6..f540c30599 100644 --- a/ompi/mpi/c/ialltoallw.c +++ b/ompi/mpi/c/ialltoallw.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ialltoallw = PMPI_Ialltoallw #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ialltoallw PMPI_Ialltoallw #endif static const char FUNC_NAME[] = "MPI_Ialltoallw"; diff --git a/ompi/mpi/c/ibarrier.c b/ompi/mpi/c/ibarrier.c index ae98806a73..0fd4a6865a 100644 --- a/ompi/mpi/c/ibarrier.c +++ b/ompi/mpi/c/ibarrier.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ibarrier = PMPI_Ibarrier #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ibarrier PMPI_Ibarrier #endif static const char FUNC_NAME[] = "MPI_Ibarrier"; diff --git a/ompi/mpi/c/ibcast.c b/ompi/mpi/c/ibcast.c index b75918ac77..fb12b4e595 100644 --- a/ompi/mpi/c/ibcast.c +++ b/ompi/mpi/c/ibcast.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -16,12 +18,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ibcast = PMPI_Ibcast #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ibcast PMPI_Ibcast #endif static const char FUNC_NAME[] = "MPI_Ibcast"; diff --git a/ompi/mpi/c/ibsend.c b/ompi/mpi/c/ibsend.c index 2b9970ad78..e5785ce3ad 100644 --- a/ompi/mpi/c/ibsend.c +++ b/ompi/mpi/c/ibsend.c @@ -32,12 +32,12 @@ #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ibsend = PMPI_Ibsend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ibsend PMPI_Ibsend #endif static const char FUNC_NAME[] = "MPI_Ibsend"; diff --git a/ompi/mpi/c/iexscan.c b/ompi/mpi/c/iexscan.c index 15a97b4bcc..54092ceff1 100644 --- a/ompi/mpi/c/iexscan.c +++ b/ompi/mpi/c/iexscan.c @@ -31,12 +31,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iexscan = PMPI_Iexscan #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iexscan PMPI_Iexscan #endif static const char FUNC_NAME[] = "MPI_Iexscan"; diff --git a/ompi/mpi/c/igather.c b/ompi/mpi/c/igather.c index b881df3f02..9265889b35 100644 --- a/ompi/mpi/c/igather.c +++ b/ompi/mpi/c/igather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Igather = PMPI_Igather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Igather PMPI_Igather #endif static const char FUNC_NAME[] = "MPI_Igather"; diff --git a/ompi/mpi/c/igatherv.c b/ompi/mpi/c/igatherv.c index 35a594dab7..ee9d88258e 100644 --- a/ompi/mpi/c/igatherv.c +++ b/ompi/mpi/c/igatherv.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Igatherv = PMPI_Igatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Igatherv PMPI_Igatherv #endif static const char FUNC_NAME[] = "MPI_Igatherv"; diff --git a/ompi/mpi/c/improbe.c b/ompi/mpi/c/improbe.c index cfb725d8b1..2d6f0b3e79 100644 --- a/ompi/mpi/c/improbe.c +++ b/ompi/mpi/c/improbe.c @@ -2,6 +2,8 @@ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,12 +20,12 @@ #include "ompi/request/request.h" #include "ompi/message/message.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Improbe = PMPI_Improbe #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Improbe PMPI_Improbe #endif static const char FUNC_NAME[] = "MPI_Improbe"; diff --git a/ompi/mpi/c/imrecv.c b/ompi/mpi/c/imrecv.c index 655af8d4d7..f2b27c841d 100644 --- a/ompi/mpi/c/imrecv.c +++ b/ompi/mpi/c/imrecv.c @@ -1,6 +1,8 @@ /* * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,12 +19,12 @@ #include "ompi/request/request.h" #include "ompi/message/message.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Imrecv = PMPI_Imrecv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Imrecv PMPI_Imrecv #endif static const char FUNC_NAME[] = "MPI_Imrecv"; diff --git a/ompi/mpi/c/ineighbor_allgather.c b/ompi/mpi/c/ineighbor_allgather.c index 3c62f495b4..4d1216c4cb 100644 --- a/ompi/mpi/c/ineighbor_allgather.c +++ b/ompi/mpi/c/ineighbor_allgather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ineighbor_allgather = PMPI_Ineighbor_allgather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ineighbor_allgather PMPI_Ineighbor_allgather #endif static const char FUNC_NAME[] = "MPI_Ineighbor_allgather"; diff --git a/ompi/mpi/c/ineighbor_allgatherv.c b/ompi/mpi/c/ineighbor_allgatherv.c index 864546c4c0..9b55d61544 100644 --- a/ompi/mpi/c/ineighbor_allgatherv.c +++ b/ompi/mpi/c/ineighbor_allgatherv.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ineighbor_allgatherv = PMPI_Ineighbor_allgatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ineighbor_allgatherv PMPI_Ineighbor_allgatherv #endif static const char FUNC_NAME[] = "MPI_Ineighbor_allgatherv"; diff --git a/ompi/mpi/c/ineighbor_alltoall.c b/ompi/mpi/c/ineighbor_alltoall.c index 21b5bf7278..1d603a2feb 100644 --- a/ompi/mpi/c/ineighbor_alltoall.c +++ b/ompi/mpi/c/ineighbor_alltoall.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ineighbor_alltoall = PMPI_Ineighbor_alltoall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ineighbor_alltoall PMPI_Ineighbor_alltoall #endif static const char FUNC_NAME[] = "MPI_Ineighbor_alltoall"; diff --git a/ompi/mpi/c/ineighbor_alltoallv.c b/ompi/mpi/c/ineighbor_alltoallv.c index 7d9e245ba4..2a12f9bd1b 100644 --- a/ompi/mpi/c/ineighbor_alltoallv.c +++ b/ompi/mpi/c/ineighbor_alltoallv.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ineighbor_alltoallv = PMPI_Ineighbor_alltoallv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ineighbor_alltoallv PMPI_Ineighbor_alltoallv #endif static const char FUNC_NAME[] = "MPI_Ineighbor_alltoallv"; diff --git a/ompi/mpi/c/ineighbor_alltoallw.c b/ompi/mpi/c/ineighbor_alltoallw.c index c33c26c49d..c12df11fb7 100644 --- a/ompi/mpi/c/ineighbor_alltoallw.c +++ b/ompi/mpi/c/ineighbor_alltoallw.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ineighbor_alltoallw = PMPI_Ineighbor_alltoallw #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ineighbor_alltoallw PMPI_Ineighbor_alltoallw #endif static const char FUNC_NAME[] = "MPI_Ineighbor_alltoallw"; diff --git a/ompi/mpi/c/info_c2f.c b/ompi/mpi/c/info_c2f.c index 5bafd47a6a..20b842da1e 100644 --- a/ompi/mpi/c/info_c2f.c +++ b/ompi/mpi/c/info_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_c2f = PMPI_Info_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_c2f PMPI_Info_c2f #endif static const char FUNC_NAME[] = "MPI_Info_c2f"; diff --git a/ompi/mpi/c/info_create.c b/ompi/mpi/c/info_create.c index 8b945768cb..931ad0d811 100644 --- a/ompi/mpi/c/info_create.c +++ b/ompi/mpi/c/info_create.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_create = PMPI_Info_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_create PMPI_Info_create #endif static const char FUNC_NAME[] = "MPI_Info_create"; diff --git a/ompi/mpi/c/info_delete.c b/ompi/mpi/c/info_delete.c index 5a7c0203c1..a927997b4c 100644 --- a/ompi/mpi/c/info_delete.c +++ b/ompi/mpi/c/info_delete.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_delete = PMPI_Info_delete #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_delete PMPI_Info_delete #endif static const char FUNC_NAME[] = "MPI_Info_delete"; diff --git a/ompi/mpi/c/info_dup.c b/ompi/mpi/c/info_dup.c index ec1a4a071b..1b078b6b59 100644 --- a/ompi/mpi/c/info_dup.c +++ b/ompi/mpi/c/info_dup.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_dup = PMPI_Info_dup #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_dup PMPI_Info_dup #endif static const char FUNC_NAME[] = "MPI_Info_dup"; diff --git a/ompi/mpi/c/info_f2c.c b/ompi/mpi/c/info_f2c.c index 30d5dd52d2..a27eb53544 100644 --- a/ompi/mpi/c/info_f2c.c +++ b/ompi/mpi/c/info_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_f2c = PMPI_Info_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_f2c PMPI_Info_f2c #endif static const char FUNC_NAME[] = "MPI_Info_f2c"; diff --git a/ompi/mpi/c/info_free.c b/ompi/mpi/c/info_free.c index 7b5fbe2ce0..17c7676da1 100644 --- a/ompi/mpi/c/info_free.c +++ b/ompi/mpi/c/info_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_free = PMPI_Info_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_free PMPI_Info_free #endif static const char FUNC_NAME[] = "MPI_Info_free"; diff --git a/ompi/mpi/c/info_get.c b/ompi/mpi/c/info_get.c index a0c7b84f9a..16f27c7617 100644 --- a/ompi/mpi/c/info_get.c +++ b/ompi/mpi/c/info_get.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_get = PMPI_Info_get #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_get PMPI_Info_get #endif static const char FUNC_NAME[] = "MPI_Info_get"; diff --git a/ompi/mpi/c/info_get_nkeys.c b/ompi/mpi/c/info_get_nkeys.c index 31e3057fd5..6bd84543ae 100644 --- a/ompi/mpi/c/info_get_nkeys.c +++ b/ompi/mpi/c/info_get_nkeys.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_get_nkeys = PMPI_Info_get_nkeys #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_get_nkeys PMPI_Info_get_nkeys #endif static const char FUNC_NAME[] = "MPI_Info_get_nkeys"; diff --git a/ompi/mpi/c/info_get_nthkey.c b/ompi/mpi/c/info_get_nthkey.c index 14d77d83d7..e7d9239f5c 100644 --- a/ompi/mpi/c/info_get_nthkey.c +++ b/ompi/mpi/c/info_get_nthkey.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/info/info.h" #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_get_nthkey = PMPI_Info_get_nthkey #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_get_nthkey PMPI_Info_get_nthkey #endif static const char FUNC_NAME[] = "MPI_Info_get_nthkey"; diff --git a/ompi/mpi/c/info_get_valuelen.c b/ompi/mpi/c/info_get_valuelen.c index cc6b132fac..d7b1e6e868 100644 --- a/ompi/mpi/c/info_get_valuelen.c +++ b/ompi/mpi/c/info_get_valuelen.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_get_valuelen = PMPI_Info_get_valuelen #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_get_valuelen PMPI_Info_get_valuelen #endif static const char FUNC_NAME[] = "MPI_Info_get_valuelen"; diff --git a/ompi/mpi/c/info_set.c b/ompi/mpi/c/info_set.c index eee8de0dab..28d14d7975 100644 --- a/ompi/mpi/c/info_set.c +++ b/ompi/mpi/c/info_set.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Info_set = PMPI_Info_set #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Info_set PMPI_Info_set #endif static const char FUNC_NAME[] = "MPI_Info_set"; diff --git a/ompi/mpi/c/init.c b/ompi/mpi/c/init.c index 5154557bfa..4711369744 100644 --- a/ompi/mpi/c/init.c +++ b/ompi/mpi/c/init.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/constants.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Init = PMPI_Init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Init PMPI_Init #endif static const char FUNC_NAME[] = "MPI_Init"; diff --git a/ompi/mpi/c/init_thread.c b/ompi/mpi/c/init_thread.c index e3857ae446..0ab9b24c42 100644 --- a/ompi/mpi/c/init_thread.c +++ b/ompi/mpi/c/init_thread.c @@ -12,7 +12,7 @@ * Copyright (c) 2010 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/constants.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Init_thread = PMPI_Init_thread #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Init_thread PMPI_Init_thread #endif static const char FUNC_NAME[] = "MPI_Init_thread"; diff --git a/ompi/mpi/c/initialized.c b/ompi/mpi/c/initialized.c index a218518038..a1853be8ef 100644 --- a/ompi/mpi/c/initialized.c +++ b/ompi/mpi/c/initialized.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +26,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Initialized = PMPI_Initialized #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Initialized PMPI_Initialized #endif static const char FUNC_NAME[] = "MPI_Initialized"; diff --git a/ompi/mpi/c/intercomm_create.c b/ompi/mpi/c/intercomm_create.c index d8ef5829b4..3a63c07292 100644 --- a/ompi/mpi/c/intercomm_create.c +++ b/ompi/mpi/c/intercomm_create.c @@ -12,7 +12,7 @@ * Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2009 University of Houston. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -31,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Intercomm_create = PMPI_Intercomm_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Intercomm_create PMPI_Intercomm_create #endif static const char FUNC_NAME[] = "MPI_Intercomm_create"; diff --git a/ompi/mpi/c/intercomm_merge.c b/ompi/mpi/c/intercomm_merge.c index 4d3b3af85f..e7858cfa49 100644 --- a/ompi/mpi/c/intercomm_merge.c +++ b/ompi/mpi/c/intercomm_merge.c @@ -12,6 +12,8 @@ * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2009 University of Houston. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/proc/proc.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Intercomm_merge = PMPI_Intercomm_merge #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Intercomm_merge PMPI_Intercomm_merge #endif static const char FUNC_NAME[] = "MPI_Intercomm_merge"; diff --git a/ompi/mpi/c/iprobe.c b/ompi/mpi/c/iprobe.c index 6dbf13eab9..c81764ae6c 100644 --- a/ompi/mpi/c/iprobe.c +++ b/ompi/mpi/c/iprobe.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/memchecker.h" #include "ompi/request/request.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iprobe = PMPI_Iprobe #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iprobe PMPI_Iprobe #endif static const char FUNC_NAME[] = "MPI_Iprobe"; diff --git a/ompi/mpi/c/irecv.c b/ompi/mpi/c/irecv.c index 75039c175a..cc4946548e 100644 --- a/ompi/mpi/c/irecv.c +++ b/ompi/mpi/c/irecv.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Irecv = PMPI_Irecv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Irecv PMPI_Irecv #endif static const char FUNC_NAME[] = "MPI_Irecv"; diff --git a/ompi/mpi/c/ireduce.c b/ompi/mpi/c/ireduce.c index 733a9f7289..5445d860f7 100644 --- a/ompi/mpi/c/ireduce.c +++ b/ompi/mpi/c/ireduce.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ireduce = PMPI_Ireduce #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ireduce PMPI_Ireduce #endif static const char FUNC_NAME[] = "MPI_Ireduce"; diff --git a/ompi/mpi/c/ireduce_scatter.c b/ompi/mpi/c/ireduce_scatter.c index 72ad4061a6..6574e195b9 100644 --- a/ompi/mpi/c/ireduce_scatter.c +++ b/ompi/mpi/c/ireduce_scatter.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ireduce_scatter = PMPI_Ireduce_scatter #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ireduce_scatter PMPI_Ireduce_scatter #endif static const char FUNC_NAME[] = "MPI_Ireduce_scatter"; diff --git a/ompi/mpi/c/ireduce_scatter_block.c b/ompi/mpi/c/ireduce_scatter_block.c index 54002e25a8..e76f811f96 100644 --- a/ompi/mpi/c/ireduce_scatter_block.c +++ b/ompi/mpi/c/ireduce_scatter_block.c @@ -33,12 +33,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ireduce_scatter_block = PMPI_Ireduce_scatter_block #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ireduce_scatter_block PMPI_Ireduce_scatter_block #endif static const char FUNC_NAME[] = "MPI_Ireduce_scatter_block"; diff --git a/ompi/mpi/c/irsend.c b/ompi/mpi/c/irsend.c index 4a58aa83ad..afb72a6de1 100644 --- a/ompi/mpi/c/irsend.c +++ b/ompi/mpi/c/irsend.c @@ -32,12 +32,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Irsend = PMPI_Irsend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Irsend PMPI_Irsend #endif static const char FUNC_NAME[] = "MPI_Irsend"; diff --git a/ompi/mpi/c/is_thread_main.c b/ompi/mpi/c/is_thread_main.c index 005ac46a11..9956e37773 100644 --- a/ompi/mpi/c/is_thread_main.c +++ b/ompi/mpi/c/is_thread_main.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/runtime/mpiruntime.h" #include "opal/threads/threads.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Is_thread_main = PMPI_Is_thread_main #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Is_thread_main PMPI_Is_thread_main #endif static const char FUNC_NAME[] = "MPI_Is_thread_main"; diff --git a/ompi/mpi/c/iscan.c b/ompi/mpi/c/iscan.c index ad284c7b6b..a749e0fffb 100644 --- a/ompi/mpi/c/iscan.c +++ b/ompi/mpi/c/iscan.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iscan = PMPI_Iscan #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iscan PMPI_Iscan #endif static const char FUNC_NAME[] = "MPI_Iscan"; diff --git a/ompi/mpi/c/iscatter.c b/ompi/mpi/c/iscatter.c index dcf18ce6d2..77b024a288 100644 --- a/ompi/mpi/c/iscatter.c +++ b/ompi/mpi/c/iscatter.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iscatter = PMPI_Iscatter #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iscatter PMPI_Iscatter #endif static const char FUNC_NAME[] = "MPI_Iscatter"; diff --git a/ompi/mpi/c/iscatterv.c b/ompi/mpi/c/iscatterv.c index de10d66297..557a030e50 100644 --- a/ompi/mpi/c/iscatterv.c +++ b/ompi/mpi/c/iscatterv.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Iscatterv = PMPI_Iscatterv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Iscatterv PMPI_Iscatterv #endif static const char FUNC_NAME[] = "MPI_Iscatterv"; diff --git a/ompi/mpi/c/isend.c b/ompi/mpi/c/isend.c index bdc1b3a7f7..90492af5c5 100644 --- a/ompi/mpi/c/isend.c +++ b/ompi/mpi/c/isend.c @@ -32,12 +32,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Isend = PMPI_Isend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Isend PMPI_Isend #endif static const char FUNC_NAME[] = "MPI_Isend"; diff --git a/ompi/mpi/c/issend.c b/ompi/mpi/c/issend.c index ec16ae4c3f..9ec24ef3c1 100644 --- a/ompi/mpi/c/issend.c +++ b/ompi/mpi/c/issend.c @@ -31,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Issend = PMPI_Issend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Issend PMPI_Issend #endif static const char FUNC_NAME[] = "MPI_Issend"; diff --git a/ompi/mpi/c/keyval_create.c b/ompi/mpi/c/keyval_create.c index ebe712613f..eb5234686e 100644 --- a/ompi/mpi/c/keyval_create.c +++ b/ompi/mpi/c/keyval_create.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Keyval_create = PMPI_Keyval_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Keyval_create PMPI_Keyval_create #endif static const char FUNC_NAME[] = "MPI_Keyval_create"; diff --git a/ompi/mpi/c/keyval_free.c b/ompi/mpi/c/keyval_free.c index 3b8c8cf50e..3fbcb237d5 100644 --- a/ompi/mpi/c/keyval_free.c +++ b/ompi/mpi/c/keyval_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Keyval_free = PMPI_Keyval_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Keyval_free PMPI_Keyval_free #endif static const char FUNC_NAME[] = "MPI_Keyval_free"; diff --git a/ompi/mpi/c/lookup_name.c b/ompi/mpi/c/lookup_name.c index c2a77ae782..2a8b1958db 100644 --- a/ompi/mpi/c/lookup_name.c +++ b/ompi/mpi/c/lookup_name.c @@ -13,6 +13,8 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,12 +33,12 @@ #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Lookup_name = PMPI_Lookup_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Lookup_name PMPI_Lookup_name #endif static const char FUNC_NAME[] = "MPI_Lookup_name"; diff --git a/ompi/mpi/c/message_c2f.c b/ompi/mpi/c/message_c2f.c index 0b3e6355af..d540ed3232 100644 --- a/ompi/mpi/c/message_c2f.c +++ b/ompi/mpi/c/message_c2f.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/message/message.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Message_c2f = PMPI_Message_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Message_c2f PMPI_Message_c2f #endif static const char FUNC_NAME[] = "MPI_Message_c2f"; diff --git a/ompi/mpi/c/message_f2c.c b/ompi/mpi/c/message_f2c.c index 72cedbbf00..bae381bec9 100644 --- a/ompi/mpi/c/message_f2c.c +++ b/ompi/mpi/c/message_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/message/message.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Message_f2c = PMPI_Message_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Message_f2c PMPI_Message_f2c #endif static const char FUNC_NAME[] = "MPI_Message_f2c"; diff --git a/ompi/mpi/c/mprobe.c b/ompi/mpi/c/mprobe.c index fb8996bdb8..94bcc93aec 100644 --- a/ompi/mpi/c/mprobe.c +++ b/ompi/mpi/c/mprobe.c @@ -2,6 +2,8 @@ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -19,12 +21,12 @@ #include "ompi/request/request.h" #include "ompi/message/message.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Mprobe = PMPI_Mprobe #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Mprobe PMPI_Mprobe #endif static const char FUNC_NAME[] = "MPI_Mprobe"; diff --git a/ompi/mpi/c/mrecv.c b/ompi/mpi/c/mrecv.c index ae6bfccbe8..a4780b093f 100644 --- a/ompi/mpi/c/mrecv.c +++ b/ompi/mpi/c/mrecv.c @@ -1,6 +1,8 @@ /* * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,12 +19,12 @@ #include "ompi/request/request.h" #include "ompi/message/message.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Mrecv = PMPI_Mrecv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Mrecv PMPI_Mrecv #endif static const char FUNC_NAME[] = "MPI_Mrecv"; diff --git a/ompi/mpi/c/neighbor_allgather.c b/ompi/mpi/c/neighbor_allgather.c index e8dc74ec58..b069d9c26e 100644 --- a/ompi/mpi/c/neighbor_allgather.c +++ b/ompi/mpi/c/neighbor_allgather.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Neighbor_allgather = PMPI_Neighbor_allgather #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Neighbor_allgather PMPI_Neighbor_allgather #endif static const char FUNC_NAME[] = "MPI_Neighbor_allgather"; diff --git a/ompi/mpi/c/neighbor_allgatherv.c b/ompi/mpi/c/neighbor_allgatherv.c index d3fcfcd944..148a5ca984 100644 --- a/ompi/mpi/c/neighbor_allgatherv.c +++ b/ompi/mpi/c/neighbor_allgatherv.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Neighbor_allgatherv = PMPI_Neighbor_allgatherv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Neighbor_allgatherv PMPI_Neighbor_allgatherv #endif static const char FUNC_NAME[] = "MPI_Neighbor_allgatherv"; diff --git a/ompi/mpi/c/neighbor_alltoall.c b/ompi/mpi/c/neighbor_alltoall.c index 6b3f1009a3..746436ec83 100644 --- a/ompi/mpi/c/neighbor_alltoall.c +++ b/ompi/mpi/c/neighbor_alltoall.c @@ -32,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Neighbor_alltoall = PMPI_Neighbor_alltoall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Neighbor_alltoall PMPI_Neighbor_alltoall #endif static const char FUNC_NAME[] = "MPI_Neighbor_alltoall"; diff --git a/ompi/mpi/c/neighbor_alltoallv.c b/ompi/mpi/c/neighbor_alltoallv.c index 1a3468412c..e61fb93746 100644 --- a/ompi/mpi/c/neighbor_alltoallv.c +++ b/ompi/mpi/c/neighbor_alltoallv.c @@ -33,12 +33,12 @@ #include "ompi/memchecker.h" #include "ompi/communicator/comm_helpers.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Neighbor_alltoallv = PMPI_Neighbor_alltoallv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Neighbor_alltoallv PMPI_Neighbor_alltoallv #endif static const char FUNC_NAME[] = "MPI_Neighbor_alltoallv"; diff --git a/ompi/mpi/c/neighbor_alltoallw.c b/ompi/mpi/c/neighbor_alltoallw.c index e156c48171..ed44c621b7 100644 --- a/ompi/mpi/c/neighbor_alltoallw.c +++ b/ompi/mpi/c/neighbor_alltoallw.c @@ -33,12 +33,12 @@ #include "ompi/memchecker.h" #include "ompi/communicator/comm_helpers.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Neighbor_alltoallw = PMPI_Neighbor_alltoallw #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Neighbor_alltoallw PMPI_Neighbor_alltoallw #endif static const char FUNC_NAME[] = "MPI_Neighbor_alltoallw"; diff --git a/ompi/mpi/c/op_c2f.c b/ompi/mpi/c/op_c2f.c index f9c5d4fe9b..0fe0a42377 100644 --- a/ompi/mpi/c/op_c2f.c +++ b/ompi/mpi/c/op_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/op/op.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Op_c2f = PMPI_Op_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Op_c2f PMPI_Op_c2f #endif static const char FUNC_NAME[] = "MPI_Op_c2f"; diff --git a/ompi/mpi/c/op_commutative.c b/ompi/mpi/c/op_commutative.c index 986ce98957..c07e2c65f6 100644 --- a/ompi/mpi/c/op_commutative.c +++ b/ompi/mpi/c/op_commutative.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/op/op.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Op_commutative = PMPI_Op_commutative #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Op_commutative PMPI_Op_commutative #endif static const char FUNC_NAME[] = "MPI_Op_commutative"; diff --git a/ompi/mpi/c/op_create.c b/ompi/mpi/c/op_create.c index ca82726ccd..5c922f378e 100644 --- a/ompi/mpi/c/op_create.c +++ b/ompi/mpi/c/op_create.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/op/op.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Op_create = PMPI_Op_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Op_create PMPI_Op_create #endif static const char FUNC_NAME[] = "MPI_Op_create"; diff --git a/ompi/mpi/c/op_f2c.c b/ompi/mpi/c/op_f2c.c index f808619840..5865a96378 100644 --- a/ompi/mpi/c/op_f2c.c +++ b/ompi/mpi/c/op_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/op/op.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Op_f2c = PMPI_Op_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Op_f2c PMPI_Op_f2c #endif static const char FUNC_NAME[] = "MPI_Op_f2c"; diff --git a/ompi/mpi/c/op_free.c b/ompi/mpi/c/op_free.c index b4b7766a1d..d6e74240c3 100644 --- a/ompi/mpi/c/op_free.c +++ b/ompi/mpi/c/op_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/op/op.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Op_free = PMPI_Op_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Op_free PMPI_Op_free #endif static const char FUNC_NAME[] = "MPI_Op_free"; diff --git a/ompi/mpi/c/open_port.c b/ompi/mpi/c/open_port.c index 78bf1df75c..7d9e077f0a 100644 --- a/ompi/mpi/c/open_port.c +++ b/ompi/mpi/c/open_port.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/info/info.h" #include "ompi/dpm/dpm.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Open_port = PMPI_Open_port #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Open_port PMPI_Open_port #endif static const char FUNC_NAME[] = "MPI_Open_port"; diff --git a/ompi/mpi/c/pack.c b/ompi/mpi/c/pack.c index 604554d134..9827d542bc 100644 --- a/ompi/mpi/c/pack.c +++ b/ompi/mpi/c/pack.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Pack = PMPI_Pack #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Pack PMPI_Pack #endif static const char FUNC_NAME[] = "MPI_Pack"; diff --git a/ompi/mpi/c/pack_external.c b/ompi/mpi/c/pack_external.c index 49b532c37d..fe601c7d30 100644 --- a/ompi/mpi/c/pack_external.c +++ b/ompi/mpi/c/pack_external.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Pack_external = PMPI_Pack_external #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Pack_external PMPI_Pack_external #endif static const char FUNC_NAME[] = "MPI_Pack_external"; diff --git a/ompi/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c index 5c6894a115..1a341af976 100644 --- a/ompi/mpi/c/pack_external_size.c +++ b/ompi/mpi/c/pack_external_size.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Pack_external_size = PMPI_Pack_external_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Pack_external_size PMPI_Pack_external_size #endif static const char FUNC_NAME[] = "MPI_Pack_external_size"; diff --git a/ompi/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c index b8cecc3a57..3561f9bb17 100644 --- a/ompi/mpi/c/pack_size.c +++ b/ompi/mpi/c/pack_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Pack_size = PMPI_Pack_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Pack_size PMPI_Pack_size #endif static const char FUNC_NAME[] = "MPI_Pack_size"; diff --git a/ompi/mpi/c/pcontrol.c b/ompi/mpi/c/pcontrol.c index 6112f7c038..74d25a5c11 100644 --- a/ompi/mpi/c/pcontrol.c +++ b/ompi/mpi/c/pcontrol.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,12 +24,12 @@ #include "ompi/runtime/params.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Pcontrol = PMPI_Pcontrol #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Pcontrol PMPI_Pcontrol #endif static const char FUNC_NAME[] = "MPI_Pcontrol"; diff --git a/ompi/mpi/c/probe.c b/ompi/mpi/c/probe.c index 292711cbde..d09d3f6479 100644 --- a/ompi/mpi/c/probe.c +++ b/ompi/mpi/c/probe.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/memchecker.h" #include "ompi/request/request.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Probe = PMPI_Probe #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Probe PMPI_Probe #endif static const char FUNC_NAME[] = "MPI_Probe"; diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am index 7275d17f35..43a84bde1d 100644 --- a/ompi/mpi/c/profile/Makefile.am +++ b/ompi/mpi/c/profile/Makefile.am @@ -16,6 +16,8 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -25,14 +27,11 @@ include $(top_srcdir)/Makefile.ompi-rules -# -# OMPI_PROFILING_DEFINES flag s enabled when we want our MPI_* symbols -# to be replaced by PMPI_*. In other words, this flag decides -# whether "profile/defines.h" is included or not. "profile/defines.h" -# replaces all MPI_* symbols with PMPI_* symbols. In this directory -# we definately need it to be 1. -# -AM_CPPFLAGS = -DOMPI_PROFILING_DEFINES=1 +# If OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols +# to be replaced by PMPI_*. +# In this directory, we definately need it to be 1. + +AM_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1 # # This build needs to go through only if profiling is required. @@ -44,8 +43,6 @@ if BUILD_PMPI_BINDINGS_LAYER noinst_LTLIBRARIES += libmpi_c_pmpi.la endif -headers = defines.h - nodist_libmpi_c_pmpi_la_SOURCES = \ pabort.c \ padd_error_class.c \ @@ -449,7 +446,6 @@ $(nodist_libmpi_c_pmpi_la_SOURCES): if WANT_INSTALL_HEADERS ompidir = $(ompiincludedir)/$(subdir) -ompi_HEADERS = $(headers) endif # These files were created by targets above diff --git a/ompi/mpi/c/profile/defines.h b/ompi/mpi/c/profile/defines.h deleted file mode 100644 index 4837c880da..0000000000 --- a/ompi/mpi/c/profile/defines.h +++ /dev/null @@ -1,419 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2013 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. - * Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. - * Copyright (c) 2012-2013 Inria. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#ifndef OMPI_C_PROFILE_DEFINES_H -#define OMPI_C_PROFILE_DEFINES_H -/* - * This file is included in the top directory only if - * profiling is required. Once profiling is required, - * this file will replace all MPI_* symbols with - * PMPI_* symbols - */ -#define MPI_Abort PMPI_Abort -#define MPI_Accumulate PMPI_Accumulate -#define MPI_Add_error_class PMPI_Add_error_class -#define MPI_Add_error_code PMPI_Add_error_code -#define MPI_Add_error_string PMPI_Add_error_string -#define MPI_Address PMPI_Address -#define MPI_Allgather PMPI_Allgather -#define MPI_Iallgather PMPI_Iallgather -#define MPI_Allgatherv PMPI_Allgatherv -#define MPI_Iallgatherv PMPI_Iallgatherv -#define MPI_Alloc_mem PMPI_Alloc_mem -#define MPI_Allreduce PMPI_Allreduce -#define MPI_Iallreduce PMPI_Iallreduce -#define MPI_Alltoall PMPI_Alltoall -#define MPI_Ialltoall PMPI_Ialltoall -#define MPI_Alltoallv PMPI_Alltoallv -#define MPI_Ialltoallv PMPI_Ialltoallv -#define MPI_Alltoallw PMPI_Alltoallw -#define MPI_Ialltoallw PMPI_Ialltoallw -#define MPI_Attr_delete PMPI_Attr_delete -#define MPI_Attr_get PMPI_Attr_get -#define MPI_Attr_put PMPI_Attr_put -#define MPI_Barrier PMPI_Barrier -#define MPI_Ibarrier PMPI_Ibarrier -#define MPI_Bcast PMPI_Bcast -#define MPI_Ibcast PMPI_Ibcast -#define MPI_Bsend_init PMPI_Bsend_init -#define MPI_Bsend PMPI_Bsend -#define MPI_Buffer_attach PMPI_Buffer_attach -#define MPI_Buffer_detach PMPI_Buffer_detach -#define MPI_Cancel PMPI_Cancel -#define MPI_Cart_coords PMPI_Cart_coords -#define MPI_Cart_create PMPI_Cart_create -#define MPI_Cart_get PMPI_Cart_get -#define MPI_Cart_map PMPI_Cart_map -#define MPI_Cart_rank PMPI_Cart_rank -#define MPI_Cart_shift PMPI_Cart_shift -#define MPI_Cart_sub PMPI_Cart_sub -#define MPI_Cartdim_get PMPI_Cartdim_get -#define MPI_Close_port PMPI_Close_port -#define MPI_Comm_accept PMPI_Comm_accept -#define MPI_Comm_c2f PMPI_Comm_c2f -#define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler -#define MPI_Comm_compare PMPI_Comm_compare -#define MPI_Comm_connect PMPI_Comm_connect -#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler -#define MPI_Comm_create_keyval PMPI_Comm_create_keyval -#define MPI_Comm_create_group PMPI_Comm_create_group -#define MPI_Comm_create PMPI_Comm_create -#define MPI_Comm_delete_attr PMPI_Comm_delete_attr -#define MPI_Comm_disconnect PMPI_Comm_disconnect -#define MPI_Comm_dup PMPI_Comm_dup -#define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info -#define MPI_Comm_idup PMPI_Comm_idup -#define MPI_Comm_f2c PMPI_Comm_f2c -#define MPI_Comm_free_keyval PMPI_Comm_free_keyval -#define MPI_Comm_free PMPI_Comm_free -#define MPI_Comm_get_attr PMPI_Comm_get_attr -#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler -#define MPI_Comm_get_info PMPI_Comm_get_info -#define MPI_Comm_get_name PMPI_Comm_get_name -#define MPI_Comm_get_parent PMPI_Comm_get_parent -#define MPI_Comm_group PMPI_Comm_group -#define MPI_Comm_join PMPI_Comm_join -#define MPI_Comm_rank PMPI_Comm_rank -#define MPI_Comm_remote_group PMPI_Comm_remote_group -#define MPI_Comm_remote_size PMPI_Comm_remote_size -#define MPI_Comm_set_attr PMPI_Comm_set_attr -#define MPI_Dist_graph_create PMPI_Dist_graph_create -#define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent -#define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors -#define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count -#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler -#define MPI_Comm_set_info PMPI_Comm_set_info -#define MPI_Comm_set_name PMPI_Comm_set_name -#define MPI_Comm_size PMPI_Comm_size -#define MPI_Comm_spawn PMPI_Comm_spawn -#define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple -#define MPI_Comm_split PMPI_Comm_split -#define MPI_Comm_split_type PMPI_Comm_split_type -#define MPI_Comm_test_inter PMPI_Comm_test_inter -#define MPI_Compare_and_swap PMPI_Compare_and_swap -#define MPI_Dims_create PMPI_Dims_create -#define MPI_Errhandler_c2f PMPI_Errhandler_c2f -#define MPI_Errhandler_f2c PMPI_Errhandler_f2c -#define MPI_Errhandler_create PMPI_Errhandler_create -#define MPI_Errhandler_free PMPI_Errhandler_free -#define MPI_Errhandler_get PMPI_Errhandler_get -#define MPI_Errhandler_set PMPI_Errhandler_set -#define MPI_Error_class PMPI_Error_class -#define MPI_Error_string PMPI_Error_string -#define MPI_Exscan PMPI_Exscan -#define MPI_Fetch_and_op PMPI_Fetch_and_op -#define MPI_Iexscan PMPI_Iexscan -#define MPI_File_c2f PMPI_File_c2f -#define MPI_File_call_errhandler PMPI_File_call_errhandler -#define MPI_File_close PMPI_File_close -#define MPI_File_create_errhandler PMPI_File_create_errhandler -#define MPI_File_delete PMPI_File_delete -#define MPI_File_f2c PMPI_File_f2c -#define MPI_File_get_amode PMPI_File_get_amode -#define MPI_File_get_atomicity PMPI_File_get_atomicity -#define MPI_File_get_byte_offset PMPI_File_get_byte_offset -#define MPI_File_get_errhandler PMPI_File_get_errhandler -#define MPI_File_get_group PMPI_File_get_group -#define MPI_File_get_info PMPI_File_get_info -#define MPI_File_get_position PMPI_File_get_position -#define MPI_File_get_position_shared PMPI_File_get_position_shared -#define MPI_File_get_size PMPI_File_get_size -#define MPI_File_get_type_extent PMPI_File_get_type_extent -#define MPI_File_get_view PMPI_File_get_view -#define MPI_File_iread_at PMPI_File_iread_at -#define MPI_File_iread PMPI_File_iread -#define MPI_File_iread_at_all PMPI_File_iread_at_all -#define MPI_File_iread_all PMPI_File_iread_all -#define MPI_File_iread_shared PMPI_File_iread_shared -#define MPI_File_iwrite_at PMPI_File_iwrite_at -#define MPI_File_iwrite PMPI_File_iwrite -#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all -#define MPI_File_iwrite_all PMPI_File_iwrite_all -#define MPI_File_iwrite_shared PMPI_File_iwrite_shared -#define MPI_File_open PMPI_File_open -#define MPI_File_preallocate PMPI_File_preallocate -#define MPI_File_read_all_begin PMPI_File_read_all_begin -#define MPI_File_read_all_end PMPI_File_read_all_end -#define MPI_File_read_all PMPI_File_read_all -#define MPI_File_read_at_all_begin PMPI_File_read_at_all_begin -#define MPI_File_read_at_all_end PMPI_File_read_at_all_end -#define MPI_File_read_at_all PMPI_File_read_at_all -#define MPI_File_read_at PMPI_File_read_at -#define MPI_File_read PMPI_File_read -#define MPI_File_read_ordered_begin PMPI_File_read_ordered_begin -#define MPI_File_read_ordered_end PMPI_File_read_ordered_end -#define MPI_File_read_ordered PMPI_File_read_ordered -#define MPI_File_read_shared PMPI_File_read_shared -#define MPI_File_seek PMPI_File_seek -#define MPI_File_seek_shared PMPI_File_seek_shared -#define MPI_File_set_atomicity PMPI_File_set_atomicity -#define MPI_File_set_errhandler PMPI_File_set_errhandler -#define MPI_File_set_info PMPI_File_set_info -#define MPI_File_set_size PMPI_File_set_size -#define MPI_File_set_view PMPI_File_set_view -#define MPI_File_sync PMPI_File_sync -#define MPI_File_write_all_begin PMPI_File_write_all_begin -#define MPI_File_write_all_end PMPI_File_write_all_end -#define MPI_File_write_all PMPI_File_write_all -#define MPI_File_write_at_all_begin PMPI_File_write_at_all_begin -#define MPI_File_write_at_all_end PMPI_File_write_at_all_end -#define MPI_File_write_at_all PMPI_File_write_at_all -#define MPI_File_write_at PMPI_File_write_at -#define MPI_File_write PMPI_File_write -#define MPI_File_write_ordered_begin PMPI_File_write_ordered_begin -#define MPI_File_write_ordered_end PMPI_File_write_ordered_end -#define MPI_File_write_ordered PMPI_File_write_ordered -#define MPI_File_write_shared PMPI_File_write_shared -#define MPI_Finalize PMPI_Finalize -#define MPI_Finalized PMPI_Finalized - -#define MPI_Gather PMPI_Gather -#define MPI_Igather PMPI_Igather -#define MPI_Gatherv PMPI_Gatherv -#define MPI_Igatherv PMPI_Igatherv -#define MPI_Get_address PMPI_Get_address -#define MPI_Get_count PMPI_Get_count -#define MPI_Get_elements PMPI_Get_elements -#define MPI_Get_elements_x PMPI_Get_elements_x -#define MPI_Get PMPI_Get -#define MPI_Get_accumulate PMPI_Get_accumulate -#define MPI_Get_library_version PMPI_Get_library_version -#define MPI_Get_processor_name PMPI_Get_processor_name -#define MPI_Get_version PMPI_Get_version -#define MPI_Graph_create PMPI_Graph_create -#define MPI_Graph_get PMPI_Graph_get -#define MPI_Graph_map PMPI_Graph_map -#define MPI_Graph_neighbors_count PMPI_Graph_neighbors_count -#define MPI_Graph_neighbors PMPI_Graph_neighbors -#define MPI_Graphdims_get PMPI_Graphdims_get -#define MPI_Grequest_complete PMPI_Grequest_complete -#define MPI_Grequest_start PMPI_Grequest_start -#define MPI_Group_c2f PMPI_Group_c2f -#define MPI_Group_compare PMPI_Group_compare -#define MPI_Group_difference PMPI_Group_difference -#define MPI_Group_excl PMPI_Group_excl -#define MPI_Group_f2c PMPI_Group_f2c -#define MPI_Group_free PMPI_Group_free -#define MPI_Group_incl PMPI_Group_incl -#define MPI_Group_intersection PMPI_Group_intersection -#define MPI_Group_range_excl PMPI_Group_range_excl -#define MPI_Group_range_incl PMPI_Group_range_incl -#define MPI_Group_rank PMPI_Group_rank -#define MPI_Group_size PMPI_Group_size -#define MPI_Group_translate_ranks PMPI_Group_translate_ranks -#define MPI_Group_union PMPI_Group_union -#define MPI_Free_mem PMPI_Free_mem -#define MPI_Ibsend PMPI_Ibsend -#define MPI_Message_c2f PMPI_Message_c2f -#define MPI_Message_f2c PMPI_Message_f2c -#define MPI_Improbe PMPI_Improbe -#define MPI_Imrecv PMPI_Imrecv -#define MPI_Info_c2f PMPI_Info_c2f -#define MPI_Info_create PMPI_Info_create -#define MPI_Info_delete PMPI_Info_delete -#define MPI_Info_dup PMPI_Info_dup -#define MPI_Info_f2c PMPI_Info_f2c -#define MPI_Info_free PMPI_Info_free -#define MPI_Info_get PMPI_Info_get -#define MPI_Info_get_nkeys PMPI_Info_get_nkeys -#define MPI_Info_get_nthkey PMPI_Info_get_nthkey -#define MPI_Info_get_valuelen PMPI_Info_get_valuelen -#define MPI_Info_set PMPI_Info_set -#define MPI_Init PMPI_Init -#define MPI_Init_thread PMPI_Init_thread -#define MPI_Initialized PMPI_Initialized -#define MPI_Intercomm_create PMPI_Intercomm_create -#define MPI_Intercomm_merge PMPI_Intercomm_merge -#define MPI_Iprobe PMPI_Iprobe -#define MPI_Irecv PMPI_Irecv -#define MPI_Irsend PMPI_Irsend -#define MPI_Is_thread_main PMPI_Is_thread_main -#define MPI_Isend PMPI_Isend -#define MPI_Issend PMPI_Issend -#define MPI_Keyval_create PMPI_Keyval_create -#define MPI_Keyval_free PMPI_Keyval_free -#define MPI_Lookup_name PMPI_Lookup_name -#define MPI_Mprobe PMPI_Mprobe -#define MPI_Mrecv PMPI_Mrecv -#define MPI_Message_cancel PMPI_Message_cancel -#define MPI_Neighbor_allgather PMPI_Neighbor_allgather -#define MPI_Ineighbor_allgather PMPI_Ineighbor_allgather -#define MPI_Neighbor_allgatherv PMPI_Neighbor_allgatherv -#define MPI_Ineighbor_allgatherv PMPI_Ineighbor_allgatherv -#define MPI_Neighbor_alltoall PMPI_Neighbor_alltoall -#define MPI_Ineighbor_alltoall PMPI_Ineighbor_alltoall -#define MPI_Neighbor_alltoallv PMPI_Neighbor_alltoallv -#define MPI_Ineighbor_alltoallv PMPI_Ineighbor_alltoallv -#define MPI_Neighbor_alltoallw PMPI_Neighbor_alltoallw -#define MPI_Ineighbor_alltoallw PMPI_Ineighbor_alltoallw -#define MPI_Op_c2f PMPI_Op_c2f -#define MPI_Op_commutative PMPI_Op_commutative -#define MPI_Op_create PMPI_Op_create -#define MPI_Op_f2c PMPI_Op_f2c -#define MPI_Op_free PMPI_Op_free -#define MPI_Open_port PMPI_Open_port -#define MPI_Pack_external PMPI_Pack_external -#define MPI_Pack_external_size PMPI_Pack_external_size -#define MPI_Pack PMPI_Pack -#define MPI_Pack_size PMPI_Pack_size -#define MPI_Pcontrol PMPI_Pcontrol -#define MPI_Probe PMPI_Probe -#define MPI_Publish_name PMPI_Publish_name -#define MPI_Put PMPI_Put -#define MPI_Query_thread PMPI_Query_thread -#define MPI_Raccumulate PMPI_Raccumulate -#define MPI_Recv_init PMPI_Recv_init -#define MPI_Recv PMPI_Recv -#define MPI_Reduce PMPI_Reduce -#define MPI_Ireduce PMPI_Ireduce -#define MPI_Reduce_local PMPI_Reduce_local -#define MPI_Reduce_scatter PMPI_Reduce_scatter -#define MPI_Ireduce_scatter PMPI_Ireduce_scatter -#define MPI_Reduce_scatter_block PMPI_Reduce_scatter_block -#define MPI_Ireduce_scatter_block PMPI_Ireduce_scatter_block -#define MPI_Register_datarep PMPI_Register_datarep -#define MPI_Request_c2f PMPI_Request_c2f -#define MPI_Request_f2c PMPI_Request_f2c -#define MPI_Request_free PMPI_Request_free -#define MPI_Request_get_status PMPI_Request_get_status -#define MPI_Rget PMPI_Rget -#define MPI_Rget_accumulate PMPI_Rget_accumulate -#define MPI_Rput PMPI_Rput -#define MPI_Rsend_init PMPI_Rsend_init -#define MPI_Rsend PMPI_Rsend -#define MPI_Scan PMPI_Scan -#define MPI_Iscan PMPI_Iscan -#define MPI_Scatter PMPI_Scatter -#define MPI_Iscatter PMPI_Iscatter -#define MPI_Scatterv PMPI_Scatterv -#define MPI_Iscatterv PMPI_Iscatterv -#define MPI_Send_init PMPI_Send_init -#define MPI_Send PMPI_Send -#define MPI_Sendrecv PMPI_Sendrecv -#define MPI_Sendrecv_replace PMPI_Sendrecv_replace -#define MPI_Ssend_init PMPI_Ssend_init -#define MPI_Ssend PMPI_Ssend -#define MPI_Start PMPI_Start -#define MPI_Startall PMPI_Startall -#define MPI_Status_c2f PMPI_Status_c2f -#define MPI_Status_f2c PMPI_Status_f2c -#define MPI_Status_set_cancelled PMPI_Status_set_cancelled -#define MPI_Status_set_elements PMPI_Status_set_elements -#define MPI_Status_set_elements_x PMPI_Status_set_elements_x -#define MPI_Test_cancelled PMPI_Test_cancelled -#define MPI_Test PMPI_Test -#define MPI_Testall PMPI_Testall -#define MPI_Testany PMPI_Testany -#define MPI_Testsome PMPI_Testsome -#define MPI_Topo_test PMPI_Topo_test -#define MPI_Type_c2f PMPI_Type_c2f -#define MPI_Type_commit PMPI_Type_commit -#define MPI_Type_contiguous PMPI_Type_contiguous -#define MPI_Type_create_darray PMPI_Type_create_darray -#define MPI_Type_create_f90_complex PMPI_Type_create_f90_complex -#define MPI_Type_create_f90_integer PMPI_Type_create_f90_integer -#define MPI_Type_create_f90_real PMPI_Type_create_f90_real -#define MPI_Type_create_hindexed PMPI_Type_create_hindexed -#define MPI_Type_create_hvector PMPI_Type_create_hvector -#define MPI_Type_create_indexed_block PMPI_Type_create_indexed_block -#define MPI_Type_create_hindexed_block PMPI_Type_create_hindexed_block -#define MPI_Type_create_keyval PMPI_Type_create_keyval -#define MPI_Type_create_resized PMPI_Type_create_resized -#define MPI_Type_create_struct PMPI_Type_create_struct -#define MPI_Type_create_subarray PMPI_Type_create_subarray -#define MPI_Type_delete_attr PMPI_Type_delete_attr -#define MPI_Type_dup PMPI_Type_dup -#define MPI_Type_extent PMPI_Type_extent -#define MPI_Type_f2c PMPI_Type_f2c -#define MPI_Type_free_keyval PMPI_Type_free_keyval -#define MPI_Type_free PMPI_Type_free -#define MPI_Type_get_attr PMPI_Type_get_attr -#define MPI_Type_get_contents PMPI_Type_get_contents -#define MPI_Type_get_envelope PMPI_Type_get_envelope -#define MPI_Type_get_extent PMPI_Type_get_extent -#define MPI_Type_get_extent_x PMPI_Type_get_extent_x -#define MPI_Type_get_name PMPI_Type_get_name -#define MPI_Type_get_true_extent PMPI_Type_get_true_extent -#define MPI_Type_get_true_extent_x PMPI_Type_get_true_extent_x -#define MPI_Type_hindexed PMPI_Type_hindexed -#define MPI_Type_hvector PMPI_Type_hvector -#define MPI_Type_indexed PMPI_Type_indexed -#define MPI_Type_lb PMPI_Type_lb -#define MPI_Type_match_size PMPI_Type_match_size -#define MPI_Type_set_attr PMPI_Type_set_attr -#define MPI_Type_set_name PMPI_Type_set_name -#define MPI_Type_size PMPI_Type_size -#define MPI_Type_size_x PMPI_Type_size_x -#define MPI_Type_struct PMPI_Type_struct -#define MPI_Type_ub PMPI_Type_ub -#define MPI_Type_vector PMPI_Type_vector -#define MPI_Unpack_external PMPI_Unpack_external -#define MPI_Unpack PMPI_Unpack -#define MPI_Unpublish_name PMPI_Unpublish_name -#define MPI_Wait PMPI_Wait -#define MPI_Waitall PMPI_Waitall -#define MPI_Waitany PMPI_Waitany -#define MPI_Waitsome PMPI_Waitsome -#define MPI_Win_allocate PMPI_Win_allocate -#define MPI_Win_allocate_shared PMPI_Win_allocate_shared -#define MPI_Win_attach PMPI_Win_attach -#define MPI_Win_c2f PMPI_Win_c2f -#define MPI_Win_call_errhandler PMPI_Win_call_errhandler -#define MPI_Win_complete PMPI_Win_complete -#define MPI_Win_create_errhandler PMPI_Win_create_errhandler -#define MPI_Win_create_keyval PMPI_Win_create_keyval -#define MPI_Win_create PMPI_Win_create -#define MPI_Win_create_dynamic PMPI_Win_create_dynamic -#define MPI_Win_delete_attr PMPI_Win_delete_attr -#define MPI_Win_detach PMPI_Win_detach -#define MPI_Win_f2c PMPI_Win_f2c -#define MPI_Win_fence PMPI_Win_fence -#define MPI_Win_flush PMPI_Win_flush -#define MPI_Win_flush_all PMPI_Win_flush_all -#define MPI_Win_flush_local PMPI_Win_flush_local -#define MPI_Win_flush_local_all PMPI_Win_flush_local_all -#define MPI_Win_free_keyval PMPI_Win_free_keyval -#define MPI_Win_free PMPI_Win_free -#define MPI_Win_get_attr PMPI_Win_get_attr -#define MPI_Win_get_errhandler PMPI_Win_get_errhandler -#define MPI_Win_get_group PMPI_Win_get_group -#define MPI_Win_get_info PMPI_Win_get_info -#define MPI_Win_get_name PMPI_Win_get_name -#define MPI_Win_lock PMPI_Win_lock -#define MPI_Win_lock_all PMPI_Win_lock_all -#define MPI_Win_post PMPI_Win_post -#define MPI_Win_set_attr PMPI_Win_set_attr -#define MPI_Win_set_errhandler PMPI_Win_set_errhandler -#define MPI_Win_set_info PMPI_Win_set_info -#define MPI_Win_set_name PMPI_Win_set_name -#define MPI_Win_shared_query PMPI_Win_shared_query -#define MPI_Win_start PMPI_Win_start -#define MPI_Win_sync PMPI_Win_sync -#define MPI_Win_test PMPI_Win_test -#define MPI_Win_unlock PMPI_Win_unlock -#define MPI_Win_unlock_all PMPI_Win_unlock_all -#define MPI_Win_wait PMPI_Win_wait -#define MPI_Wtick PMPI_Wtick -#define MPI_Wtime PMPI_Wtime -#endif /* OMPI_C_PROFILE_DEFINES_H */ diff --git a/ompi/mpi/c/publish_name.c b/ompi/mpi/c/publish_name.c index b83dca52c3..be413378f9 100644 --- a/ompi/mpi/c/publish_name.c +++ b/ompi/mpi/c/publish_name.c @@ -12,8 +12,11 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2015 Intel, Inc. All rights reserved. -* $COPYRIGHT$ + * Copyright (c) 2015 Intel, Inc. All rights reserved. + * + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ * * Additional copyrights may follow * @@ -31,12 +34,12 @@ #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Publish_name = PMPI_Publish_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Publish_name PMPI_Publish_name #endif static const char FUNC_NAME[] = "MPI_Publish_name"; diff --git a/ompi/mpi/c/put.c b/ompi/mpi/c/put.c index ef8e6e7a1b..7d048fb7a1 100644 --- a/ompi/mpi/c/put.c +++ b/ompi/mpi/c/put.c @@ -32,12 +32,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Put = PMPI_Put #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Put PMPI_Put #endif static const char FUNC_NAME[] = "MPI_Put"; diff --git a/ompi/mpi/c/query_thread.c b/ompi/mpi/c/query_thread.c index 01cb9aa405..9550d46fa4 100644 --- a/ompi/mpi/c/query_thread.c +++ b/ompi/mpi/c/query_thread.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,12 +25,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Query_thread = PMPI_Query_thread #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Query_thread PMPI_Query_thread #endif static const char FUNC_NAME[] = "MPI_Query_thread"; diff --git a/ompi/mpi/c/raccumulate.c b/ompi/mpi/c/raccumulate.c index bba74b9ec2..c1b4b9bf19 100644 --- a/ompi/mpi/c/raccumulate.c +++ b/ompi/mpi/c/raccumulate.c @@ -35,12 +35,12 @@ #include "ompi/datatype/ompi_datatype_internal.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Raccumulate = PMPI_Raccumulate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Raccumulate PMPI_Raccumulate #endif static const char FUNC_NAME[] = "MPI_Raccumulate"; diff --git a/ompi/mpi/c/recv.c b/ompi/mpi/c/recv.c index eda93784c5..b934bcf51a 100644 --- a/ompi/mpi/c/recv.c +++ b/ompi/mpi/c/recv.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/memchecker.h" #include "ompi/request/request.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Recv = PMPI_Recv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Recv PMPI_Recv #endif static const char FUNC_NAME[] = "MPI_Recv"; diff --git a/ompi/mpi/c/recv_init.c b/ompi/mpi/c/recv_init.c index 5f486286e6..81d7901411 100644 --- a/ompi/mpi/c/recv_init.c +++ b/ompi/mpi/c/recv_init.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Recv_init = PMPI_Recv_init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Recv_init PMPI_Recv_init #endif static const char FUNC_NAME[] = "MPI_Recv_init"; diff --git a/ompi/mpi/c/reduce.c b/ompi/mpi/c/reduce.c index 0051c7f71a..7bd3c00fd3 100644 --- a/ompi/mpi/c/reduce.c +++ b/ompi/mpi/c/reduce.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Reduce = PMPI_Reduce #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Reduce PMPI_Reduce #endif static const char FUNC_NAME[] = "MPI_Reduce"; diff --git a/ompi/mpi/c/reduce_local.c b/ompi/mpi/c/reduce_local.c index ee001960a7..6a15e5324c 100644 --- a/ompi/mpi/c/reduce_local.c +++ b/ompi/mpi/c/reduce_local.c @@ -13,6 +13,8 @@ * Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Reduce_local = PMPI_Reduce_local #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Reduce_local PMPI_Reduce_local #endif static const char FUNC_NAME[] = "MPI_Reduce_local"; diff --git a/ompi/mpi/c/reduce_scatter.c b/ompi/mpi/c/reduce_scatter.c index 9bc55918a0..da05d82129 100644 --- a/ompi/mpi/c/reduce_scatter.c +++ b/ompi/mpi/c/reduce_scatter.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Reduce_scatter = PMPI_Reduce_scatter #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Reduce_scatter PMPI_Reduce_scatter #endif static const char FUNC_NAME[] = "MPI_Reduce_scatter"; diff --git a/ompi/mpi/c/reduce_scatter_block.c b/ompi/mpi/c/reduce_scatter_block.c index db6164db66..f0ed37e4dc 100644 --- a/ompi/mpi/c/reduce_scatter_block.c +++ b/ompi/mpi/c/reduce_scatter_block.c @@ -33,12 +33,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Reduce_scatter_block = PMPI_Reduce_scatter_block #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Reduce_scatter_block PMPI_Reduce_scatter_block #endif static const char FUNC_NAME[] = "MPI_Reduce_scatter_block"; diff --git a/ompi/mpi/c/register_datarep.c b/ompi/mpi/c/register_datarep.c index f9f2f95e07..934a1ebdd8 100644 --- a/ompi/mpi/c/register_datarep.c +++ b/ompi/mpi/c/register_datarep.c @@ -30,12 +30,12 @@ #include "ompi/mca/io/base/base.h" #include "ompi/file/file.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Register_datarep = PMPI_Register_datarep #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Register_datarep PMPI_Register_datarep #endif static const char FUNC_NAME[] = "MPI_Register_datarep"; diff --git a/ompi/mpi/c/request_c2f.c b/ompi/mpi/c/request_c2f.c index 0e28966331..1240f1b3e9 100644 --- a/ompi/mpi/c/request_c2f.c +++ b/ompi/mpi/c/request_c2f.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Request_c2f = PMPI_Request_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Request_c2f PMPI_Request_c2f #endif static const char FUNC_NAME[] = "MPI_Request_c2f"; diff --git a/ompi/mpi/c/request_f2c.c b/ompi/mpi/c/request_f2c.c index 32ed6b06dc..75503f80a5 100644 --- a/ompi/mpi/c/request_f2c.c +++ b/ompi/mpi/c/request_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/request/request.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Request_f2c = PMPI_Request_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Request_f2c PMPI_Request_f2c #endif static const char FUNC_NAME[] = "MPI_Request_f2c"; diff --git a/ompi/mpi/c/request_free.c b/ompi/mpi/c/request_free.c index d1750f3d0e..4f481da8c2 100644 --- a/ompi/mpi/c/request_free.c +++ b/ompi/mpi/c/request_free.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Request_free = PMPI_Request_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Request_free PMPI_Request_free #endif static const char FUNC_NAME[] = "MPI_Request_free"; diff --git a/ompi/mpi/c/request_get_status.c b/ompi/mpi/c/request_get_status.c index 8a6e1830b5..a20ec4f9a8 100644 --- a/ompi/mpi/c/request_get_status.c +++ b/ompi/mpi/c/request_get_status.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/request/grequest.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Request_get_status = PMPI_Request_get_status #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Request_get_status PMPI_Request_get_status #endif static const char FUNC_NAME[] = "MPI_Request_get_status"; diff --git a/ompi/mpi/c/rget.c b/ompi/mpi/c/rget.c index 1252ec011f..40a91c149e 100644 --- a/ompi/mpi/c/rget.c +++ b/ompi/mpi/c/rget.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2014-2015 Los Alamos National Security, LLC. ALl rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Rget = PMPI_Rget #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Rget PMPI_Rget #endif static const char FUNC_NAME[] = "MPI_Rget"; diff --git a/ompi/mpi/c/rget_accumulate.c b/ompi/mpi/c/rget_accumulate.c index 83df73a47a..9a9b48a08a 100644 --- a/ompi/mpi/c/rget_accumulate.c +++ b/ompi/mpi/c/rget_accumulate.c @@ -36,12 +36,12 @@ #include "ompi/datatype/ompi_datatype_internal.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Rget_accumulate = PMPI_Rget_accumulate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Rget_accumulate PMPI_Rget_accumulate #endif static const char FUNC_NAME[] = "MPI_Rget_accumulate"; diff --git a/ompi/mpi/c/rput.c b/ompi/mpi/c/rput.c index 90592273ab..9b054959f0 100644 --- a/ompi/mpi/c/rput.c +++ b/ompi/mpi/c/rput.c @@ -32,12 +32,12 @@ #include "ompi/mca/osc/osc.h" #include "ompi/datatype/ompi_datatype.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Rput = PMPI_Rput #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Rput PMPI_Rput #endif static const char FUNC_NAME[] = "MPI_Rput"; diff --git a/ompi/mpi/c/rsend.c b/ompi/mpi/c/rsend.c index 06e6c8deea..233f077745 100644 --- a/ompi/mpi/c/rsend.c +++ b/ompi/mpi/c/rsend.c @@ -32,12 +32,12 @@ #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Rsend = PMPI_Rsend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Rsend PMPI_Rsend #endif static const char FUNC_NAME[] = "MPI_Rsend"; diff --git a/ompi/mpi/c/rsend_init.c b/ompi/mpi/c/rsend_init.c index ce140f1536..52936fdd16 100644 --- a/ompi/mpi/c/rsend_init.c +++ b/ompi/mpi/c/rsend_init.c @@ -32,12 +32,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Rsend_init = PMPI_Rsend_init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Rsend_init PMPI_Rsend_init #endif static const char FUNC_NAME[] = "MPI_Rsend_init"; diff --git a/ompi/mpi/c/scan.c b/ompi/mpi/c/scan.c index 77dda4fc68..309efd3238 100644 --- a/ompi/mpi/c/scan.c +++ b/ompi/mpi/c/scan.c @@ -32,12 +32,12 @@ #include "ompi/op/op.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Scan = PMPI_Scan #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Scan PMPI_Scan #endif static const char FUNC_NAME[] = "MPI_Scan"; diff --git a/ompi/mpi/c/scatter.c b/ompi/mpi/c/scatter.c index 3c1a989a32..bc1a97f0bf 100644 --- a/ompi/mpi/c/scatter.c +++ b/ompi/mpi/c/scatter.c @@ -33,12 +33,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Scatter = PMPI_Scatter #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Scatter PMPI_Scatter #endif static const char FUNC_NAME[] = "MPI_Scatter"; diff --git a/ompi/mpi/c/scatterv.c b/ompi/mpi/c/scatterv.c index 4412bb2177..2b417e2c6d 100644 --- a/ompi/mpi/c/scatterv.c +++ b/ompi/mpi/c/scatterv.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Scatterv = PMPI_Scatterv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Scatterv PMPI_Scatterv #endif static const char FUNC_NAME[] = "MPI_Scatterv"; diff --git a/ompi/mpi/c/send.c b/ompi/mpi/c/send.c index d3dd0ba937..e9cd9aaf6d 100644 --- a/ompi/mpi/c/send.c +++ b/ompi/mpi/c/send.c @@ -31,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Send = PMPI_Send #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Send PMPI_Send #endif static const char FUNC_NAME[] = "MPI_Send"; diff --git a/ompi/mpi/c/send_init.c b/ompi/mpi/c/send_init.c index b0a54f2bd1..2326040751 100644 --- a/ompi/mpi/c/send_init.c +++ b/ompi/mpi/c/send_init.c @@ -32,12 +32,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Send_init = PMPI_Send_init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Send_init PMPI_Send_init #endif static const char FUNC_NAME[] = "MPI_Send_init"; diff --git a/ompi/mpi/c/sendrecv.c b/ompi/mpi/c/sendrecv.c index 318586ccb5..83b08418d3 100644 --- a/ompi/mpi/c/sendrecv.c +++ b/ompi/mpi/c/sendrecv.c @@ -30,12 +30,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Sendrecv = PMPI_Sendrecv #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Sendrecv PMPI_Sendrecv #endif static const char FUNC_NAME[] = "MPI_Sendrecv"; diff --git a/ompi/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c index a2e7307cc8..56ebe49650 100644 --- a/ompi/mpi/c/sendrecv_replace.c +++ b/ompi/mpi/c/sendrecv_replace.c @@ -30,12 +30,18 @@ #include "ompi/proc/proc.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Sendrecv_replace = PMPI_Sendrecv_replace #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Sendrecv_replace PMPI_Sendrecv_replace +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Alloc_mem PMPI_Alloc_mem +#define MPI_Free_mem PMPI_Free_mem +#define MPI_Sendrecv PMPI_Sendrecv #endif static const char FUNC_NAME[] = "MPI_Sendrecv_replace"; diff --git a/ompi/mpi/c/ssend.c b/ompi/mpi/c/ssend.c index 9e85abe9ac..ffc8b5088a 100644 --- a/ompi/mpi/c/ssend.c +++ b/ompi/mpi/c/ssend.c @@ -31,12 +31,12 @@ #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ssend = PMPI_Ssend #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ssend PMPI_Ssend #endif static const char FUNC_NAME[] = "MPI_Ssend"; diff --git a/ompi/mpi/c/ssend_init.c b/ompi/mpi/c/ssend_init.c index 57b4023b66..0039e78e56 100644 --- a/ompi/mpi/c/ssend_init.c +++ b/ompi/mpi/c/ssend_init.c @@ -32,12 +32,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Ssend_init = PMPI_Ssend_init #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Ssend_init PMPI_Ssend_init #endif static const char FUNC_NAME[] = "MPI_Ssend_init"; diff --git a/ompi/mpi/c/start.c b/ompi/mpi/c/start.c index 7e50edc36d..5b5d13ac22 100644 --- a/ompi/mpi/c/start.c +++ b/ompi/mpi/c/start.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Start = PMPI_Start #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Start PMPI_Start #endif static const char FUNC_NAME[] = "MPI_Start"; diff --git a/ompi/mpi/c/startall.c b/ompi/mpi/c/startall.c index 958b22cd03..c9f101cc69 100644 --- a/ompi/mpi/c/startall.c +++ b/ompi/mpi/c/startall.c @@ -12,7 +12,7 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -31,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Startall = PMPI_Startall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Startall PMPI_Startall #endif static const char FUNC_NAME[] = "MPI_Startall"; diff --git a/ompi/mpi/c/status_c2f.c b/ompi/mpi/c/status_c2f.c index f466af9594..08ac19682f 100644 --- a/ompi/mpi/c/status_c2f.c +++ b/ompi/mpi/c/status_c2f.c @@ -13,6 +13,8 @@ * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/mpi/fortran/base/constants.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Status_c2f = PMPI_Status_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Status_c2f PMPI_Status_c2f #endif static const char FUNC_NAME[] = "MPI_Status_c2f"; diff --git a/ompi/mpi/c/status_f2c.c b/ompi/mpi/c/status_f2c.c index 3e41373af6..bd2eafd293 100644 --- a/ompi/mpi/c/status_f2c.c +++ b/ompi/mpi/c/status_f2c.c @@ -13,6 +13,8 @@ * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/mpi/fortran/base/fint_2_int.h" #include "ompi/mpi/fortran/base/constants.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Status_f2c = PMPI_Status_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Status_f2c PMPI_Status_f2c #endif static const char FUNC_NAME[] = "MPI_Status_f2c"; diff --git a/ompi/mpi/c/status_set_cancelled.c b/ompi/mpi/c/status_set_cancelled.c index 0013796488..b41c04d7df 100644 --- a/ompi/mpi/c/status_set_cancelled.c +++ b/ompi/mpi/c/status_set_cancelled.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Status_set_cancelled = PMPI_Status_set_cancelled #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Status_set_cancelled PMPI_Status_set_cancelled #endif static const char FUNC_NAME[] = "MPI_Status_set_cancelled"; diff --git a/ompi/mpi/c/status_set_elements.c b/ompi/mpi/c/status_set_elements.c index 9b9181a135..71190cc168 100644 --- a/ompi/mpi/c/status_set_elements.c +++ b/ompi/mpi/c/status_set_elements.c @@ -12,6 +12,8 @@ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Status_set_elements = PMPI_Status_set_elements #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Status_set_elements PMPI_Status_set_elements #endif static const char FUNC_NAME[] = "MPI_Status_set_elements"; diff --git a/ompi/mpi/c/status_set_elements_x.c b/ompi/mpi/c/status_set_elements_x.c index 678975f085..a307c49e2d 100644 --- a/ompi/mpi/c/status_set_elements_x.c +++ b/ompi/mpi/c/status_set_elements_x.c @@ -12,6 +12,8 @@ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Status_set_elements_x = PMPI_Status_set_elements_x #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Status_set_elements_x PMPI_Status_set_elements_x #endif static const char FUNC_NAME[] = "MPI_Status_set_elements_x"; diff --git a/ompi/mpi/c/test.c b/ompi/mpi/c/test.c index c730aadc39..ce38ae7b85 100644 --- a/ompi/mpi/c/test.c +++ b/ompi/mpi/c/test.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Test = PMPI_Test #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Test PMPI_Test #endif static const char FUNC_NAME[] = "MPI_Test"; diff --git a/ompi/mpi/c/test_cancelled.c b/ompi/mpi/c/test_cancelled.c index 33fc9eee71..ce3e91d4cc 100644 --- a/ompi/mpi/c/test_cancelled.c +++ b/ompi/mpi/c/test_cancelled.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Test_cancelled = PMPI_Test_cancelled #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Test_cancelled PMPI_Test_cancelled #endif static const char FUNC_NAME[] = "MPI_Test_cancelled"; diff --git a/ompi/mpi/c/testall.c b/ompi/mpi/c/testall.c index d3f0e29a97..67446f636d 100644 --- a/ompi/mpi/c/testall.c +++ b/ompi/mpi/c/testall.c @@ -13,6 +13,8 @@ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Testall = PMPI_Testall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Testall PMPI_Testall #endif static const char FUNC_NAME[] = "MPI_Testall"; diff --git a/ompi/mpi/c/testany.c b/ompi/mpi/c/testany.c index ff8dcef717..fd48190ad0 100644 --- a/ompi/mpi/c/testany.c +++ b/ompi/mpi/c/testany.c @@ -13,7 +13,7 @@ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -31,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Testany = PMPI_Testany #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Testany PMPI_Testany #endif static const char FUNC_NAME[] = "MPI_Testany"; diff --git a/ompi/mpi/c/testsome.c b/ompi/mpi/c/testsome.c index 3a82625205..d822db63af 100644 --- a/ompi/mpi/c/testsome.c +++ b/ompi/mpi/c/testsome.c @@ -13,6 +13,8 @@ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Testsome = PMPI_Testsome #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Testsome PMPI_Testsome #endif static const char FUNC_NAME[] = "MPI_Testsome"; diff --git a/ompi/mpi/c/topo_test.c b/ompi/mpi/c/topo_test.c index b23e380ddb..6999590775 100644 --- a/ompi/mpi/c/topo_test.c +++ b/ompi/mpi/c/topo_test.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Topo_test = PMPI_Topo_test #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Topo_test PMPI_Topo_test #endif static const char FUNC_NAME[] = "MPI_Topo_test"; diff --git a/ompi/mpi/c/type_c2f.c b/ompi/mpi/c/type_c2f.c index 2659d4e251..f9b51d1fc1 100644 --- a/ompi/mpi/c/type_c2f.c +++ b/ompi/mpi/c/type_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_c2f = PMPI_Type_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_c2f PMPI_Type_c2f #endif static const char FUNC_NAME[] = "MPI_Type_c2f"; diff --git a/ompi/mpi/c/type_commit.c b/ompi/mpi/c/type_commit.c index 26731b204a..5e115182aa 100644 --- a/ompi/mpi/c/type_commit.c +++ b/ompi/mpi/c/type_commit.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_commit = PMPI_Type_commit #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_commit PMPI_Type_commit #endif static const char FUNC_NAME[] = "MPI_Type_commit"; diff --git a/ompi/mpi/c/type_contiguous.c b/ompi/mpi/c/type_contiguous.c index fa6415e1fd..254ebab666 100644 --- a/ompi/mpi/c/type_contiguous.c +++ b/ompi/mpi/c/type_contiguous.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_contiguous = PMPI_Type_contiguous #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_contiguous PMPI_Type_contiguous #endif static const char FUNC_NAME[] = "MPI_Type_contiguous"; diff --git a/ompi/mpi/c/type_create_darray.c b/ompi/mpi/c/type_create_darray.c index c95093a67c..9268848d67 100644 --- a/ompi/mpi/c/type_create_darray.c +++ b/ompi/mpi/c/type_create_darray.c @@ -13,6 +13,8 @@ * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_darray = PMPI_Type_create_darray #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_darray PMPI_Type_create_darray #endif static const char FUNC_NAME[] = "MPI_Type_create_darray"; diff --git a/ompi/mpi/c/type_create_f90_complex.c b/ompi/mpi/c/type_create_f90_complex.c index d0fcf9f41b..469bd11079 100644 --- a/ompi/mpi/c/type_create_f90_complex.c +++ b/ompi/mpi/c/type_create_f90_complex.c @@ -14,6 +14,8 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_f90_complex = PMPI_Type_create_f90_complex #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_f90_complex PMPI_Type_create_f90_complex #endif static const char FUNC_NAME[] = "MPI_Type_create_f90_complex"; diff --git a/ompi/mpi/c/type_create_f90_integer.c b/ompi/mpi/c/type_create_f90_integer.c index 8b53c9eb98..ff3f9ec5ff 100644 --- a/ompi/mpi/c/type_create_f90_integer.c +++ b/ompi/mpi/c/type_create_f90_integer.c @@ -14,6 +14,8 @@ * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_f90_integer = PMPI_Type_create_f90_integer #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_f90_integer PMPI_Type_create_f90_integer #endif static const char FUNC_NAME[] = "MPI_Type_create_f90_integer"; diff --git a/ompi/mpi/c/type_create_f90_real.c b/ompi/mpi/c/type_create_f90_real.c index 4ffa4da9de..26a6f7e825 100644 --- a/ompi/mpi/c/type_create_f90_real.c +++ b/ompi/mpi/c/type_create_f90_real.c @@ -14,6 +14,8 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_f90_real = PMPI_Type_create_f90_real #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_f90_real PMPI_Type_create_f90_real #endif static const char FUNC_NAME[] = "MPI_Type_create_f90_real"; diff --git a/ompi/mpi/c/type_create_hindexed.c b/ompi/mpi/c/type_create_hindexed.c index 931ddd0ae3..8eb827dfc8 100644 --- a/ompi/mpi/c/type_create_hindexed.c +++ b/ompi/mpi/c/type_create_hindexed.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_hindexed = PMPI_Type_create_hindexed #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_hindexed PMPI_Type_create_hindexed #endif static const char FUNC_NAME[] = "MPI_Type_create_hindexed"; diff --git a/ompi/mpi/c/type_create_hindexed_block.c b/ompi/mpi/c/type_create_hindexed_block.c index 89829f3b13..3a0839b2d5 100644 --- a/ompi/mpi/c/type_create_hindexed_block.c +++ b/ompi/mpi/c/type_create_hindexed_block.c @@ -5,6 +5,8 @@ * reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,12 +23,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_hindexed_block = PMPI_Type_create_hindexed_block #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_hindexed_block PMPI_Type_create_hindexed_block #endif static const char FUNC_NAME[] = "MPI_Type_create_hindexed_block"; diff --git a/ompi/mpi/c/type_create_hvector.c b/ompi/mpi/c/type_create_hvector.c index 98f8390b28..6c62ee5fc8 100644 --- a/ompi/mpi/c/type_create_hvector.c +++ b/ompi/mpi/c/type_create_hvector.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_hvector = PMPI_Type_create_hvector #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_hvector PMPI_Type_create_hvector #endif static const char FUNC_NAME[] = "MPI_Type_create_hvector"; diff --git a/ompi/mpi/c/type_create_indexed_block.c b/ompi/mpi/c/type_create_indexed_block.c index 0fc6ef6f16..1599f67b7b 100644 --- a/ompi/mpi/c/type_create_indexed_block.c +++ b/ompi/mpi/c/type_create_indexed_block.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_indexed_block = PMPI_Type_create_indexed_block #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_indexed_block PMPI_Type_create_indexed_block #endif static const char FUNC_NAME[] = "MPI_Type_create_indexed_block"; diff --git a/ompi/mpi/c/type_create_keyval.c b/ompi/mpi/c/type_create_keyval.c index 5abee47669..eccbe24250 100644 --- a/ompi/mpi/c/type_create_keyval.c +++ b/ompi/mpi/c/type_create_keyval.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_keyval = PMPI_Type_create_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_keyval PMPI_Type_create_keyval #endif static const char FUNC_NAME[] = "MPI_Type_create_keyval"; diff --git a/ompi/mpi/c/type_create_resized.c b/ompi/mpi/c/type_create_resized.c index 052d3f6d66..91d279b0df 100644 --- a/ompi/mpi/c/type_create_resized.c +++ b/ompi/mpi/c/type_create_resized.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_resized = PMPI_Type_create_resized #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_resized PMPI_Type_create_resized #endif static const char FUNC_NAME[] = "MPI_Type_create_resized"; diff --git a/ompi/mpi/c/type_create_struct.c b/ompi/mpi/c/type_create_struct.c index 8ce548462e..118d0a1168 100644 --- a/ompi/mpi/c/type_create_struct.c +++ b/ompi/mpi/c/type_create_struct.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_struct = PMPI_Type_create_struct #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_struct PMPI_Type_create_struct #endif static const char FUNC_NAME[] = "MPI_Type_create_struct"; diff --git a/ompi/mpi/c/type_create_subarray.c b/ompi/mpi/c/type_create_subarray.c index 5cd06f9cec..4e069a841e 100644 --- a/ompi/mpi/c/type_create_subarray.c +++ b/ompi/mpi/c/type_create_subarray.c @@ -13,6 +13,8 @@ * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_create_subarray = PMPI_Type_create_subarray #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_create_subarray PMPI_Type_create_subarray #endif static const char FUNC_NAME[] = "MPI_Type_create_subarray"; diff --git a/ompi/mpi/c/type_delete_attr.c b/ompi/mpi/c/type_delete_attr.c index f4b69c4d13..c835cad625 100644 --- a/ompi/mpi/c/type_delete_attr.c +++ b/ompi/mpi/c/type_delete_attr.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_delete_attr = PMPI_Type_delete_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_delete_attr PMPI_Type_delete_attr #endif static const char FUNC_NAME[] = "MPI_Type_delete_attr"; diff --git a/ompi/mpi/c/type_dup.c b/ompi/mpi/c/type_dup.c index 89542931ed..739b10b214 100644 --- a/ompi/mpi/c/type_dup.c +++ b/ompi/mpi/c/type_dup.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_dup = PMPI_Type_dup #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_dup PMPI_Type_dup #endif static const char FUNC_NAME[] = "MPI_Type_dup"; diff --git a/ompi/mpi/c/type_extent.c b/ompi/mpi/c/type_extent.c index e376d592aa..3fb4c6be4e 100644 --- a/ompi/mpi/c/type_extent.c +++ b/ompi/mpi/c/type_extent.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_extent = PMPI_Type_extent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_extent PMPI_Type_extent #endif static const char FUNC_NAME[] = "MPI_Type_extent"; diff --git a/ompi/mpi/c/type_f2c.c b/ompi/mpi/c/type_f2c.c index 73ff1a37f1..d540e5b4ee 100644 --- a/ompi/mpi/c/type_f2c.c +++ b/ompi/mpi/c/type_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/datatype/ompi_datatype_internal.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_f2c = PMPI_Type_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_f2c PMPI_Type_f2c #endif static const char FUNC_NAME[] = "MPI_Type_f2c"; diff --git a/ompi/mpi/c/type_free.c b/ompi/mpi/c/type_free.c index 245f46b0bb..b42e9b227a 100644 --- a/ompi/mpi/c/type_free.c +++ b/ompi/mpi/c/type_free.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_free = PMPI_Type_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_free PMPI_Type_free #endif static const char FUNC_NAME[] = "MPI_Type_free"; diff --git a/ompi/mpi/c/type_free_keyval.c b/ompi/mpi/c/type_free_keyval.c index 908ac2723c..d4bdcc210a 100644 --- a/ompi/mpi/c/type_free_keyval.c +++ b/ompi/mpi/c/type_free_keyval.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_free_keyval = PMPI_Type_free_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_free_keyval PMPI_Type_free_keyval #endif static const char FUNC_NAME[] = "MPI_Type_free_keyval"; diff --git a/ompi/mpi/c/type_get_attr.c b/ompi/mpi/c/type_get_attr.c index 14ffb05dba..6a6b0b7e31 100644 --- a/ompi/mpi/c/type_get_attr.c +++ b/ompi/mpi/c/type_get_attr.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_attr = PMPI_Type_get_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_attr PMPI_Type_get_attr #endif static const char FUNC_NAME[] = "MPI_Type_get_attr"; diff --git a/ompi/mpi/c/type_get_contents.c b/ompi/mpi/c/type_get_contents.c index 6a9d0a832f..9674a30554 100644 --- a/ompi/mpi/c/type_get_contents.c +++ b/ompi/mpi/c/type_get_contents.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_contents = PMPI_Type_get_contents #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_contents PMPI_Type_get_contents #endif static const char FUNC_NAME[] = "MPI_Type_get_contents"; diff --git a/ompi/mpi/c/type_get_envelope.c b/ompi/mpi/c/type_get_envelope.c index e294d6e011..72542f769f 100644 --- a/ompi/mpi/c/type_get_envelope.c +++ b/ompi/mpi/c/type_get_envelope.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_envelope = PMPI_Type_get_envelope #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_envelope PMPI_Type_get_envelope #endif static const char FUNC_NAME[] = "MPI_Type_get_envelope"; diff --git a/ompi/mpi/c/type_get_extent.c b/ompi/mpi/c/type_get_extent.c index 7a924e2777..0f50a39473 100644 --- a/ompi/mpi/c/type_get_extent.c +++ b/ompi/mpi/c/type_get_extent.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_extent = PMPI_Type_get_extent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_extent PMPI_Type_get_extent #endif static const char FUNC_NAME[] = "MPI_Type_get_extent"; diff --git a/ompi/mpi/c/type_get_extent_x.c b/ompi/mpi/c/type_get_extent_x.c index 3d857338de..71284927c7 100644 --- a/ompi/mpi/c/type_get_extent_x.c +++ b/ompi/mpi/c/type_get_extent_x.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_extent_x = PMPI_Type_get_extent_x #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_extent_x PMPI_Type_get_extent_x #endif static const char FUNC_NAME[] = "MPI_Type_get_extent_x"; diff --git a/ompi/mpi/c/type_get_name.c b/ompi/mpi/c/type_get_name.c index 70b1366e96..adf17f5b26 100644 --- a/ompi/mpi/c/type_get_name.c +++ b/ompi/mpi/c/type_get_name.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_name = PMPI_Type_get_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_name PMPI_Type_get_name #endif static const char FUNC_NAME[] = "MPI_Type_get_name"; diff --git a/ompi/mpi/c/type_get_true_extent.c b/ompi/mpi/c/type_get_true_extent.c index 0ae8df2fde..8b29dd0ca6 100644 --- a/ompi/mpi/c/type_get_true_extent.c +++ b/ompi/mpi/c/type_get_true_extent.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_true_extent = PMPI_Type_get_true_extent #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_true_extent PMPI_Type_get_true_extent #endif static const char FUNC_NAME[] = "MPI_Type_get_true_extent"; diff --git a/ompi/mpi/c/type_get_true_extent_x.c b/ompi/mpi/c/type_get_true_extent_x.c index c728b0c63f..0149fb44ee 100644 --- a/ompi/mpi/c/type_get_true_extent_x.c +++ b/ompi/mpi/c/type_get_true_extent_x.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_get_true_extent_x = PMPI_Type_get_true_extent_x #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_get_true_extent_x PMPI_Type_get_true_extent_x #endif static const char FUNC_NAME[] = "MPI_Type_get_true_extent_x"; diff --git a/ompi/mpi/c/type_hindexed.c b/ompi/mpi/c/type_hindexed.c index e6c8dd2448..e32d28700d 100644 --- a/ompi/mpi/c/type_hindexed.c +++ b/ompi/mpi/c/type_hindexed.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,16 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_hindexed = PMPI_Type_hindexed #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_hindexed PMPI_Type_hindexed +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_hindexed PMPI_Type_create_hindexed #endif static const char FUNC_NAME[] = "MPI_Type_hindexed"; diff --git a/ompi/mpi/c/type_hvector.c b/ompi/mpi/c/type_hvector.c index b5fef198b1..3dc1312a05 100644 --- a/ompi/mpi/c/type_hvector.c +++ b/ompi/mpi/c/type_hvector.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,16 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_hvector = PMPI_Type_hvector #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_hvector PMPI_Type_hvector +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_hvector PMPI_Type_create_hvector #endif static const char FUNC_NAME[] = "MPI_Type_hvector"; diff --git a/ompi/mpi/c/type_indexed.c b/ompi/mpi/c/type_indexed.c index a3e8b3fc86..d7afa00d8d 100644 --- a/ompi/mpi/c/type_indexed.c +++ b/ompi/mpi/c/type_indexed.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_indexed = PMPI_Type_indexed #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_indexed PMPI_Type_indexed #endif static const char FUNC_NAME[] = "MPI_Type_indexed"; diff --git a/ompi/mpi/c/type_lb.c b/ompi/mpi/c/type_lb.c index 4ba6e8a4a2..a363a175ef 100644 --- a/ompi/mpi/c/type_lb.c +++ b/ompi/mpi/c/type_lb.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_lb = PMPI_Type_lb #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_lb PMPI_Type_lb #endif static const char FUNC_NAME[] = "MPI_Type_lb"; diff --git a/ompi/mpi/c/type_match_size.c b/ompi/mpi/c/type_match_size.c index 878ce9d9c4..b15bc60018 100644 --- a/ompi/mpi/c/type_match_size.c +++ b/ompi/mpi/c/type_match_size.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/datatype/ompi_datatype_internal.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_match_size = PMPI_Type_match_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_match_size PMPI_Type_match_size #endif static const char FUNC_NAME[] = "MPI_Type_match_size"; diff --git a/ompi/mpi/c/type_set_attr.c b/ompi/mpi/c/type_set_attr.c index cfda8c1ba4..5ac059dc0f 100644 --- a/ompi/mpi/c/type_set_attr.c +++ b/ompi/mpi/c/type_set_attr.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_set_attr = PMPI_Type_set_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_set_attr PMPI_Type_set_attr #endif static const char FUNC_NAME[] = "MPI_Type_set_attr"; diff --git a/ompi/mpi/c/type_set_name.c b/ompi/mpi/c/type_set_name.c index 6dd6d9bc88..c1b8e68c40 100644 --- a/ompi/mpi/c/type_set_name.c +++ b/ompi/mpi/c/type_set_name.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,12 +32,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_set_name = PMPI_Type_set_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_set_name PMPI_Type_set_name #endif static const char FUNC_NAME[] = "MPI_Type_set_name"; diff --git a/ompi/mpi/c/type_size.c b/ompi/mpi/c/type_size.c index 7b710d1e4c..e840517a6c 100644 --- a/ompi/mpi/c/type_size.c +++ b/ompi/mpi/c/type_size.c @@ -13,6 +13,8 @@ * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_size = PMPI_Type_size #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_size PMPI_Type_size #endif static const char FUNC_NAME[] = "MPI_Type_size"; diff --git a/ompi/mpi/c/type_size_x.c b/ompi/mpi/c/type_size_x.c index 7e54b0ecdd..c17df7b245 100644 --- a/ompi/mpi/c/type_size_x.c +++ b/ompi/mpi/c/type_size_x.c @@ -13,6 +13,8 @@ * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_size_x = PMPI_Type_size_x #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_size_x PMPI_Type_size_x #endif static const char FUNC_NAME[] = "MPI_Type_size_x"; diff --git a/ompi/mpi/c/type_struct.c b/ompi/mpi/c/type_struct.c index e6573ef733..c051367a4f 100644 --- a/ompi/mpi/c/type_struct.c +++ b/ompi/mpi/c/type_struct.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -20,14 +22,17 @@ #include "ompi/mpi/c/bindings.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_struct = PMPI_Type_struct #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_struct PMPI_Type_struct #endif +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_struct PMPI_Type_create_struct +#endif int MPI_Type_struct(int count, int array_of_blocklengths[], diff --git a/ompi/mpi/c/type_ub.c b/ompi/mpi/c/type_ub.c index 51978c4665..d29c0aa63c 100644 --- a/ompi/mpi/c/type_ub.c +++ b/ompi/mpi/c/type_ub.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_ub = PMPI_Type_ub #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_ub PMPI_Type_ub #endif static const char FUNC_NAME[] = "MPI_Type_ub"; diff --git a/ompi/mpi/c/type_vector.c b/ompi/mpi/c/type_vector.c index d712996bfd..4e3d3e91dc 100644 --- a/ompi/mpi/c/type_vector.c +++ b/ompi/mpi/c/type_vector.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/datatype/ompi_datatype.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Type_vector = PMPI_Type_vector #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Type_vector PMPI_Type_vector #endif static const char FUNC_NAME[] = "MPI_Type_vector"; diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c index 5074907385..1cf4dacac5 100644 --- a/ompi/mpi/c/unpack.c +++ b/ompi/mpi/c/unpack.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,12 +29,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Unpack = PMPI_Unpack #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Unpack PMPI_Unpack #endif static const char FUNC_NAME[] = "MPI_Unpack"; diff --git a/ompi/mpi/c/unpack_external.c b/ompi/mpi/c/unpack_external.c index 1c358ea1a6..d416050749 100644 --- a/ompi/mpi/c/unpack_external.c +++ b/ompi/mpi/c/unpack_external.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Unpack_external = PMPI_Unpack_external #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Unpack_external PMPI_Unpack_external #endif static const char FUNC_NAME[] = "MPI_Unpack_external"; diff --git a/ompi/mpi/c/unpublish_name.c b/ompi/mpi/c/unpublish_name.c index 0989a0903e..f5df51a056 100644 --- a/ompi/mpi/c/unpublish_name.c +++ b/ompi/mpi/c/unpublish_name.c @@ -13,6 +13,8 @@ * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Unpublish_name = PMPI_Unpublish_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Unpublish_name PMPI_Unpublish_name #endif static const char FUNC_NAME[] = "MPI_Unpublish_name"; diff --git a/ompi/mpi/c/wait.c b/ompi/mpi/c/wait.c index 6d981738b9..d7fd9e048b 100644 --- a/ompi/mpi/c/wait.c +++ b/ompi/mpi/c/wait.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Wait = PMPI_Wait #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Wait PMPI_Wait #endif static const char FUNC_NAME[] = "MPI_Wait"; diff --git a/ompi/mpi/c/waitall.c b/ompi/mpi/c/waitall.c index cc59963e46..31216e7f5a 100644 --- a/ompi/mpi/c/waitall.c +++ b/ompi/mpi/c/waitall.c @@ -12,6 +12,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Waitall = PMPI_Waitall #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Waitall PMPI_Waitall #endif static const char FUNC_NAME[] = "MPI_Waitall"; diff --git a/ompi/mpi/c/waitany.c b/ompi/mpi/c/waitany.c index 292d2f09e8..a6462484fa 100644 --- a/ompi/mpi/c/waitany.c +++ b/ompi/mpi/c/waitany.c @@ -13,7 +13,7 @@ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -31,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Waitany = PMPI_Waitany #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Waitany PMPI_Waitany #endif static const char FUNC_NAME[] = "MPI_Waitany"; diff --git a/ompi/mpi/c/waitsome.c b/ompi/mpi/c/waitsome.c index 28acff7c1c..6490499dac 100644 --- a/ompi/mpi/c/waitsome.c +++ b/ompi/mpi/c/waitsome.c @@ -13,6 +13,8 @@ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/request/request.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Waitsome = PMPI_Waitsome #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Waitsome PMPI_Waitsome #endif static const char FUNC_NAME[] = "MPI_Waitsome"; diff --git a/ompi/mpi/c/win_allocate.c b/ompi/mpi/c/win_allocate.c index 8ff0ef086a..31f072f905 100644 --- a/ompi/mpi/c/win_allocate.c +++ b/ompi/mpi/c/win_allocate.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_allocate = PMPI_Win_allocate #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_allocate PMPI_Win_allocate #endif static const char FUNC_NAME[] = "MPI_Win_allocate"; diff --git a/ompi/mpi/c/win_allocate_shared.c b/ompi/mpi/c/win_allocate_shared.c index c42eb931d6..e61d1cacf6 100644 --- a/ompi/mpi/c/win_allocate_shared.c +++ b/ompi/mpi/c/win_allocate_shared.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,12 +33,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_allocate_shared = PMPI_Win_allocate_shared #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_allocate_shared PMPI_Win_allocate_shared #endif static const char FUNC_NAME[] = "MPI_Win_allocate_shared"; diff --git a/ompi/mpi/c/win_attach.c b/ompi/mpi/c/win_attach.c index 4dd04c99ba..36053689a7 100644 --- a/ompi/mpi/c/win_attach.c +++ b/ompi/mpi/c/win_attach.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_attach = PMPI_Win_attach #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_attach PMPI_Win_attach #endif static const char FUNC_NAME[] = "MPI_Win_attach"; diff --git a/ompi/mpi/c/win_c2f.c b/ompi/mpi/c/win_c2f.c index 885510ae23..320977595b 100644 --- a/ompi/mpi/c/win_c2f.c +++ b/ompi/mpi/c/win_c2f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,12 +28,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/mpi/fortran/base/fint_2_int.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_c2f = PMPI_Win_c2f #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_c2f PMPI_Win_c2f #endif static const char FUNC_NAME[] = "MPI_Win_c2f"; diff --git a/ompi/mpi/c/win_call_errhandler.c b/ompi/mpi/c/win_call_errhandler.c index 680a59b5b4..d9a3b49f35 100644 --- a/ompi/mpi/c/win_call_errhandler.c +++ b/ompi/mpi/c/win_call_errhandler.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_call_errhandler = PMPI_Win_call_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_call_errhandler PMPI_Win_call_errhandler #endif static const char FUNC_NAME[] = "MPI_Win_call_errhandler"; diff --git a/ompi/mpi/c/win_complete.c b/ompi/mpi/c/win_complete.c index 96561d91ca..d2426c8b30 100644 --- a/ompi/mpi/c/win_complete.c +++ b/ompi/mpi/c/win_complete.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_complete = PMPI_Win_complete #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_complete PMPI_Win_complete #endif static const char FUNC_NAME[] = "MPI_Win_complete"; diff --git a/ompi/mpi/c/win_create.c b/ompi/mpi/c/win_create.c index eabd4f7edd..dfd4b244ff 100644 --- a/ompi/mpi/c/win_create.c +++ b/ompi/mpi/c/win_create.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_create = PMPI_Win_create #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_create PMPI_Win_create #endif static const char FUNC_NAME[] = "MPI_Win_create"; diff --git a/ompi/mpi/c/win_create_dynamic.c b/ompi/mpi/c/win_create_dynamic.c index 896f5e0817..524d5659ad 100644 --- a/ompi/mpi/c/win_create_dynamic.c +++ b/ompi/mpi/c/win_create_dynamic.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,12 +31,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_create_dynamic = PMPI_Win_create_dynamic #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_create_dynamic PMPI_Win_create_dynamic #endif static const char FUNC_NAME[] = "MPI_Win_create_dynamic"; diff --git a/ompi/mpi/c/win_create_errhandler.c b/ompi/mpi/c/win_create_errhandler.c index 300fd0600e..f98359b5a6 100644 --- a/ompi/mpi/c/win_create_errhandler.c +++ b/ompi/mpi/c/win_create_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_create_errhandler = PMPI_Win_create_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_create_errhandler PMPI_Win_create_errhandler #endif static const char FUNC_NAME[] = "MPI_Win_create_errhandler"; diff --git a/ompi/mpi/c/win_create_keyval.c b/ompi/mpi/c/win_create_keyval.c index f28caa09f4..1df885a5da 100644 --- a/ompi/mpi/c/win_create_keyval.c +++ b/ompi/mpi/c/win_create_keyval.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_create_keyval = PMPI_Win_create_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_create_keyval PMPI_Win_create_keyval #endif static const char FUNC_NAME[] = "MPI_Win_create_keyval"; diff --git a/ompi/mpi/c/win_delete_attr.c b/ompi/mpi/c/win_delete_attr.c index acf9acb5d0..c54cdeb574 100644 --- a/ompi/mpi/c/win_delete_attr.c +++ b/ompi/mpi/c/win_delete_attr.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_delete_attr = PMPI_Win_delete_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_delete_attr PMPI_Win_delete_attr #endif static const char FUNC_NAME[] = "MPI_Win_delete_attr"; diff --git a/ompi/mpi/c/win_detach.c b/ompi/mpi/c/win_detach.c index ad7901ade3..abf0f809dd 100644 --- a/ompi/mpi/c/win_detach.c +++ b/ompi/mpi/c/win_detach.c @@ -30,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_detach = PMPI_Win_detach #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_detach PMPI_Win_detach #endif static const char FUNC_NAME[] = "MPI_Win_detach"; diff --git a/ompi/mpi/c/win_f2c.c b/ompi/mpi/c/win_f2c.c index 7c49324c6c..2d584023e9 100644 --- a/ompi/mpi/c/win_f2c.c +++ b/ompi/mpi/c/win_f2c.c @@ -11,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/mpi/fortran/base/fint_2_int.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_f2c = PMPI_Win_f2c #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_f2c PMPI_Win_f2c #endif static const char FUNC_NAME[] = "MPI_Win_f2c"; diff --git a/ompi/mpi/c/win_fence.c b/ompi/mpi/c/win_fence.c index da1073f6c7..75a364cecf 100644 --- a/ompi/mpi/c/win_fence.c +++ b/ompi/mpi/c/win_fence.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_fence = PMPI_Win_fence #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_fence PMPI_Win_fence #endif static const char FUNC_NAME[] = "MPI_Win_fence"; diff --git a/ompi/mpi/c/win_flush.c b/ompi/mpi/c/win_flush.c index 087f83c5c4..402c9e2435 100644 --- a/ompi/mpi/c/win_flush.c +++ b/ompi/mpi/c/win_flush.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_flush = PMPI_Win_flush #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_flush PMPI_Win_flush #endif static const char FUNC_NAME[] = "MPI_Win_flush"; diff --git a/ompi/mpi/c/win_flush_all.c b/ompi/mpi/c/win_flush_all.c index da0922243f..7c3306ca26 100644 --- a/ompi/mpi/c/win_flush_all.c +++ b/ompi/mpi/c/win_flush_all.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_flush_all = PMPI_Win_flush_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_flush_all PMPI_Win_flush_all #endif static const char FUNC_NAME[] = "MPI_Win_flush_all"; diff --git a/ompi/mpi/c/win_flush_local.c b/ompi/mpi/c/win_flush_local.c index b41c0fc60f..33c9d028d9 100644 --- a/ompi/mpi/c/win_flush_local.c +++ b/ompi/mpi/c/win_flush_local.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_flush_local = PMPI_Win_flush_local #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_flush_local PMPI_Win_flush_local #endif static const char FUNC_NAME[] = "MPI_Win_flush_local"; diff --git a/ompi/mpi/c/win_flush_local_all.c b/ompi/mpi/c/win_flush_local_all.c index adff0efc3d..6e08eff8b0 100644 --- a/ompi/mpi/c/win_flush_local_all.c +++ b/ompi/mpi/c/win_flush_local_all.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_flush_local_all = PMPI_Win_flush_local_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_flush_local_all PMPI_Win_flush_local_all #endif static const char FUNC_NAME[] = "MPI_Win_flush_local_all"; diff --git a/ompi/mpi/c/win_free.c b/ompi/mpi/c/win_free.c index 6c0b53ee66..fa13f263ce 100644 --- a/ompi/mpi/c/win_free.c +++ b/ompi/mpi/c/win_free.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_free = PMPI_Win_free #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_free PMPI_Win_free #endif static const char FUNC_NAME[] = "MPI_Win_free"; diff --git a/ompi/mpi/c/win_free_keyval.c b/ompi/mpi/c/win_free_keyval.c index 592541007d..214368bd16 100644 --- a/ompi/mpi/c/win_free_keyval.c +++ b/ompi/mpi/c/win_free_keyval.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_free_keyval = PMPI_Win_free_keyval #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_free_keyval PMPI_Win_free_keyval #endif static const char FUNC_NAME[] = "MPI_Win_free_keyval"; diff --git a/ompi/mpi/c/win_get_attr.c b/ompi/mpi/c/win_get_attr.c index 5a16b8b5d6..896bfd14f3 100644 --- a/ompi/mpi/c/win_get_attr.c +++ b/ompi/mpi/c/win_get_attr.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_get_attr = PMPI_Win_get_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_get_attr PMPI_Win_get_attr #endif static const char FUNC_NAME[] = "MPI_Win_get_attr"; diff --git a/ompi/mpi/c/win_get_errhandler.c b/ompi/mpi/c/win_get_errhandler.c index 3c584a653c..f5f66bf176 100644 --- a/ompi/mpi/c/win_get_errhandler.c +++ b/ompi/mpi/c/win_get_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_get_errhandler = PMPI_Win_get_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_get_errhandler PMPI_Win_get_errhandler #endif static const char FUNC_NAME[] = "MPI_Win_get_errhandler"; diff --git a/ompi/mpi/c/win_get_group.c b/ompi/mpi/c/win_get_group.c index e118c37ff3..b6ea4286e1 100644 --- a/ompi/mpi/c/win_get_group.c +++ b/ompi/mpi/c/win_get_group.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,12 +26,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_get_group = PMPI_Win_get_group #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_get_group PMPI_Win_get_group #endif static const char FUNC_NAME[] = "MPI_Win_get_group"; diff --git a/ompi/mpi/c/win_get_info.c b/ompi/mpi/c/win_get_info.c index b9cddc547b..ffb2d94981 100644 --- a/ompi/mpi/c/win_get_info.c +++ b/ompi/mpi/c/win_get_info.c @@ -3,6 +3,8 @@ * Copyright (c) 2013 Sandia National Laboratories. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,12 +19,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_get_info = PMPI_Win_get_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_get_info PMPI_Win_get_info #endif static const char FUNC_NAME[] = "MPI_Win_get_info"; diff --git a/ompi/mpi/c/win_get_name.c b/ompi/mpi/c/win_get_name.c index e948171fe9..f8ebb0788a 100644 --- a/ompi/mpi/c/win_get_name.c +++ b/ompi/mpi/c/win_get_name.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_get_name = PMPI_Win_get_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_get_name PMPI_Win_get_name #endif static const char FUNC_NAME[] = "MPI_Win_get_name"; diff --git a/ompi/mpi/c/win_lock.c b/ompi/mpi/c/win_lock.c index 90e65f113d..7b36a83c50 100644 --- a/ompi/mpi/c/win_lock.c +++ b/ompi/mpi/c/win_lock.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_lock = PMPI_Win_lock #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_lock PMPI_Win_lock #endif static const char FUNC_NAME[] = "MPI_Win_lock"; diff --git a/ompi/mpi/c/win_lock_all.c b/ompi/mpi/c/win_lock_all.c index 4df99b16e0..3631c3c782 100644 --- a/ompi/mpi/c/win_lock_all.c +++ b/ompi/mpi/c/win_lock_all.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_lock_all = PMPI_Win_lock_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_lock_all PMPI_Win_lock_all #endif static const char FUNC_NAME[] = "MPI_Win_lock_all"; diff --git a/ompi/mpi/c/win_post.c b/ompi/mpi/c/win_post.c index 27a3a695ad..51e81a21e7 100644 --- a/ompi/mpi/c/win_post.c +++ b/ompi/mpi/c/win_post.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_post = PMPI_Win_post #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_post PMPI_Win_post #endif static const char FUNC_NAME[] = "MPI_Win_post"; diff --git a/ompi/mpi/c/win_set_attr.c b/ompi/mpi/c/win_set_attr.c index 4717f57b24..17754cb81e 100644 --- a/ompi/mpi/c/win_set_attr.c +++ b/ompi/mpi/c/win_set_attr.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_set_attr = PMPI_Win_set_attr #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_set_attr PMPI_Win_set_attr #endif static const char FUNC_NAME[] = "MPI_Win_set_attr"; diff --git a/ompi/mpi/c/win_set_errhandler.c b/ompi/mpi/c/win_set_errhandler.c index ba189e016a..04db1399dc 100644 --- a/ompi/mpi/c/win_set_errhandler.c +++ b/ompi/mpi/c/win_set_errhandler.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_set_errhandler = PMPI_Win_set_errhandler #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_set_errhandler PMPI_Win_set_errhandler #endif static const char FUNC_NAME[] = "MPI_Win_set_errhandler"; diff --git a/ompi/mpi/c/win_set_info.c b/ompi/mpi/c/win_set_info.c index a82e19847e..348aa877f6 100644 --- a/ompi/mpi/c/win_set_info.c +++ b/ompi/mpi/c/win_set_info.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2013 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -14,12 +16,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_set_info = PMPI_Win_set_info #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_set_info PMPI_Win_set_info #endif static const char FUNC_NAME[] = "MPI_Win_set_info"; diff --git a/ompi/mpi/c/win_set_name.c b/ompi/mpi/c/win_set_name.c index 8bd36a1a71..32933e3667 100644 --- a/ompi/mpi/c/win_set_name.c +++ b/ompi/mpi/c/win_set_name.c @@ -13,6 +13,8 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_set_name = PMPI_Win_set_name #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_set_name PMPI_Win_set_name #endif static const char FUNC_NAME[] = "MPI_Win_set_name"; diff --git a/ompi/mpi/c/win_shared_query.c b/ompi/mpi/c/win_shared_query.c index 680700b2ac..b391c2c1a3 100644 --- a/ompi/mpi/c/win_shared_query.c +++ b/ompi/mpi/c/win_shared_query.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2012-2013 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,12 +19,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_shared_query = PMPI_Win_shared_query #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_shared_query PMPI_Win_shared_query #endif static const char FUNC_NAME[] = "MPI_Win_shared_query"; diff --git a/ompi/mpi/c/win_start.c b/ompi/mpi/c/win_start.c index 89808663cc..4fdff2be7f 100644 --- a/ompi/mpi/c/win_start.c +++ b/ompi/mpi/c/win_start.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_start = PMPI_Win_start #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_start PMPI_Win_start #endif static const char FUNC_NAME[] = "MPI_Win_start"; diff --git a/ompi/mpi/c/win_sync.c b/ompi/mpi/c/win_sync.c index 72cc1ee770..66b75be955 100644 --- a/ompi/mpi/c/win_sync.c +++ b/ompi/mpi/c/win_sync.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/memchecker.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_sync = PMPI_Win_sync #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_sync PMPI_Win_sync #endif static const char FUNC_NAME[] = "MPI_Win_sync"; diff --git a/ompi/mpi/c/win_test.c b/ompi/mpi/c/win_test.c index 83547d9a86..acd5b1e522 100644 --- a/ompi/mpi/c/win_test.c +++ b/ompi/mpi/c/win_test.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_test = PMPI_Win_test #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_test PMPI_Win_test #endif static const char FUNC_NAME[] = "MPI_Win_test"; diff --git a/ompi/mpi/c/win_unlock.c b/ompi/mpi/c/win_unlock.c index 42767c4a22..b1d841a63c 100644 --- a/ompi/mpi/c/win_unlock.c +++ b/ompi/mpi/c/win_unlock.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,12 +30,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_unlock = PMPI_Win_unlock #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_unlock PMPI_Win_unlock #endif static const char FUNC_NAME[] = "MPI_Win_unlock"; diff --git a/ompi/mpi/c/win_unlock_all.c b/ompi/mpi/c/win_unlock_all.c index 0c5e5af709..dbff94d376 100644 --- a/ompi/mpi/c/win_unlock_all.c +++ b/ompi/mpi/c/win_unlock_all.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_unlock_all = PMPI_Win_unlock_all #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_unlock_all PMPI_Win_unlock_all #endif static const char FUNC_NAME[] = "MPI_Win_unlock_all"; diff --git a/ompi/mpi/c/win_wait.c b/ompi/mpi/c/win_wait.c index c8cc2cba57..b068b63ebf 100644 --- a/ompi/mpi/c/win_wait.c +++ b/ompi/mpi/c/win_wait.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,12 +27,12 @@ #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Win_wait = PMPI_Win_wait #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Win_wait PMPI_Win_wait #endif static const char FUNC_NAME[] = "MPI_Win_wait"; diff --git a/ompi/mpi/c/wtick.c b/ompi/mpi/c/wtick.c index 01d7c93521..497270a183 100644 --- a/ompi/mpi/c/wtick.c +++ b/ompi/mpi/c/wtick.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,15 +29,14 @@ #include "ompi/mpi/c/bindings.h" #include "ompi/runtime/mpiruntime.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Wtick = PMPI_Wtick #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Wtick PMPI_Wtick #endif - double MPI_Wtick(void) { #if OPAL_TIMER_CYCLE_NATIVE diff --git a/ompi/mpi/c/wtime.c b/ompi/mpi/c/wtime.c index 524637e116..c0eea24e20 100644 --- a/ompi/mpi/c/wtime.c +++ b/ompi/mpi/c/wtime.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,15 +29,14 @@ #include "ompi/mpi/c/bindings.h" #include "ompi/runtime/mpiruntime.h" -#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES +#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING #pragma weak MPI_Wtime = PMPI_Wtime #endif -#if OMPI_PROFILING_DEFINES -#include "ompi/mpi/c/profile/defines.h" +#if OMPI_BUILD_MPI_PROFILING +#define MPI_Wtime PMPI_Wtime #endif - double MPI_Wtime(void) { double wtime; diff --git a/ompi/mpi/fortran/mpif-h/Makefile.am b/ompi/mpi/fortran/mpif-h/Makefile.am index 12693a19f9..66949d937a 100644 --- a/ompi/mpi/fortran/mpif-h/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/Makefile.am @@ -27,14 +27,6 @@ include $(top_srcdir)/Makefile.ompi-rules SUBDIRS = profile -# -# OMPI_PRPOFILING_DEFINES flag is enabled when we want our MPI_* symbols -# to be replaced by PMPI_*. In other words, this flag decides -# whether "profile/defines.h" is included or not. "profile/defines.h" -# replaces all MPI_* symbols with PMPI_* symbols. In this directory, -# we need it to be 0 -# - AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_FORTRAN_WRAPPERS=1 # The top directory only builds MPI_* bindings and some support diff --git a/ompi/mpi/fortran/mpif-h/abort_f.c b/ompi/mpi/fortran/mpif-h/abort_f.c index 1b0917b105..ef0d30928d 100644 --- a/ompi/mpi/fortran/mpif-h/abort_f.c +++ b/ompi/mpi/fortran/mpif-h/abort_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS(MPI_ABORT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_abort_f pompi_abort_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Abort PMPI_Abort #endif diff --git a/ompi/mpi/fortran/mpif-h/accumulate_f.c b/ompi/mpi/fortran/mpif-h/accumulate_f.c index 28311886b2..ee1eab8993 100644 --- a/ompi/mpi/fortran/mpif-h/accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/accumulate_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ACCUMULATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_accumulate_f pompi_accumulate_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Accumulate PMPI_Accumulate #endif void ompi_accumulate_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/add_error_class_f.c b/ompi/mpi/fortran/mpif-h/add_error_class_f.c index 703e08dc7b..3ff6968d58 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_class_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_class_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CLASS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_add_error_class_f pompi_add_error_class_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Add_error_class PMPI_Add_error_class #endif void ompi_add_error_class_f(MPI_Fint *errorclass, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/add_error_code_f.c b/ompi/mpi/fortran/mpif-h/add_error_code_f.c index a16229a1b2..9e7a5b96c0 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_code_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_code_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CODE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_add_error_code_f pompi_add_error_code_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Add_error_code PMPI_Add_error_code #endif void ompi_add_error_code_f(MPI_Fint *errorclass, MPI_Fint *errorcode, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/add_error_string_f.c b/ompi/mpi/fortran/mpif-h/add_error_string_f.c index 65b50e9fc0..158199eb32 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_string_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_string_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_STRING, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_add_error_string_f pompi_add_error_string_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Add_error_string PMPI_Add_error_string #endif void ompi_add_error_string_f(MPI_Fint *errorcode, char *string, diff --git a/ompi/mpi/fortran/mpif-h/address_f.c b/ompi/mpi/fortran/mpif-h/address_f.c index 2677bbbf67..7b750b2254 100644 --- a/ompi/mpi/fortran/mpif-h/address_f.c +++ b/ompi/mpi/fortran/mpif-h/address_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADDRESS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_address_f pompi_address_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Address PMPI_Address #endif void ompi_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/aint_add_f.c b/ompi/mpi/fortran/mpif-h/aint_add_f.c index 30a2692137..b9a2a62517 100644 --- a/ompi/mpi/fortran/mpif-h/aint_add_f.c +++ b/ompi/mpi/fortran/mpif-h/aint_add_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,7 @@ MPI_Aint mpi_aint_add__(MPI_Aint *base, MPI_Aint *diff) { return ompi_aint_add_f #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_aint_add_f pompi_aint_add_f #endif MPI_Aint ompi_aint_add_f(MPI_Aint *base, MPI_Aint *diff) diff --git a/ompi/mpi/fortran/mpif-h/aint_diff_f.c b/ompi/mpi/fortran/mpif-h/aint_diff_f.c index 12e21e1b7f..39257d59f0 100644 --- a/ompi/mpi/fortran/mpif-h/aint_diff_f.c +++ b/ompi/mpi/fortran/mpif-h/aint_diff_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,7 @@ MPI_Aint mpi_aint_diff__(MPI_Aint *addr1, MPI_Aint *addr2) { return ompi_aint_di #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_aint_diff_f pompi_aint_diff_f #endif MPI_Aint ompi_aint_diff_f(MPI_Aint *addr1, MPI_Aint *addr2) diff --git a/ompi/mpi/fortran/mpif-h/allgather_f.c b/ompi/mpi/fortran/mpif-h/allgather_f.c index de585b4655..d021b0909d 100644 --- a/ompi/mpi/fortran/mpif-h/allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/allgather_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_allgather_f pompi_allgather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Allgather PMPI_Allgather #endif void ompi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/allgatherv_f.c b/ompi/mpi/fortran/mpif-h/allgatherv_f.c index 37ff4f41b6..84966a36c3 100644 --- a/ompi/mpi/fortran/mpif-h/allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/allgatherv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_allgatherv_f pompi_allgatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Allgatherv PMPI_Allgatherv #endif void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/alloc_mem_f.c b/ompi/mpi/fortran/mpif-h/alloc_mem_f.c index c3fc140bc2..1e7a71e441 100644 --- a/ompi/mpi/fortran/mpif-h/alloc_mem_f.c +++ b/ompi/mpi/fortran/mpif-h/alloc_mem_f.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -91,7 +91,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLOC_MEM_CPTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_alloc_mem_f pompi_alloc_mem_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Alloc_mem PMPI_Alloc_mem #endif void ompi_alloc_mem_f(MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/allreduce_f.c b/ompi/mpi/fortran/mpif-h/allreduce_f.c index c119c0af36..b8b0f853a7 100644 --- a/ompi/mpi/fortran/mpif-h/allreduce_f.c +++ b/ompi/mpi/fortran/mpif-h/allreduce_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLREDUCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_allreduce_f pompi_allreduce_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Allreduce PMPI_Allreduce #endif void ompi_allreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/alltoall_f.c b/ompi/mpi/fortran/mpif-h/alltoall_f.c index 88393d8e2a..47f28e90ad 100644 --- a/ompi/mpi/fortran/mpif-h/alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoall_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_alltoall_f pompi_alltoall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Alltoall PMPI_Alltoall #endif void ompi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/alltoallv_f.c b/ompi/mpi/fortran/mpif-h/alltoallv_f.c index ebed7efde9..ffbc28e948 100644 --- a/ompi/mpi/fortran/mpif-h/alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoallv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_alltoallv_f pompi_alltoallv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Alltoallv PMPI_Alltoallv #endif void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, diff --git a/ompi/mpi/fortran/mpif-h/alltoallw_f.c b/ompi/mpi/fortran/mpif-h/alltoallw_f.c index 7900c96e38..6eba7aba6d 100644 --- a/ompi/mpi/fortran/mpif-h/alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoallw_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_alltoallw_f pompi_alltoallw_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Alltoallw PMPI_Alltoallw #endif void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/attr_delete_f.c b/ompi/mpi/fortran/mpif-h/attr_delete_f.c index ddf5ed16c1..4b372c1de1 100644 --- a/ompi/mpi/fortran/mpif-h/attr_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_delete_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_DELETE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_attr_delete_f pompi_attr_delete_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Attr_delete PMPI_Attr_delete #endif void ompi_attr_delete_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/attr_get_f.c b/ompi/mpi/fortran/mpif-h/attr_get_f.c index 934609bc3a..d9bf172099 100644 --- a/ompi/mpi/fortran/mpif-h/attr_get_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_attr_get_f pompi_attr_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Attr_get PMPI_Attr_get #endif void ompi_attr_get_f(MPI_Fint *comm, MPI_Fint *keyval, diff --git a/ompi/mpi/fortran/mpif-h/attr_put_f.c b/ompi/mpi/fortran/mpif-h/attr_put_f.c index e0efe50cbc..949cbf41c3 100644 --- a/ompi/mpi/fortran/mpif-h/attr_put_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_put_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_PUT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_attr_put_f pompi_attr_put_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Attr_put PMPI_Attr_put #endif void ompi_attr_put_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, diff --git a/ompi/mpi/fortran/mpif-h/barrier_f.c b/ompi/mpi/fortran/mpif-h/barrier_f.c index 581cdfedee..c884247df7 100644 --- a/ompi/mpi/fortran/mpif-h/barrier_f.c +++ b/ompi/mpi/fortran/mpif-h/barrier_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BARRIER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_barrier_f pompi_barrier_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Barrier PMPI_Barrier #endif void ompi_barrier_f(MPI_Fint *comm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/bcast_f.c b/ompi/mpi/fortran/mpif-h/bcast_f.c index cbf0598124..016044ac5f 100644 --- a/ompi/mpi/fortran/mpif-h/bcast_f.c +++ b/ompi/mpi/fortran/mpif-h/bcast_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BCAST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_bcast_f pompi_bcast_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Bcast PMPI_Bcast #endif void ompi_bcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/bsend_f.c b/ompi/mpi/fortran/mpif-h/bsend_f.c index 5493bdd4fd..b61e6d82e4 100644 --- a/ompi/mpi/fortran/mpif-h/bsend_f.c +++ b/ompi/mpi/fortran/mpif-h/bsend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_bsend_f pompi_bsend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Bsend PMPI_Bsend #endif void ompi_bsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/bsend_init_f.c b/ompi/mpi/fortran/mpif-h/bsend_init_f.c index 0af7f66f60..62e9d2f28f 100644 --- a/ompi/mpi/fortran/mpif-h/bsend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/bsend_init_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_bsend_init_f pompi_bsend_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Bsend_init PMPI_Bsend_init #endif void ompi_bsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/buffer_attach_f.c b/ompi/mpi/fortran/mpif-h/buffer_attach_f.c index 7ea30ff90e..d862f3c892 100644 --- a/ompi/mpi/fortran/mpif-h/buffer_attach_f.c +++ b/ompi/mpi/fortran/mpif-h/buffer_attach_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_ATTACH, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_buffer_attach_f pompi_buffer_attach_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Buffer_attach PMPI_Buffer_attach #endif void ompi_buffer_attach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/buffer_detach_f.c b/ompi/mpi/fortran/mpif-h/buffer_detach_f.c index cfcbf320e2..d69c5e1237 100644 --- a/ompi/mpi/fortran/mpif-h/buffer_detach_f.c +++ b/ompi/mpi/fortran/mpif-h/buffer_detach_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -60,7 +62,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_DETACH, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_buffer_detach_f pompi_buffer_detach_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Buffer_detach PMPI_Buffer_detach #endif /* (this comment is repeated in ompi/mpi/fortran/use-mpi-f08/buffer_detach.c) diff --git a/ompi/mpi/fortran/mpif-h/cancel_f.c b/ompi/mpi/fortran/mpif-h/cancel_f.c index ac267c761e..c33284e71c 100644 --- a/ompi/mpi/fortran/mpif-h/cancel_f.c +++ b/ompi/mpi/fortran/mpif-h/cancel_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -60,7 +62,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CANCEL, #endif #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cancel_f pompi_cancel_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cancel PMPI_Cancel #endif void ompi_cancel_f(MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/cart_coords_f.c b/ompi/mpi/fortran/mpif-h/cart_coords_f.c index 0706c0d434..102c2889d2 100644 --- a/ompi/mpi/fortran/mpif-h/cart_coords_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_coords_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_COORDS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_coords_f pompi_cart_coords_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_coords PMPI_Cart_coords #endif void ompi_cart_coords_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims, diff --git a/ompi/mpi/fortran/mpif-h/cart_create_f.c b/ompi/mpi/fortran/mpif-h/cart_create_f.c index ab358e1a44..b08818b26f 100644 --- a/ompi/mpi/fortran/mpif-h/cart_create_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_create_f pompi_cart_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_create PMPI_Cart_create #endif void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, diff --git a/ompi/mpi/fortran/mpif-h/cart_get_f.c b/ompi/mpi/fortran/mpif-h/cart_get_f.c index e779783b64..6a2e1dd762 100644 --- a/ompi/mpi/fortran/mpif-h/cart_get_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_get_f pompi_cart_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_get PMPI_Cart_get #endif void ompi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, diff --git a/ompi/mpi/fortran/mpif-h/cart_map_f.c b/ompi/mpi/fortran/mpif-h/cart_map_f.c index 7597a782a6..2b1b05bfb9 100644 --- a/ompi/mpi/fortran/mpif-h/cart_map_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_map_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_MAP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_map_f pompi_cart_map_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_map PMPI_Cart_map #endif void ompi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, diff --git a/ompi/mpi/fortran/mpif-h/cart_rank_f.c b/ompi/mpi/fortran/mpif-h/cart_rank_f.c index f257a08ed1..c8bc882644 100644 --- a/ompi/mpi/fortran/mpif-h/cart_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_rank_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_RANK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_rank_f pompi_cart_rank_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_rank PMPI_Cart_rank #endif void ompi_cart_rank_f(MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank, diff --git a/ompi/mpi/fortran/mpif-h/cart_shift_f.c b/ompi/mpi/fortran/mpif-h/cart_shift_f.c index e26fcb362d..c0d8da4ec1 100644 --- a/ompi/mpi/fortran/mpif-h/cart_shift_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_shift_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SHIFT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_shift_f pompi_cart_shift_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_shift PMPI_Cart_shift #endif void ompi_cart_shift_f(MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp, diff --git a/ompi/mpi/fortran/mpif-h/cart_sub_f.c b/ompi/mpi/fortran/mpif-h/cart_sub_f.c index 1cd3e7b175..c3881954e1 100644 --- a/ompi/mpi/fortran/mpif-h/cart_sub_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_sub_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SUB, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cart_sub_f pompi_cart_sub_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cart_sub PMPI_Cart_sub #endif void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, diff --git a/ompi/mpi/fortran/mpif-h/cartdim_get_f.c b/ompi/mpi/fortran/mpif-h/cartdim_get_f.c index d31ba8e299..2cd09944a6 100644 --- a/ompi/mpi/fortran/mpif-h/cartdim_get_f.c +++ b/ompi/mpi/fortran/mpif-h/cartdim_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CARTDIM_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_cartdim_get_f pompi_cartdim_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Cartdim_get PMPI_Cartdim_get #endif void ompi_cartdim_get_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/close_port_f.c b/ompi/mpi/fortran/mpif-h/close_port_f.c index 24dad4d1cb..7223717b96 100644 --- a/ompi/mpi/fortran/mpif-h/close_port_f.c +++ b/ompi/mpi/fortran/mpif-h/close_port_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CLOSE_PORT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_close_port_f pompi_close_port_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Close_port PMPI_Close_port #endif void ompi_close_port_f(char *port_name, MPI_Fint *ierr, int port_name_len) diff --git a/ompi/mpi/fortran/mpif-h/comm_accept_f.c b/ompi/mpi/fortran/mpif-h/comm_accept_f.c index 028a3c0b54..44165031f8 100644 --- a/ompi/mpi/fortran/mpif-h/comm_accept_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_accept_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_ACCEPT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_accept_f pompi_comm_accept_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_accept PMPI_Comm_accept #endif void ompi_comm_accept_f(char *port_name, MPI_Fint *info, MPI_Fint *root, diff --git a/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c index efbd198626..09ddad1105 100644 --- a/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CALL_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_call_errhandler_f pompi_comm_call_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler #endif void ompi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, diff --git a/ompi/mpi/fortran/mpif-h/comm_compare_f.c b/ompi/mpi/fortran/mpif-h/comm_compare_f.c index d471d1af20..52fe53664b 100644 --- a/ompi/mpi/fortran/mpif-h/comm_compare_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_compare_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_COMPARE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_compare_f pompi_comm_compare_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_compare PMPI_Comm_compare #endif void ompi_comm_compare_f(MPI_Fint *comm1, MPI_Fint *comm2, MPI_Fint *result, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_connect_f.c b/ompi/mpi/fortran/mpif-h/comm_connect_f.c index c880c6e413..897a6aff96 100644 --- a/ompi/mpi/fortran/mpif-h/comm_connect_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_connect_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CONNECT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_connect_f pompi_comm_connect_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_connect PMPI_Comm_connect #endif void ompi_comm_connect_f(char *port_name, MPI_Fint *info, diff --git a/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c index 6e585779a8..8a39e942d7 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_create_errhandler_f pompi_comm_create_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler #endif static const char FUNC_NAME[] = "MPI_COMM_CREATE_ERRHANDLER"; diff --git a/ompi/mpi/fortran/mpif-h/comm_create_f.c b/ompi/mpi/fortran/mpif-h/comm_create_f.c index 44af3ea9c6..13092e0ba4 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_create_f pompi_comm_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_create PMPI_Comm_create #endif void ompi_comm_create_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *newcomm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c index e7fb5263de..db7d8f0bed 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_GROUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_create_group_f pompi_comm_create_group_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_create_group PMPI_Comm_create_group #endif void ompi_comm_create_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *tag, MPI_Fint *newcomm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c index 4a681593a9..5ef5ff77ac 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_create_keyval_f pompi_comm_create_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_create_keyval PMPI_Comm_create_keyval #endif static const char FUNC_NAME[] = "MPI_Comm_create_keyval_f"; diff --git a/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c index 12b7d291b6..d89f992f17 100644 --- a/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DELETE_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_delete_attr_f pompi_comm_delete_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_delete_attr PMPI_Comm_delete_attr #endif void ompi_comm_delete_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, diff --git a/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c b/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c index b5b36b7dcb..a77f48ea17 100644 --- a/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DISCONNECT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_disconnect_f pompi_comm_disconnect_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_disconnect PMPI_Comm_disconnect #endif void ompi_comm_disconnect_f(MPI_Fint *comm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_f.c index a6149e2661..2e64df1ee6 100644 --- a/ompi/mpi/fortran/mpif-h/comm_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_dup_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_dup_f pompi_comm_dup_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_dup PMPI_Comm_dup #endif void ompi_comm_dup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c index f17599eb80..fa4c30d9e7 100644 --- a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DUP_WITH_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_dup_with_info_f pompi_comm_dup_with_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info #endif void ompi_comm_dup_with_info_f(MPI_Fint *comm, MPI_Fint *info, MPI_Fint *newcomm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_free_f.c b/ompi/mpi/fortran/mpif-h/comm_free_f.c index 69d72ac323..5a692a4111 100644 --- a/ompi/mpi/fortran/mpif-h/comm_free_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_free_f pompi_comm_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_free PMPI_Comm_free #endif void ompi_comm_free_f(MPI_Fint *comm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c index c7a64c5a2a..9e15eb053a 100644 --- a/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_free_keyval_f pompi_comm_free_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_free_keyval PMPI_Comm_free_keyval #endif void ompi_comm_free_keyval_f(MPI_Fint *comm_keyval, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c index d74495c710..be7962e421 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_get_attr_f pompi_comm_get_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_attr PMPI_Comm_get_attr #endif void ompi_comm_get_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, diff --git a/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c index e60bbefd67..0cbcb56a31 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_get_errhandler_f pompi_comm_get_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler #endif void ompi_comm_get_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, diff --git a/ompi/mpi/fortran/mpif-h/comm_get_info_f.c b/ompi/mpi/fortran/mpif-h/comm_get_info_f.c index 95d34db40b..adc9041474 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_info_f.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,7 +55,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_get_info_f pompi_comm_get_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_info PMPI_Comm_get_info #endif void ompi_comm_get_info_f(MPI_Fint *comm, MPI_Fint *info_used, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_get_name_f.c b/ompi/mpi/fortran/mpif-h/comm_get_name_f.c index e179e155f2..5594adb9f1 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_get_name_f pompi_comm_get_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_name PMPI_Comm_get_name #endif void ompi_comm_get_name_f(MPI_Fint *comm, char *comm_name, diff --git a/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c b/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c index 03de43cdca..5450b29f2a 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_PARENT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_get_parent_f pompi_comm_get_parent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_get_parent PMPI_Comm_get_parent #endif void ompi_comm_get_parent_f(MPI_Fint *parent, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_group_f.c b/ompi/mpi/fortran/mpif-h/comm_group_f.c index 777552e80b..dccff265f8 100644 --- a/ompi/mpi/fortran/mpif-h/comm_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_group_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GROUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_group_f pompi_comm_group_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_group PMPI_Comm_group #endif void ompi_comm_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_idup_f.c b/ompi/mpi/fortran/mpif-h/comm_idup_f.c index 692a1d4247..5992086c6b 100644 --- a/ompi/mpi/fortran/mpif-h/comm_idup_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_idup_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_IDUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_idup_f pompi_comm_idup_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_idup PMPI_Comm_idup #endif void ompi_comm_idup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_join_f.c b/ompi/mpi/fortran/mpif-h/comm_join_f.c index 6e43696ab0..fbeaa4ae31 100644 --- a/ompi/mpi/fortran/mpif-h/comm_join_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_join_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_JOIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_join_f pompi_comm_join_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_join PMPI_Comm_join #endif void ompi_comm_join_f(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_rank_f.c b/ompi/mpi/fortran/mpif-h/comm_rank_f.c index 227be10a48..1a0b4088db 100644 --- a/ompi/mpi/fortran/mpif-h/comm_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_rank_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_RANK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_rank_f pompi_comm_rank_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_rank PMPI_Comm_rank #endif void ompi_comm_rank_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c b/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c index a420de4558..f5c0d6a307 100644 --- a/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_GROUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_remote_group_f pompi_comm_remote_group_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_remote_group PMPI_Comm_remote_group #endif void ompi_comm_remote_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c b/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c index 9b2e8a82a8..98950dd6ca 100644 --- a/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_remote_size_f pompi_comm_remote_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_remote_size PMPI_Comm_remote_size #endif void ompi_comm_remote_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c index b2e9f142eb..f0b0fb7e9c 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_set_attr_f pompi_comm_set_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_set_attr PMPI_Comm_set_attr #endif void ompi_comm_set_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, diff --git a/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c index d174336760..5143d2fd18 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_set_errhandler_f pompi_comm_set_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler #endif void ompi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, diff --git a/ompi/mpi/fortran/mpif-h/comm_set_info_f.c b/ompi/mpi/fortran/mpif-h/comm_set_info_f.c index f8c1ac5403..f42482b999 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_info_f.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,7 +55,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_set_info_f pompi_comm_set_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_set_info PMPI_Comm_set_info #endif void ompi_comm_set_info_f(MPI_Fint *comm, MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/comm_set_name_f.c b/ompi/mpi/fortran/mpif-h/comm_set_name_f.c index ebec57e8d7..d03aa72eda 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_set_name_f pompi_comm_set_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_set_name PMPI_Comm_set_name #endif void ompi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, diff --git a/ompi/mpi/fortran/mpif-h/comm_size_f.c b/ompi/mpi/fortran/mpif-h/comm_size_f.c index 7f0edb9c27..55c25d0b7a 100644 --- a/ompi/mpi/fortran/mpif-h/comm_size_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_size_f pompi_comm_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_size PMPI_Comm_size #endif #include diff --git a/ompi/mpi/fortran/mpif-h/comm_spawn_f.c b/ompi/mpi/fortran/mpif-h/comm_spawn_f.c index e050b715c6..7264bafe5b 100644 --- a/ompi/mpi/fortran/mpif-h/comm_spawn_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_spawn_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_spawn_f pompi_comm_spawn_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_spawn PMPI_Comm_spawn #endif void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, diff --git a/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c b/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c index 8af48ed1aa..119740305f 100644 --- a/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN_MULTIPLE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_spawn_multiple_f pompi_comm_spawn_multiple_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple #endif void ompi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands, diff --git a/ompi/mpi/fortran/mpif-h/comm_split_f.c b/ompi/mpi/fortran/mpif-h/comm_split_f.c index 32ad06d7ca..2006daff26 100644 --- a/ompi/mpi/fortran/mpif-h/comm_split_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_split_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPLIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_split_f pompi_comm_split_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_split PMPI_Comm_split #endif void ompi_comm_split_f(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, diff --git a/ompi/mpi/fortran/mpif-h/comm_split_type_f.c b/ompi/mpi/fortran/mpif-h/comm_split_type_f.c index 9238123abf..8c16b588a5 100644 --- a/ompi/mpi/fortran/mpif-h/comm_split_type_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_split_type_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2012 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPLIT_TYPE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_split_type_f pompi_comm_split_type_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_split_type PMPI_Comm_split_type #endif void ompi_comm_split_type_f(MPI_Fint *comm, MPI_Fint *split_type, MPI_Fint *key, diff --git a/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c b/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c index fca226b6f8..d5dc8e1ac3 100644 --- a/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_TEST_INTER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_comm_test_inter_f pompi_comm_test_inter_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Comm_test_inter PMPI_Comm_test_inter #endif void ompi_comm_test_inter_f(MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c b/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c index db899d8fc7..ec694e8273 100644 --- a/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c +++ b/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMPARE_AND_SWAP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_compare_and_swap_f pompi_compare_and_swap_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Compare_and_swap PMPI_Compare_and_swap #endif void ompi_compare_and_swap_f(char *origin_addr, char *compare_addr, char *result_addr, diff --git a/ompi/mpi/fortran/mpif-h/dims_create_f.c b/ompi/mpi/fortran/mpif-h/dims_create_f.c index b25d39c67e..7a2d27091a 100644 --- a/ompi/mpi/fortran/mpif-h/dims_create_f.c +++ b/ompi/mpi/fortran/mpif-h/dims_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIMS_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_dims_create_f pompi_dims_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Dims_create PMPI_Dims_create #endif void ompi_dims_create_f(MPI_Fint *nnodes, MPI_Fint *ndims, diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c index 0fc1975bd7..23e48d2df4 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c @@ -8,6 +8,8 @@ * Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -59,7 +61,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_CREATE_ADJACENT, #endif #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_dist_graph_create_adjacent_f pompi_dist_graph_create_adjacent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent #endif diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c index 2f9b1e282f..a346b9e143 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c @@ -7,6 +7,8 @@ * Copyright (c) 2011-2013 Université Bordeaux 1 * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -58,7 +60,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_CREATE, #endif #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_dist_graph_create_f pompi_dist_graph_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Dist_graph_create PMPI_Dist_graph_create #endif void ompi_dist_graph_create_f(MPI_Fint *comm_old, MPI_Fint *n, MPI_Fint *sources, diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c index a60f6681fa..479a36a274 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c @@ -4,6 +4,8 @@ * reserved. * Copyright (c) 2011-2013 Inria. All rights reserved. * Copyright (c) 2011-2013 Université Bordeaux 1 + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -56,7 +58,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_NEIGHBORS_COUNT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_dist_graph_neighbors_count_f pompi_dist_graph_neighbors_count_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count #endif void ompi_dist_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *inneighbors, diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c index 95b0069b17..e5bedf0655 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c @@ -4,6 +4,8 @@ * reserved. * Copyright (c) 2011-2013 Inria. All rights reserved. * Copyright (c) 2011-2013 Université Bordeaux 1 + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -55,7 +57,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_NEIGHBORS, #endif #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_dist_graph_neighbors_f pompi_dist_graph_neighbors_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors #endif void ompi_dist_graph_neighbors_f(MPI_Fint* comm, MPI_Fint* maxindegree, diff --git a/ompi/mpi/fortran/mpif-h/errhandler_create_f.c b/ompi/mpi/fortran/mpif-h/errhandler_create_f.c index d6c68e8bec..9c2fc4fd0d 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_create_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_errhandler_create_f pompi_errhandler_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Errhandler_create PMPI_Errhandler_create #endif void ompi_errhandler_create_f(ompi_errhandler_fortran_handler_fn_t* function, diff --git a/ompi/mpi/fortran/mpif-h/errhandler_free_f.c b/ompi/mpi/fortran/mpif-h/errhandler_free_f.c index e8e84a1432..c807e0a377 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_free_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_errhandler_free_f pompi_errhandler_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Errhandler_free PMPI_Errhandler_free #endif void ompi_errhandler_free_f(MPI_Fint *errhandler, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/errhandler_get_f.c b/ompi/mpi/fortran/mpif-h/errhandler_get_f.c index cb6eb8ca8b..b0e3f378ef 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_get_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_errhandler_get_f pompi_errhandler_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Errhandler_get PMPI_Errhandler_get #endif void ompi_errhandler_get_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/errhandler_set_f.c b/ompi/mpi/fortran/mpif-h/errhandler_set_f.c index 1055a17c32..a6ce95e8d8 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_set_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_set_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_SET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_errhandler_set_f pompi_errhandler_set_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Errhandler_set PMPI_Errhandler_set #endif void ompi_errhandler_set_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/error_class_f.c b/ompi/mpi/fortran/mpif-h/error_class_f.c index d7353c3387..886717e1a1 100644 --- a/ompi/mpi/fortran/mpif-h/error_class_f.c +++ b/ompi/mpi/fortran/mpif-h/error_class_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_CLASS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_error_class_f pompi_error_class_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Error_class PMPI_Error_class #endif void ompi_error_class_f(MPI_Fint *errorcode, MPI_Fint *errorclass, diff --git a/ompi/mpi/fortran/mpif-h/error_string_f.c b/ompi/mpi/fortran/mpif-h/error_string_f.c index 9bf6e76dc6..d2e4d1d4b3 100644 --- a/ompi/mpi/fortran/mpif-h/error_string_f.c +++ b/ompi/mpi/fortran/mpif-h/error_string_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_STRING, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_error_string_f pompi_error_string_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Error_string PMPI_Error_string #endif static const char FUNC_NAME[] = "MPI_ERROR_STRING"; diff --git a/ompi/mpi/fortran/mpif-h/exscan_f.c b/ompi/mpi/fortran/mpif-h/exscan_f.c index 51a1bb593c..39c6b9ff24 100644 --- a/ompi/mpi/fortran/mpif-h/exscan_f.c +++ b/ompi/mpi/fortran/mpif-h/exscan_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_EXSCAN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_exscan_f pompi_exscan_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Exscan PMPI_Exscan #endif void ompi_exscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c b/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c index 571100e1ed..57ae0b3bb4 100644 --- a/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c +++ b/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 University of Oregon. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_F_SYNC_REG, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_f_sync_reg_f pompi_f_sync_reg_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_F_sync_reg PMPI_F_sync_reg #endif void ompi_f_sync_reg_f(char *buf) diff --git a/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c b/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c index e1f0657dde..b597b92f70 100644 --- a/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c +++ b/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FETCH_AND_OP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_fetch_and_op_f pompi_fetch_and_op_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Fetch_and_op PMPI_Fetch_and_op #endif void ompi_fetch_and_op_f(char *origin_addr, char *result_addr, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c index 545c3fcc11..bcb1a89337 100644 --- a/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CALL_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_call_errhandler_f pompi_file_call_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_call_errhandler PMPI_File_call_errhandler #endif void ompi_file_call_errhandler_f(MPI_Fint *fh, MPI_Fint *errorcode, diff --git a/ompi/mpi/fortran/mpif-h/file_close_f.c b/ompi/mpi/fortran/mpif-h/file_close_f.c index 18a7f4bc64..add4a59351 100644 --- a/ompi/mpi/fortran/mpif-h/file_close_f.c +++ b/ompi/mpi/fortran/mpif-h/file_close_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CLOSE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_close_f pompi_file_close_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_close PMPI_File_close #endif void ompi_file_close_f(MPI_Fint *fh, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c index d2089559d9..d6098717f3 100644 --- a/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CREATE_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_create_errhandler_f pompi_file_create_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_create_errhandler PMPI_File_create_errhandler #endif static const char FUNC_NAME[] = "MPI_FILE_CREATE_ERRHANDLER"; diff --git a/ompi/mpi/fortran/mpif-h/file_delete_f.c b/ompi/mpi/fortran/mpif-h/file_delete_f.c index f978e5228c..ce79698c0c 100644 --- a/ompi/mpi/fortran/mpif-h/file_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/file_delete_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_DELETE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_delete_f pompi_file_delete_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_delete PMPI_File_delete #endif void ompi_file_delete_f(char *filename, MPI_Fint *info, MPI_Fint *ierr, int filename_len) diff --git a/ompi/mpi/fortran/mpif-h/file_get_amode_f.c b/ompi/mpi/fortran/mpif-h/file_get_amode_f.c index 63f4fef051..1b313ed9fe 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_amode_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_amode_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_AMODE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_amode_f pompi_file_get_amode_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_amode PMPI_File_get_amode #endif void ompi_file_get_amode_f(MPI_Fint *fh, MPI_Fint *amode, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c b/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c index 378ab89fae..a70530a720 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ATOMICITY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_atomicity_f pompi_file_get_atomicity_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_atomicity PMPI_File_get_atomicity #endif void ompi_file_get_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c b/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c index e5d31e89ef..88bd48d0b1 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_BYTE_OFFSET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_byte_offset_f pompi_file_get_byte_offset_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_byte_offset PMPI_File_get_byte_offset #endif void ompi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c index 2b31d3308e..12149cb489 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_errhandler_f pompi_file_get_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_errhandler PMPI_File_get_errhandler #endif void ompi_file_get_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_group_f.c b/ompi/mpi/fortran/mpif-h/file_get_group_f.c index 4dc630d14e..ccf48d2513 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_group_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_group_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_GROUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_group_f pompi_file_get_group_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_group PMPI_File_get_group #endif void ompi_file_get_group_f(MPI_Fint *fh, MPI_Fint *group, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_info_f.c b/ompi/mpi/fortran/mpif-h/file_get_info_f.c index e5d07af4c4..579c295947 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_info_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_info_f pompi_file_get_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_info PMPI_File_get_info #endif void ompi_file_get_info_f(MPI_Fint *fh, MPI_Fint *info_used, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_position_f.c b/ompi/mpi/fortran/mpif-h/file_get_position_f.c index b4b41074b5..4d74c720b8 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_position_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_position_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_position_f pompi_file_get_position_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_position PMPI_File_get_position #endif void ompi_file_get_position_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c b/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c index 864446db62..a29858ca1f 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_position_shared_f pompi_file_get_position_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_position_shared PMPI_File_get_position_shared #endif void ompi_file_get_position_shared_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_get_size_f.c b/ompi/mpi/fortran/mpif-h/file_get_size_f.c index 1d1a974f30..11f7058898 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_size_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_size_f pompi_file_get_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_size PMPI_File_get_size #endif void ompi_file_get_size_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c b/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c index 5b6c765cdd..cd718a855d 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_TYPE_EXTENT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_type_extent_f pompi_file_get_type_extent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_type_extent PMPI_File_get_type_extent #endif void ompi_file_get_type_extent_f(MPI_Fint *fh, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/file_get_view_f.c b/ompi/mpi/fortran/mpif-h/file_get_view_f.c index 535d9e2619..6d87a36a30 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_view_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_view_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_VIEW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_get_view_f pompi_file_get_view_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_get_view PMPI_File_get_view #endif void ompi_file_get_view_f(MPI_Fint *fh, MPI_Offset *disp, diff --git a/ompi/mpi/fortran/mpif-h/file_iread_all_f.c b/ompi/mpi/fortran/mpif-h/file_iread_all_f.c index 9ed3701362..f6ceea30ec 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iread_all_f pompi_file_iread_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iread_all PMPI_File_iread_all #endif void ompi_file_iread_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c index 17a8636385..2289cdee27 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_IREAD_AT_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iread_at_all_f pompi_file_iread_at_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iread_at_all PMPI_File_iread_at_all #endif void ompi_file_iread_at_all_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_iread_at_f.c b/ompi/mpi/fortran/mpif-h/file_iread_at_f.c index b2c4960817..65adbd950b 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_at_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_IREAD_AT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iread_at_f pompi_file_iread_at_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iread_at PMPI_File_iread_at #endif void ompi_file_iread_at_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_iread_f.c b/ompi/mpi/fortran/mpif-h/file_iread_f.c index 6915deb65e..c2a284c560 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iread_f pompi_file_iread_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iread PMPI_File_iread #endif void ompi_file_iread_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c b/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c index 0d344b3f09..8bf5ba15a7 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iread_shared_f pompi_file_iread_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iread_shared PMPI_File_iread_shared #endif void ompi_file_iread_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c index cd515de163..b2a62a9257 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iwrite_all_f pompi_file_iwrite_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iwrite_all PMPI_File_iwrite_all #endif void ompi_file_iwrite_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c index d4a252f553..c114c835ae 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_AT_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iwrite_at_all_f pompi_file_iwrite_at_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all #endif void ompi_file_iwrite_at_all_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c index 41d676869c..a2f96dfce8 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_AT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iwrite_at_f pompi_file_iwrite_at_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iwrite_at PMPI_File_iwrite_at #endif void ompi_file_iwrite_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_f.c index 51e0665757..a0b4cf4bdc 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iwrite_f pompi_file_iwrite_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iwrite PMPI_File_iwrite #endif void ompi_file_iwrite_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c index b2649cc6fd..b2251eb015 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_iwrite_shared_f pompi_file_iwrite_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_iwrite_shared PMPI_File_iwrite_shared #endif void ompi_file_iwrite_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_open_f.c b/ompi/mpi/fortran/mpif-h/file_open_f.c index 9af9fdf5e6..258296056c 100644 --- a/ompi/mpi/fortran/mpif-h/file_open_f.c +++ b/ompi/mpi/fortran/mpif-h/file_open_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_OPEN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_open_f pompi_file_open_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_open PMPI_File_open #endif void ompi_file_open_f(MPI_Fint *comm, char *filename, MPI_Fint *amode, diff --git a/ompi/mpi/fortran/mpif-h/file_preallocate_f.c b/ompi/mpi/fortran/mpif-h/file_preallocate_f.c index 55928b999d..5a0d41a259 100644 --- a/ompi/mpi/fortran/mpif-h/file_preallocate_f.c +++ b/ompi/mpi/fortran/mpif-h/file_preallocate_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_PREALLOCATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_preallocate_f pompi_file_preallocate_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_preallocate PMPI_File_preallocate #endif void ompi_file_preallocate_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c index 546807a817..cef681a285 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_all_begin_f pompi_file_read_all_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_all_begin PMPI_File_read_all_begin #endif void ompi_file_read_all_begin_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c index 2aa1a5afb3..9b25448eb5 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_all_end_f pompi_file_read_all_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_all_end PMPI_File_read_all_end #endif void ompi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_f.c index 1137dc7f5d..2270618bf1 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_all_f pompi_file_read_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_all PMPI_File_read_all #endif void ompi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c index ef702959af..034cc41254 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_at_all_begin_f pompi_file_read_at_all_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_at_all_begin PMPI_File_read_at_all_begin #endif void ompi_file_read_at_all_begin_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c index f021fc2555..93b88bf0e5 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_at_all_end_f pompi_file_read_at_all_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_at_all_end PMPI_File_read_at_all_end #endif void ompi_file_read_at_all_end_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c index 8697f3a01c..17f3cfa7ad 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_at_all_f pompi_file_read_at_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_at_all PMPI_File_read_at_all #endif void ompi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_f.c index 8e13688596..c5c68b4016 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_at_f pompi_file_read_at_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_at PMPI_File_read_at #endif void ompi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_read_f.c b/ompi/mpi/fortran/mpif-h/file_read_f.c index 4307586f9e..e3d2b5543e 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_f pompi_file_read_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read PMPI_File_read #endif void ompi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c index a3877bb971..a4a1fd7d1d 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_ordered_begin_f pompi_file_read_ordered_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_ordered_begin PMPI_File_read_ordered_begin #endif void ompi_file_read_ordered_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c index 1946c43db8..65d4ffb3cc 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_ordered_end_f pompi_file_read_ordered_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_ordered_end PMPI_File_read_ordered_end #endif void ompi_file_read_ordered_end_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c index aca923fb9a..c71e1af961 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_ordered_f pompi_file_read_ordered_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_ordered PMPI_File_read_ordered #endif void ompi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_read_shared_f.c b/ompi/mpi/fortran/mpif-h/file_read_shared_f.c index e9ed2f7595..ba585b2a26 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_shared_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_read_shared_f pompi_file_read_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_read_shared PMPI_File_read_shared #endif void ompi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_seek_f.c b/ompi/mpi/fortran/mpif-h/file_seek_f.c index 19c67fc29c..5345fab75d 100644 --- a/ompi/mpi/fortran/mpif-h/file_seek_f.c +++ b/ompi/mpi/fortran/mpif-h/file_seek_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_seek_f pompi_file_seek_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_seek PMPI_File_seek #endif void ompi_file_seek_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c b/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c index ddf18fc13a..8deee2594a 100644 --- a/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_seek_shared_f pompi_file_seek_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_seek_shared PMPI_File_seek_shared #endif void ompi_file_seek_shared_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c b/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c index 2c0ed7d217..dfbcd67c96 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ATOMICITY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_set_atomicity_f pompi_file_set_atomicity_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_set_atomicity PMPI_File_set_atomicity #endif void ompi_file_set_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c index e8967fb48a..1374522c61 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_set_errhandler_f pompi_file_set_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_set_errhandler PMPI_File_set_errhandler #endif void ompi_file_set_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, diff --git a/ompi/mpi/fortran/mpif-h/file_set_info_f.c b/ompi/mpi/fortran/mpif-h/file_set_info_f.c index b91997f8ee..9c0a9a1c05 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_info_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_set_info_f pompi_file_set_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_set_info PMPI_File_set_info #endif void ompi_file_set_info_f(MPI_Fint *fh, MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_set_size_f.c b/ompi/mpi/fortran/mpif-h/file_set_size_f.c index 4a249e932e..41f81805f0 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_size_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_set_size_f pompi_file_set_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_set_size PMPI_File_set_size #endif void ompi_file_set_size_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_set_view_f.c b/ompi/mpi/fortran/mpif-h/file_set_view_f.c index 1e450a0c16..845cab8508 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_view_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_view_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_VIEW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_set_view_f pompi_file_set_view_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_set_view PMPI_File_set_view #endif void ompi_file_set_view_f(MPI_Fint *fh, MPI_Offset *disp, diff --git a/ompi/mpi/fortran/mpif-h/file_sync_f.c b/ompi/mpi/fortran/mpif-h/file_sync_f.c index b0801061d6..9f46cbaff9 100644 --- a/ompi/mpi/fortran/mpif-h/file_sync_f.c +++ b/ompi/mpi/fortran/mpif-h/file_sync_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SYNC, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_sync_f pompi_file_sync_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_sync PMPI_File_sync #endif void ompi_file_sync_f(MPI_Fint *fh, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c index 3a2f422d70..5503602edf 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_all_begin_f pompi_file_write_all_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_all_begin PMPI_File_write_all_begin #endif void ompi_file_write_all_begin_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c index a0d5fe16b0..c393a194f3 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_all_end_f pompi_file_write_all_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_all_end PMPI_File_write_all_end #endif void ompi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_f.c index 5ef5388bbe..ac97737b4d 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_all_f pompi_file_write_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_all PMPI_File_write_all #endif void ompi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c index 50c1421e0a..ccc208c109 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_at_all_begin_f pompi_file_write_at_all_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_at_all_begin PMPI_File_write_at_all_begin #endif void ompi_file_write_at_all_begin_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c index 04fef54bc1..418d608496 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_at_all_end_f pompi_file_write_at_all_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_at_all_end PMPI_File_write_at_all_end #endif void ompi_file_write_at_all_end_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c index cf8fd8afd4..e808352795 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_at_all_f pompi_file_write_at_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_at_all PMPI_File_write_at_all #endif void ompi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_f.c index 314e1b5bb1..79c7013158 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT, #endif #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_at_f pompi_file_write_at_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_at PMPI_File_write_at #endif void ompi_file_write_at_f(MPI_Fint *fh, MPI_Offset *offset, diff --git a/ompi/mpi/fortran/mpif-h/file_write_f.c b/ompi/mpi/fortran/mpif-h/file_write_f.c index 31db55c69a..14d61abc94 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_f pompi_file_write_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write PMPI_File_write #endif void ompi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c index c0b11a9d25..52dbe6677f 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_BEGIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_ordered_begin_f pompi_file_write_ordered_begin_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_ordered_begin PMPI_File_write_ordered_begin #endif void ompi_file_write_ordered_begin_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c index 69ba92aee5..83e760080c 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_END, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_ordered_end_f pompi_file_write_ordered_end_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_ordered_end PMPI_File_write_ordered_end #endif void ompi_file_write_ordered_end_f(MPI_Fint *fh, char *buf, diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c index 17e8bd041d..7d8977dc47 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_ordered_f pompi_file_write_ordered_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_ordered PMPI_File_write_ordered #endif void ompi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/file_write_shared_f.c b/ompi/mpi/fortran/mpif-h/file_write_shared_f.c index b73e54203a..6a28e91b0b 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_shared_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_SHARED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_file_write_shared_f pompi_file_write_shared_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_File_write_shared PMPI_File_write_shared #endif void ompi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/finalize_f.c b/ompi/mpi/fortran/mpif-h/finalize_f.c index 21d9042d59..bc361c25f1 100644 --- a/ompi/mpi/fortran/mpif-h/finalize_f.c +++ b/ompi/mpi/fortran/mpif-h/finalize_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_finalize_f pompi_finalize_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Finalize PMPI_Finalize #endif void ompi_finalize_f(MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/finalized_f.c b/ompi/mpi/fortran/mpif-h/finalized_f.c index 24e99590ae..beb9073ff3 100644 --- a/ompi/mpi/fortran/mpif-h/finalized_f.c +++ b/ompi/mpi/fortran/mpif-h/finalized_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_finalized_f pompi_finalized_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Finalized PMPI_Finalized #endif void ompi_finalized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/free_mem_f.c b/ompi/mpi/fortran/mpif-h/free_mem_f.c index 877c9932a9..f9c763c0f6 100644 --- a/ompi/mpi/fortran/mpif-h/free_mem_f.c +++ b/ompi/mpi/fortran/mpif-h/free_mem_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FREE_MEM, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_free_mem_f pompi_free_mem_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Free_mem PMPI_Free_mem #endif void ompi_free_mem_f(char *base, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/gather_f.c b/ompi/mpi/fortran/mpif-h/gather_f.c index b15deab53c..482e31c773 100644 --- a/ompi/mpi/fortran/mpif-h/gather_f.c +++ b/ompi/mpi/fortran/mpif-h/gather_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_gather_f pompi_gather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Gather PMPI_Gather #endif void ompi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/gatherv_f.c b/ompi/mpi/fortran/mpif-h/gatherv_f.c index 9198b08562..ed73e80e64 100644 --- a/ompi/mpi/fortran/mpif-h/gatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/gatherv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_gatherv_f pompi_gatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Gatherv PMPI_Gatherv #endif void ompi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/get_accumulate_f.c b/ompi/mpi/fortran/mpif-h/get_accumulate_f.c index c46c48db9b..f377c9bcf3 100644 --- a/ompi/mpi/fortran/mpif-h/get_accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/get_accumulate_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ACCUMULATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_accumulate_f pompi_get_accumulate_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_accumulate PMPI_Get_accumulate #endif void ompi_get_accumulate_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/get_address_f.c b/ompi/mpi/fortran/mpif-h/get_address_f.c index e0dfef7e07..52b8ca4769 100644 --- a/ompi/mpi/fortran/mpif-h/get_address_f.c +++ b/ompi/mpi/fortran/mpif-h/get_address_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ADDRESS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_address_f pompi_get_address_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_address PMPI_Get_address #endif void ompi_get_address_f(char *location, MPI_Aint *address, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/get_count_f.c b/ompi/mpi/fortran/mpif-h/get_count_f.c index 907e49f33e..3c4c7f3f82 100644 --- a/ompi/mpi/fortran/mpif-h/get_count_f.c +++ b/ompi/mpi/fortran/mpif-h/get_count_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_COUNT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_count_f pompi_get_count_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_count PMPI_Get_count #endif void ompi_get_count_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/get_elements_f.c b/ompi/mpi/fortran/mpif-h/get_elements_f.c index e500ef51e8..83d6f39493 100644 --- a/ompi/mpi/fortran/mpif-h/get_elements_f.c +++ b/ompi/mpi/fortran/mpif-h/get_elements_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ELEMENTS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_elements_f pompi_get_elements_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_elements PMPI_Get_elements #endif void ompi_get_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/get_elements_x_f.c b/ompi/mpi/fortran/mpif-h/get_elements_x_f.c index d90e316838..c82af9184f 100644 --- a/ompi/mpi/fortran/mpif-h/get_elements_x_f.c +++ b/ompi/mpi/fortran/mpif-h/get_elements_x_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ELEMENTS_X, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_elements_x_f pompi_get_elements_x_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_elements_x PMPI_Get_elements_x #endif void ompi_get_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Count *count, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/get_f.c b/ompi/mpi/fortran/mpif-h/get_f.c index e09c793360..d7712c96ab 100644 --- a/ompi/mpi/fortran/mpif-h/get_f.c +++ b/ompi/mpi/fortran/mpif-h/get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_f pompi_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get PMPI_Get #endif void ompi_get_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/get_library_version_f.c b/ompi/mpi/fortran/mpif-h/get_library_version_f.c index 3fa2910fcd..7e7d624b4d 100644 --- a/ompi/mpi/fortran/mpif-h/get_library_version_f.c +++ b/ompi/mpi/fortran/mpif-h/get_library_version_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_LIBRARY_VERSION, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_library_version_f pompi_get_library_version_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_library_version PMPI_Get_library_version #endif void ompi_get_library_version_f(char *version, MPI_Fint *resultlen, diff --git a/ompi/mpi/fortran/mpif-h/get_processor_name_f.c b/ompi/mpi/fortran/mpif-h/get_processor_name_f.c index 56cf1e69dd..80f062ea62 100644 --- a/ompi/mpi/fortran/mpif-h/get_processor_name_f.c +++ b/ompi/mpi/fortran/mpif-h/get_processor_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_PROCESSOR_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_processor_name_f pompi_get_processor_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_processor_name PMPI_Get_processor_name #endif static const char FUNC_NAME[] = "MPI_GET_PROCESSOR_NAME"; diff --git a/ompi/mpi/fortran/mpif-h/get_version_f.c b/ompi/mpi/fortran/mpif-h/get_version_f.c index bcc8faf876..83ecb4e00b 100644 --- a/ompi/mpi/fortran/mpif-h/get_version_f.c +++ b/ompi/mpi/fortran/mpif-h/get_version_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_VERSION, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_get_version_f pompi_get_version_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Get_version PMPI_Get_version #endif void ompi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/graph_create_f.c b/ompi/mpi/fortran/mpif-h/graph_create_f.c index d386ce3893..7478f2f4db 100644 --- a/ompi/mpi/fortran/mpif-h/graph_create_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graph_create_f pompi_graph_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graph_create PMPI_Graph_create #endif void ompi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes, diff --git a/ompi/mpi/fortran/mpif-h/graph_get_f.c b/ompi/mpi/fortran/mpif-h/graph_get_f.c index a7a195e11c..c38c228fbe 100644 --- a/ompi/mpi/fortran/mpif-h/graph_get_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graph_get_f pompi_graph_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graph_get PMPI_Graph_get #endif void ompi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex, diff --git a/ompi/mpi/fortran/mpif-h/graph_map_f.c b/ompi/mpi/fortran/mpif-h/graph_map_f.c index 10324cf41a..a7c1394cb6 100644 --- a/ompi/mpi/fortran/mpif-h/graph_map_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_map_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_MAP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graph_map_f pompi_graph_map_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graph_map PMPI_Graph_map #endif void ompi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *indx, diff --git a/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c b/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c index 9e8b51824d..14bd9f3f4c 100644 --- a/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS_COUNT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graph_neighbors_count_f pompi_graph_neighbors_count_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graph_neighbors_count PMPI_Graph_neighbors_count #endif void ompi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank, diff --git a/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c b/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c index 6a03c640b5..606543beac 100644 --- a/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2013 Inria. All rights reserved. * Copyright (c) 2011-2013 Universite Bordeaux 1 + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graph_neighbors_f pompi_graph_neighbors_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graph_neighbors PMPI_Graph_neighbors #endif void ompi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank, diff --git a/ompi/mpi/fortran/mpif-h/graphdims_get_f.c b/ompi/mpi/fortran/mpif-h/graphdims_get_f.c index b9a3563b97..d885789b04 100644 --- a/ompi/mpi/fortran/mpif-h/graphdims_get_f.c +++ b/ompi/mpi/fortran/mpif-h/graphdims_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPHDIMS_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_graphdims_get_f pompi_graphdims_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Graphdims_get PMPI_Graphdims_get #endif void ompi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes, diff --git a/ompi/mpi/fortran/mpif-h/grequest_complete_f.c b/ompi/mpi/fortran/mpif-h/grequest_complete_f.c index cbfa8e7e2b..cf76b4ee7c 100644 --- a/ompi/mpi/fortran/mpif-h/grequest_complete_f.c +++ b/ompi/mpi/fortran/mpif-h/grequest_complete_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_COMPLETE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_grequest_complete_f pompi_grequest_complete_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Grequest_complete PMPI_Grequest_complete #endif void ompi_grequest_complete_f(MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/grequest_start_f.c b/ompi/mpi/fortran/mpif-h/grequest_start_f.c index 8b7ce8ffed..b3941df41b 100644 --- a/ompi/mpi/fortran/mpif-h/grequest_start_f.c +++ b/ompi/mpi/fortran/mpif-h/grequest_start_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_START, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_grequest_start_f pompi_grequest_start_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Grequest_start PMPI_Grequest_start #endif void ompi_grequest_start_f(MPI_F_Grequest_query_function* query_fn, diff --git a/ompi/mpi/fortran/mpif-h/group_compare_f.c b/ompi/mpi/fortran/mpif-h/group_compare_f.c index ee45a06e11..d5c74e3b96 100644 --- a/ompi/mpi/fortran/mpif-h/group_compare_f.c +++ b/ompi/mpi/fortran/mpif-h/group_compare_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_COMPARE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_compare_f pompi_group_compare_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_compare PMPI_Group_compare #endif void ompi_group_compare_f(MPI_Fint *group1, MPI_Fint *group2, diff --git a/ompi/mpi/fortran/mpif-h/group_difference_f.c b/ompi/mpi/fortran/mpif-h/group_difference_f.c index eb1a255eaf..20459788cd 100644 --- a/ompi/mpi/fortran/mpif-h/group_difference_f.c +++ b/ompi/mpi/fortran/mpif-h/group_difference_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_DIFFERENCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_difference_f pompi_group_difference_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_difference PMPI_Group_difference #endif void ompi_group_difference_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_excl_f.c b/ompi/mpi/fortran/mpif-h/group_excl_f.c index 2401f6ea7f..fd68ee7d94 100644 --- a/ompi/mpi/fortran/mpif-h/group_excl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_excl_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_EXCL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_excl_f pompi_group_excl_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_excl PMPI_Group_excl #endif void ompi_group_excl_f(MPI_Fint *group, MPI_Fint *n, diff --git a/ompi/mpi/fortran/mpif-h/group_free_f.c b/ompi/mpi/fortran/mpif-h/group_free_f.c index 56b03fc209..814e0b8778 100644 --- a/ompi/mpi/fortran/mpif-h/group_free_f.c +++ b/ompi/mpi/fortran/mpif-h/group_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_free_f pompi_group_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_free PMPI_Group_free #endif void ompi_group_free_f(MPI_Fint *group, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_incl_f.c b/ompi/mpi/fortran/mpif-h/group_incl_f.c index f7ed8674de..f0042d6a36 100644 --- a/ompi/mpi/fortran/mpif-h/group_incl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_incl_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INCL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_incl_f pompi_group_incl_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_incl PMPI_Group_incl #endif void ompi_group_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint *ranks, MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_intersection_f.c b/ompi/mpi/fortran/mpif-h/group_intersection_f.c index 8676c15243..a0b1c80e78 100644 --- a/ompi/mpi/fortran/mpif-h/group_intersection_f.c +++ b/ompi/mpi/fortran/mpif-h/group_intersection_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INTERSECTION, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_intersection_f pompi_group_intersection_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_intersection PMPI_Group_intersection #endif void ompi_group_intersection_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_range_excl_f.c b/ompi/mpi/fortran/mpif-h/group_range_excl_f.c index c278db6cca..f286d3d1ce 100644 --- a/ompi/mpi/fortran/mpif-h/group_range_excl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_range_excl_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_EXCL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_range_excl_f pompi_group_range_excl_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_range_excl PMPI_Group_range_excl #endif void ompi_group_range_excl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_range_incl_f.c b/ompi/mpi/fortran/mpif-h/group_range_incl_f.c index c565751fa2..a5a6da7b0e 100644 --- a/ompi/mpi/fortran/mpif-h/group_range_incl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_range_incl_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_INCL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_range_incl_f pompi_group_range_incl_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_range_incl PMPI_Group_range_incl #endif void ompi_group_range_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_rank_f.c b/ompi/mpi/fortran/mpif-h/group_rank_f.c index 077172f0de..2c32571a21 100644 --- a/ompi/mpi/fortran/mpif-h/group_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/group_rank_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_rank_f pompi_group_rank_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_rank PMPI_Group_rank #endif void ompi_group_rank_f(MPI_Fint *group, MPI_Fint *rank, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_size_f.c b/ompi/mpi/fortran/mpif-h/group_size_f.c index 1d1e09a787..52d22459ed 100644 --- a/ompi/mpi/fortran/mpif-h/group_size_f.c +++ b/ompi/mpi/fortran/mpif-h/group_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_size_f pompi_group_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_size PMPI_Group_size #endif void ompi_group_size_f(MPI_Fint *group, MPI_Fint *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c b/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c index a0fc998b65..63a6cf417f 100644 --- a/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c +++ b/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_TRANSLATE_RANKS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_translate_ranks_f pompi_group_translate_ranks_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_translate_ranks PMPI_Group_translate_ranks #endif void ompi_group_translate_ranks_f(MPI_Fint *group1, MPI_Fint *n, diff --git a/ompi/mpi/fortran/mpif-h/group_union_f.c b/ompi/mpi/fortran/mpif-h/group_union_f.c index fb7975df2b..313fe128d0 100644 --- a/ompi/mpi/fortran/mpif-h/group_union_f.c +++ b/ompi/mpi/fortran/mpif-h/group_union_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_UNION, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_group_union_f pompi_group_union_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Group_union PMPI_Group_union #endif void ompi_group_union_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/iallgather_f.c b/ompi/mpi/fortran/mpif-h/iallgather_f.c index e3ba9dc9c1..911285e31e 100644 --- a/ompi/mpi/fortran/mpif-h/iallgather_f.c +++ b/ompi/mpi/fortran/mpif-h/iallgather_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLGATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iallgather_f pompi_iallgather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iallgather PMPI_Iallgather #endif void ompi_iallgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c index 7ae3a972ac..9aa39718c7 100644 --- a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLGATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iallgatherv_f pompi_iallgatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iallgatherv PMPI_Iallgatherv #endif void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/iallreduce_f.c b/ompi/mpi/fortran/mpif-h/iallreduce_f.c index 1d6f1b62db..3bd46e473c 100644 --- a/ompi/mpi/fortran/mpif-h/iallreduce_f.c +++ b/ompi/mpi/fortran/mpif-h/iallreduce_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLREDUCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iallreduce_f pompi_iallreduce_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iallreduce PMPI_Iallreduce #endif void ompi_iallreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/ialltoall_f.c b/ompi/mpi/fortran/mpif-h/ialltoall_f.c index 4e2f538091..8bb90c3749 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoall_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ialltoall_f pompi_ialltoall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ialltoall PMPI_Ialltoall #endif void ompi_ialltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c index 6622d2b8de..d2bb5e025f 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALLV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ialltoallv_f pompi_ialltoallv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ialltoallv PMPI_Ialltoallv #endif void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, diff --git a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c index f695fd056e..eecd801f1f 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALLW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ialltoallw_f pompi_ialltoallw_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ialltoallw PMPI_Ialltoallw #endif void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/ibarrier_f.c b/ompi/mpi/fortran/mpif-h/ibarrier_f.c index 0d737356a4..f5b2b9a4ae 100644 --- a/ompi/mpi/fortran/mpif-h/ibarrier_f.c +++ b/ompi/mpi/fortran/mpif-h/ibarrier_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBARRIER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ibarrier_f pompi_ibarrier_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ibarrier PMPI_Ibarrier #endif void ompi_ibarrier_f(MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/ibcast_f.c b/ompi/mpi/fortran/mpif-h/ibcast_f.c index 513a285866..cf1976f5a2 100644 --- a/ompi/mpi/fortran/mpif-h/ibcast_f.c +++ b/ompi/mpi/fortran/mpif-h/ibcast_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBCAST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ibcast_f pompi_ibcast_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ibcast PMPI_Ibcast #endif void ompi_ibcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/ibsend_f.c b/ompi/mpi/fortran/mpif-h/ibsend_f.c index e1183ff47f..4f4fe35833 100644 --- a/ompi/mpi/fortran/mpif-h/ibsend_f.c +++ b/ompi/mpi/fortran/mpif-h/ibsend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ibsend_f pompi_ibsend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ibsend PMPI_Ibsend #endif void ompi_ibsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/iexscan_f.c b/ompi/mpi/fortran/mpif-h/iexscan_f.c index 88ef73b7ef..6b65fb88f1 100644 --- a/ompi/mpi/fortran/mpif-h/iexscan_f.c +++ b/ompi/mpi/fortran/mpif-h/iexscan_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IEXSCAN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iexscan_f pompi_iexscan_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iexscan PMPI_Iexscan #endif void ompi_iexscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/igather_f.c b/ompi/mpi/fortran/mpif-h/igather_f.c index a2c6b13a90..5b816fc350 100644 --- a/ompi/mpi/fortran/mpif-h/igather_f.c +++ b/ompi/mpi/fortran/mpif-h/igather_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IGATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_igather_f pompi_igather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Igather PMPI_Igather #endif void ompi_igather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/igatherv_f.c b/ompi/mpi/fortran/mpif-h/igatherv_f.c index fb38c80bbe..b1055b78f7 100644 --- a/ompi/mpi/fortran/mpif-h/igatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/igatherv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IGATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_igatherv_f pompi_igatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Igatherv PMPI_Igatherv #endif void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/improbe_f.c b/ompi/mpi/fortran/mpif-h/improbe_f.c index 81cfa6562e..e4a5f6e88b 100644 --- a/ompi/mpi/fortran/mpif-h/improbe_f.c +++ b/ompi/mpi/fortran/mpif-h/improbe_f.c @@ -9,9 +9,11 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015 FUJITSU LIMITED. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -68,7 +70,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IMPROBE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_improbe_f pompi_improbe_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Improbe PMPI_Improbe #endif void ompi_improbe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, diff --git a/ompi/mpi/fortran/mpif-h/imrecv_f.c b/ompi/mpi/fortran/mpif-h/imrecv_f.c index 304fc13977..e57a98871e 100644 --- a/ompi/mpi/fortran/mpif-h/imrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/imrecv_f.c @@ -9,8 +9,10 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 FUJITSU LIMITED. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IMRECV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_imrecv_f pompi_imrecv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Imrecv PMPI_Imrecv #endif void ompi_imrecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c index a2706638ec..d5ba525982 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLGATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ineighbor_allgather_f pompi_ineighbor_allgather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ineighbor_allgather PMPI_Ineighbor_allgather #endif void ompi_ineighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c index 3ee2b26c0d..216b6cf7cf 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLGATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ineighbor_allgatherv_f pompi_ineighbor_allgatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ineighbor_allgatherv PMPI_Ineighbor_allgatherv #endif void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c index fdcbd370f6..23bad9b465 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ineighbor_alltoall_f pompi_ineighbor_alltoall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ineighbor_alltoall PMPI_Ineighbor_alltoall #endif void ompi_ineighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c index d689113cdc..dbd85cc2e7 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALLV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ineighbor_alltoallv_f pompi_ineighbor_alltoallv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ineighbor_alltoallv PMPI_Ineighbor_alltoallv #endif void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c index 36b8347530..f03689d17e 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALLW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ineighbor_alltoallw_f pompi_ineighbor_alltoallw_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ineighbor_alltoallw PMPI_Ineighbor_alltoallw #endif void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/info_create_f.c b/ompi/mpi/fortran/mpif-h/info_create_f.c index 32a270e6ae..d0357c7acb 100644 --- a/ompi/mpi/fortran/mpif-h/info_create_f.c +++ b/ompi/mpi/fortran/mpif-h/info_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_create_f pompi_info_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_create PMPI_Info_create #endif void ompi_info_create_f(MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/info_delete_f.c b/ompi/mpi/fortran/mpif-h/info_delete_f.c index 65fbdc67c8..ed0e6a26ad 100644 --- a/ompi/mpi/fortran/mpif-h/info_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/info_delete_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DELETE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_delete_f pompi_info_delete_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_delete PMPI_Info_delete #endif static const char FUNC_NAME[] = "MPI_INFO_DELETE"; diff --git a/ompi/mpi/fortran/mpif-h/info_dup_f.c b/ompi/mpi/fortran/mpif-h/info_dup_f.c index 72f1a70826..48ee41ea96 100644 --- a/ompi/mpi/fortran/mpif-h/info_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/info_dup_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_dup_f pompi_info_dup_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_dup PMPI_Info_dup #endif void ompi_info_dup_f(MPI_Fint *info, MPI_Fint *newinfo, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/info_free_f.c b/ompi/mpi/fortran/mpif-h/info_free_f.c index 81a83b7ee4..bf5104527e 100644 --- a/ompi/mpi/fortran/mpif-h/info_free_f.c +++ b/ompi/mpi/fortran/mpif-h/info_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_free_f pompi_info_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_free PMPI_Info_free #endif void ompi_info_free_f(MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/info_get_f.c b/ompi/mpi/fortran/mpif-h/info_get_f.c index 6cd014cb59..f9232e66dd 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_get_f pompi_info_get_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_get PMPI_Info_get #endif static const char FUNC_NAME[] = "MPI_INFO_GET"; diff --git a/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c b/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c index d761871797..378daf565f 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NKEYS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_get_nkeys_f pompi_info_get_nkeys_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_get_nkeys PMPI_Info_get_nkeys #endif void ompi_info_get_nkeys_f(MPI_Fint *info, MPI_Fint *nkeys, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c b/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c index 15b4ae8e7f..6f5e3151c1 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NTHKEY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_get_nthkey_f pompi_info_get_nthkey_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_get_nthkey PMPI_Info_get_nthkey #endif static const char FUNC_NAME[] = "MPI_INFO_GET_NTHKEY"; diff --git a/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c b/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c index 2edf9b6fe7..856daa47a8 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_VALUELEN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_get_valuelen_f pompi_info_get_valuelen_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_get_valuelen PMPI_Info_get_valuelen #endif static const char FUNC_NAME[] = "MPI_INFO_GET_VALUELEN"; diff --git a/ompi/mpi/fortran/mpif-h/info_set_f.c b/ompi/mpi/fortran/mpif-h/info_set_f.c index 6aff0ccb5a..c96441c701 100644 --- a/ompi/mpi/fortran/mpif-h/info_set_f.c +++ b/ompi/mpi/fortran/mpif-h/info_set_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_SET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_info_set_f pompi_info_set_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Info_set PMPI_Info_set #endif static const char FUNC_NAME[] = "MPI_INFO_SET"; diff --git a/ompi/mpi/fortran/mpif-h/init_f.c b/ompi/mpi/fortran/mpif-h/init_f.c index 8ad33b8092..d963a6bed7 100644 --- a/ompi/mpi/fortran/mpif-h/init_f.c +++ b/ompi/mpi/fortran/mpif-h/init_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -70,7 +72,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_init_f pompi_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Init PMPI_Init #endif void ompi_init_f( MPI_Fint *ierr ) diff --git a/ompi/mpi/fortran/mpif-h/init_thread_f.c b/ompi/mpi/fortran/mpif-h/init_thread_f.c index 80ba58db41..59214e0b5a 100644 --- a/ompi/mpi/fortran/mpif-h/init_thread_f.c +++ b/ompi/mpi/fortran/mpif-h/init_thread_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT_THREAD, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_init_thread_f pompi_init_thread_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Init_thread PMPI_Init_thread #endif void ompi_init_thread_f( MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr ) diff --git a/ompi/mpi/fortran/mpif-h/initialized_f.c b/ompi/mpi/fortran/mpif-h/initialized_f.c index 4902abbe27..3201fe0d40 100644 --- a/ompi/mpi/fortran/mpif-h/initialized_f.c +++ b/ompi/mpi/fortran/mpif-h/initialized_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INITIALIZED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_initialized_f pompi_initialized_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Initialized PMPI_Initialized #endif void ompi_initialized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/intercomm_create_f.c b/ompi/mpi/fortran/mpif-h/intercomm_create_f.c index 819696e87e..424a8e2fcc 100644 --- a/ompi/mpi/fortran/mpif-h/intercomm_create_f.c +++ b/ompi/mpi/fortran/mpif-h/intercomm_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_intercomm_create_f pompi_intercomm_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Intercomm_create PMPI_Intercomm_create #endif void ompi_intercomm_create_f(MPI_Fint *local_comm, MPI_Fint *local_leader, diff --git a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c index 6564d7d6e1..1d1d633ff2 100644 --- a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c +++ b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_intercomm_merge_f pompi_intercomm_merge_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Intercomm_merge PMPI_Intercomm_merge #endif void ompi_intercomm_merge_f(MPI_Fint *intercomm, ompi_fortran_logical_t *high, diff --git a/ompi/mpi/fortran/mpif-h/iprobe_f.c b/ompi/mpi/fortran/mpif-h/iprobe_f.c index 632d544c0f..1c034def69 100644 --- a/ompi/mpi/fortran/mpif-h/iprobe_f.c +++ b/ompi/mpi/fortran/mpif-h/iprobe_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IPROBE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iprobe_f pompi_iprobe_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iprobe PMPI_Iprobe #endif void ompi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, diff --git a/ompi/mpi/fortran/mpif-h/irecv_f.c b/ompi/mpi/fortran/mpif-h/irecv_f.c index 5e57d2ce0a..d78dc1beb4 100644 --- a/ompi/mpi/fortran/mpif-h/irecv_f.c +++ b/ompi/mpi/fortran/mpif-h/irecv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRECV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_irecv_f pompi_irecv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Irecv PMPI_Irecv #endif void ompi_irecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/ireduce_f.c b/ompi/mpi/fortran/mpif-h/ireduce_f.c index 5314b61231..34336606bd 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ireduce_f pompi_ireduce_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ireduce PMPI_Ireduce #endif void ompi_ireduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c b/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c index 33a56a5c9f..793a7be3ff 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE_SCATTER_BLOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ireduce_scatter_block_f pompi_ireduce_scatter_block_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ireduce_scatter_block PMPI_Ireduce_scatter_block #endif void ompi_ireduce_scatter_block_f(char *sendbuf, char *recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c b/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c index 08d21aba0e..cb772bbb9f 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE_SCATTER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ireduce_scatter_f pompi_ireduce_scatter_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ireduce_scatter PMPI_Ireduce_scatter #endif void ompi_ireduce_scatter_f(char *sendbuf, char *recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/irsend_f.c b/ompi/mpi/fortran/mpif-h/irsend_f.c index 00010eda0f..b67fdfb0cd 100644 --- a/ompi/mpi/fortran/mpif-h/irsend_f.c +++ b/ompi/mpi/fortran/mpif-h/irsend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_irsend_f pompi_irsend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Irsend PMPI_Irsend #endif void ompi_irsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/is_thread_main_f.c b/ompi/mpi/fortran/mpif-h/is_thread_main_f.c index 78a4031ef1..1c27ba9b2e 100644 --- a/ompi/mpi/fortran/mpif-h/is_thread_main_f.c +++ b/ompi/mpi/fortran/mpif-h/is_thread_main_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IS_THREAD_MAIN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_is_thread_main_f pompi_is_thread_main_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Is_thread_main PMPI_Is_thread_main #endif void ompi_is_thread_main_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/iscan_f.c b/ompi/mpi/fortran/mpif-h/iscan_f.c index 306bfeffc9..a292708d1f 100644 --- a/ompi/mpi/fortran/mpif-h/iscan_f.c +++ b/ompi/mpi/fortran/mpif-h/iscan_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCAN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iscan_f pompi_iscan_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iscan PMPI_Iscan #endif void ompi_iscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/iscatter_f.c b/ompi/mpi/fortran/mpif-h/iscatter_f.c index 08ecec8827..7b44a5a604 100644 --- a/ompi/mpi/fortran/mpif-h/iscatter_f.c +++ b/ompi/mpi/fortran/mpif-h/iscatter_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCATTER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iscatter_f pompi_iscatter_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iscatter PMPI_Iscatter #endif void ompi_iscatter_f(char *sendbuf, MPI_Fint *sendcount, diff --git a/ompi/mpi/fortran/mpif-h/iscatterv_f.c b/ompi/mpi/fortran/mpif-h/iscatterv_f.c index 07412b59ab..7fc30f45f4 100644 --- a/ompi/mpi/fortran/mpif-h/iscatterv_f.c +++ b/ompi/mpi/fortran/mpif-h/iscatterv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCATTERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_iscatterv_f pompi_iscatterv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Iscatterv PMPI_Iscatterv #endif void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/isend_f.c b/ompi/mpi/fortran/mpif-h/isend_f.c index 08ed146656..3c01fe3d56 100644 --- a/ompi/mpi/fortran/mpif-h/isend_f.c +++ b/ompi/mpi/fortran/mpif-h/isend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_isend_f pompi_isend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Isend PMPI_Isend #endif void ompi_isend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/issend_f.c b/ompi/mpi/fortran/mpif-h/issend_f.c index ae201621ce..7dfe9b85d8 100644 --- a/ompi/mpi/fortran/mpif-h/issend_f.c +++ b/ompi/mpi/fortran/mpif-h/issend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_issend_f pompi_issend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Issend PMPI_Issend #endif void ompi_issend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/keyval_create_f.c b/ompi/mpi/fortran/mpif-h/keyval_create_f.c index 3cb571c801..dc9da8c37f 100644 --- a/ompi/mpi/fortran/mpif-h/keyval_create_f.c +++ b/ompi/mpi/fortran/mpif-h/keyval_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_keyval_create_f pompi_keyval_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Keyval_create PMPI_Keyval_create #endif static const char FUNC_NAME[] = "MPI_keyval_create_f"; diff --git a/ompi/mpi/fortran/mpif-h/keyval_free_f.c b/ompi/mpi/fortran/mpif-h/keyval_free_f.c index aa3fde3e54..128c9133ed 100644 --- a/ompi/mpi/fortran/mpif-h/keyval_free_f.c +++ b/ompi/mpi/fortran/mpif-h/keyval_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_keyval_free_f pompi_keyval_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Keyval_free PMPI_Keyval_free #endif void ompi_keyval_free_f(MPI_Fint *keyval, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/lookup_name_f.c b/ompi/mpi/fortran/mpif-h/lookup_name_f.c index 62fd02b6a6..ec56cee4f6 100644 --- a/ompi/mpi/fortran/mpif-h/lookup_name_f.c +++ b/ompi/mpi/fortran/mpif-h/lookup_name_f.c @@ -64,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_LOOKUP_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_lookup_name_f pompi_lookup_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Lookup_name PMPI_Lookup_name #endif void ompi_lookup_name_f(char *service_name, MPI_Fint *info, diff --git a/ompi/mpi/fortran/mpif-h/mprobe_f.c b/ompi/mpi/fortran/mpif-h/mprobe_f.c index e14e7e5759..a08e01b20e 100644 --- a/ompi/mpi/fortran/mpif-h/mprobe_f.c +++ b/ompi/mpi/fortran/mpif-h/mprobe_f.c @@ -10,9 +10,11 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. - * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015 FUJITSU LIMITED. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -69,7 +71,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_MPROBE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_mprobe_f pompi_mprobe_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Mprobe PMPI_Mprobe #endif void ompi_mprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, diff --git a/ompi/mpi/fortran/mpif-h/mrecv_f.c b/ompi/mpi/fortran/mpif-h/mrecv_f.c index 9190496d8f..97a025f7ff 100644 --- a/ompi/mpi/fortran/mpif-h/mrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/mrecv_f.c @@ -9,9 +9,11 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015 FUJITSU LIMITED. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -68,7 +70,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_MRECV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_mrecv_f pompi_mrecv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Mrecv PMPI_Mrecv #endif void ompi_mrecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c index 2369eb0784..c4b0df3d7e 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLGATHER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_neighbor_allgather_f pompi_neighbor_allgather_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Neighbor_allgather PMPI_Neighbor_allgather #endif void ompi_neighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c index c6587ac734..66c5ad5ffb 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLGATHERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_neighbor_allgatherv_f pompi_neighbor_allgatherv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Neighbor_allgatherv PMPI_Neighbor_allgatherv #endif void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c index 47aaa1aae7..c44130b44f 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_neighbor_alltoall_f pompi_neighbor_alltoall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Neighbor_alltoall PMPI_Neighbor_alltoall #endif void ompi_neighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c index 99ba170e6a..0f6b598357 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALLV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_neighbor_alltoallv_f pompi_neighbor_alltoallv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Neighbor_alltoallv PMPI_Neighbor_alltoallv #endif void ompi_neighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c index 0aeb91a0ac..8a5a650d1a 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALLW, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_neighbor_alltoallw_f pompi_neighbor_alltoallw_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Neighbor_alltoallw PMPI_Neighbor_alltoallw #endif void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/op_commutative_f.c b/ompi/mpi/fortran/mpif-h/op_commutative_f.c index d93963ea7b..e17a7be809 100644 --- a/ompi/mpi/fortran/mpif-h/op_commutative_f.c +++ b/ompi/mpi/fortran/mpif-h/op_commutative_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_COMMUTATIVE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_op_commutative_f pompi_op_commutative_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Op_commutative PMPI_Op_commutative #endif void ompi_op_commutative_f(MPI_Fint *op, MPI_Fint *commute, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/op_create_f.c b/ompi/mpi/fortran/mpif-h/op_create_f.c index 639db40138..52db0b4265 100644 --- a/ompi/mpi/fortran/mpif-h/op_create_f.c +++ b/ompi/mpi/fortran/mpif-h/op_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_op_create_f pompi_op_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Op_create PMPI_Op_create #endif void ompi_op_create_f(ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *commute, diff --git a/ompi/mpi/fortran/mpif-h/op_free_f.c b/ompi/mpi/fortran/mpif-h/op_free_f.c index 7277f23cab..09daddde2c 100644 --- a/ompi/mpi/fortran/mpif-h/op_free_f.c +++ b/ompi/mpi/fortran/mpif-h/op_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_op_free_f pompi_op_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Op_free PMPI_Op_free #endif void ompi_op_free_f(MPI_Fint *op, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/open_port_f.c b/ompi/mpi/fortran/mpif-h/open_port_f.c index c38642b572..44b21b325f 100644 --- a/ompi/mpi/fortran/mpif-h/open_port_f.c +++ b/ompi/mpi/fortran/mpif-h/open_port_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OPEN_PORT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_open_port_f pompi_open_port_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Open_port PMPI_Open_port #endif void ompi_open_port_f(MPI_Fint *info, char *port_name, MPI_Fint *ierr, int port_name_len) diff --git a/ompi/mpi/fortran/mpif-h/pack_external_f.c b/ompi/mpi/fortran/mpif-h/pack_external_f.c index 5c9e71e3ab..f685afc54d 100644 --- a/ompi/mpi/fortran/mpif-h/pack_external_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_external_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_pack_external_f pompi_pack_external_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Pack_external PMPI_Pack_external #endif void ompi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, diff --git a/ompi/mpi/fortran/mpif-h/pack_external_size_f.c b/ompi/mpi/fortran/mpif-h/pack_external_size_f.c index b2a06187b2..ae8903021f 100644 --- a/ompi/mpi/fortran/mpif-h/pack_external_size_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_external_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_pack_external_size_f pompi_pack_external_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Pack_external_size PMPI_Pack_external_size #endif void ompi_pack_external_size_f(char *datarep, MPI_Fint *incount, diff --git a/ompi/mpi/fortran/mpif-h/pack_f.c b/ompi/mpi/fortran/mpif-h/pack_f.c index 0aa61328d0..aeab74b099 100644 --- a/ompi/mpi/fortran/mpif-h/pack_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_pack_f pompi_pack_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Pack PMPI_Pack #endif void ompi_pack_f(char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/pack_size_f.c b/ompi/mpi/fortran/mpif-h/pack_size_f.c index a489231f59..e108eb01e0 100644 --- a/ompi/mpi/fortran/mpif-h/pack_size_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_pack_size_f pompi_pack_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Pack_size PMPI_Pack_size #endif void ompi_pack_size_f(MPI_Fint *incount, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/pcontrol_f.c b/ompi/mpi/fortran/mpif-h/pcontrol_f.c index 1c59048bfd..ebca92460c 100644 --- a/ompi/mpi/fortran/mpif-h/pcontrol_f.c +++ b/ompi/mpi/fortran/mpif-h/pcontrol_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PCONTROL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_pcontrol_f pompi_pcontrol_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Pcontrol PMPI_Pcontrol #endif void ompi_pcontrol_f(MPI_Fint *level) diff --git a/ompi/mpi/fortran/mpif-h/probe_f.c b/ompi/mpi/fortran/mpif-h/probe_f.c index 45cbd0ea3d..927d61ff69 100644 --- a/ompi/mpi/fortran/mpif-h/probe_f.c +++ b/ompi/mpi/fortran/mpif-h/probe_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PROBE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_probe_f pompi_probe_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Probe PMPI_Probe #endif void ompi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/profile/Makefile.am b/ompi/mpi/fortran/mpif-h/profile/Makefile.am index d8903358c4..fa29e87e1d 100644 --- a/ompi/mpi/fortran/mpif-h/profile/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/profile/Makefile.am @@ -29,13 +29,6 @@ include $(top_srcdir)/Makefile.ompi-rules CLEANFILES= libmpi_mpifh_pmpi_la_LIBADD = -# -# OMPI_PROFILING_DEFINES flag is enabled when we want our MPI_* symbols -# to be replaced by PMPI_*. In other words, this flag decides -# whether "profile/defines.h" is included or not. "profile/defines.h" -# replaces all MPI_* symbols with PMPI_* symbols. In this directory -# we definately need it to be 1. -# AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=1 -DOMPI_COMPILING_FORTRAN_WRAPPERS=1 # # This build needs to go through only if profiling is required. @@ -47,9 +40,6 @@ if BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER noinst_LTLIBRARIES += libmpi_mpifh_pmpi.la endif -headers = \ - defines.h - linked_files = \ pabort_f.c \ padd_error_class_f.c \ @@ -466,7 +456,6 @@ nodist_libmpi_mpifh_pmpi_la_SOURCES = \ if WANT_INSTALL_HEADERS ompidir = $(ompiincludedir)/$(subdir) -ompi_HEADERS = $(headers) endif # These files were created by targets above diff --git a/ompi/mpi/fortran/mpif-h/profile/defines.h b/ompi/mpi/fortran/mpif-h/profile/defines.h deleted file mode 100644 index 255ba654f6..0000000000 --- a/ompi/mpi/fortran/mpif-h/profile/defines.h +++ /dev/null @@ -1,396 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2013 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Inria. All rights reserved. - * Copyright (c) 2011-2013 Universite Bordeaux 1 - * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ -#ifndef OMPI_F77_PROFILE_DEFINES_H -#define OMPI_F77_PROFILE_DEFINES_H - -#define ompi_abort_f pompi_abort_f -#define ompi_accumulate_f pompi_accumulate_f -#define ompi_add_error_class_f pompi_add_error_class_f -#define ompi_add_error_code_f pompi_add_error_code_f -#define ompi_add_error_string_f pompi_add_error_string_f -#define ompi_address_f pompi_address_f -#define ompi_aint_add_f pompi_aint_add_f -#define ompi_aint_diff_f pompi_aint_diff_f -#define ompi_allgather_f pompi_allgather_f -#define ompi_allgatherv_f pompi_allgatherv_f -#define ompi_alloc_mem_f pompi_alloc_mem_f -#define ompi_allreduce_f pompi_allreduce_f -#define ompi_alltoall_f pompi_alltoall_f -#define ompi_alltoallv_f pompi_alltoallv_f -#define ompi_alltoallw_f pompi_alltoallw_f -#define ompi_attr_delete_f pompi_attr_delete_f -#define ompi_attr_get_f pompi_attr_get_f -#define ompi_attr_put_f pompi_attr_put_f -#define ompi_barrier_f pompi_barrier_f -#define ompi_bcast_f pompi_bcast_f -#define ompi_bsend_f pompi_bsend_f -#define ompi_bsend_init_f pompi_bsend_init_f -#define ompi_buffer_attach_f pompi_buffer_attach_f -#define ompi_buffer_detach_f pompi_buffer_detach_f -#define ompi_cancel_f pompi_cancel_f -#define ompi_cart_coords_f pompi_cart_coords_f -#define ompi_cart_create_f pompi_cart_create_f -#define ompi_cart_get_f pompi_cart_get_f -#define ompi_cart_map_f pompi_cart_map_f -#define ompi_cart_rank_f pompi_cart_rank_f -#define ompi_cart_shift_f pompi_cart_shift_f -#define ompi_cart_sub_f pompi_cart_sub_f -#define ompi_cartdim_get_f pompi_cartdim_get_f -#define ompi_close_port_f pompi_close_port_f -#define ompi_comm_accept_f pompi_comm_accept_f -#define ompi_comm_call_errhandler_f pompi_comm_call_errhandler_f -#define ompi_comm_compare_f pompi_comm_compare_f -#define ompi_comm_connect_f pompi_comm_connect_f -#define ompi_comm_create_errhandler_f pompi_comm_create_errhandler_f -#define ompi_comm_create_keyval_f pompi_comm_create_keyval_f -#define ompi_comm_create_group_f pompi_comm_create_group_f -#define ompi_comm_create_f pompi_comm_create_f -#define ompi_comm_delete_attr_f pompi_comm_delete_attr_f -#define ompi_comm_disconnect_f pompi_comm_disconnect_f -#define ompi_comm_dup_with_info_f pompi_comm_dup_with_info_f -#define ompi_comm_dup_f pompi_comm_dup_f -#define ompi_comm_idup_f pompi_comm_idup_f -#define ompi_comm_free_keyval_f pompi_comm_free_keyval_f -#define ompi_comm_free_f pompi_comm_free_f -#define ompi_comm_get_attr_f pompi_comm_get_attr_f -#define ompi_comm_get_info_f pompi_comm_get_info_f -#define ompi_comm_get_errhandler_f pompi_comm_get_errhandler_f -#define ompi_comm_get_name_f pompi_comm_get_name_f -#define ompi_comm_get_parent_f pompi_comm_get_parent_f -#define ompi_comm_group_f pompi_comm_group_f -#define ompi_comm_join_f pompi_comm_join_f -#define ompi_comm_rank_f pompi_comm_rank_f -#define ompi_comm_remote_group_f pompi_comm_remote_group_f -#define ompi_comm_remote_size_f pompi_comm_remote_size_f -#define ompi_comm_set_attr_f pompi_comm_set_attr_f -#define ompi_comm_set_info_f pompi_comm_set_info_f -#define ompi_comm_set_errhandler_f pompi_comm_set_errhandler_f -#define ompi_comm_set_name_f pompi_comm_set_name_f -#define ompi_comm_size_f pompi_comm_size_f -#define ompi_comm_spawn_f pompi_comm_spawn_f -#define ompi_comm_spawn_multiple_f pompi_comm_spawn_multiple_f -#define ompi_comm_split_f pompi_comm_split_f -#define ompi_comm_split_type_f pompi_comm_split_type_f -#define ompi_comm_test_inter_f pompi_comm_test_inter_f -#define ompi_compare_and_swap_f pompi_compare_and_swap_f -#define ompi_dims_create_f pompi_dims_create_f -#define ompi_dist_graph_create_f pompi_dist_graph_create_f -#define ompi_dist_graph_create_adjacent_f pompi_dist_graph_create_adjacent_f -#define ompi_dist_graph_neighbors_f pompi_dist_graph_neighbors_f -#define ompi_dist_graph_neighbors_count_f pompi_dist_graph_neighbors_count_f -#define ompi_errhandler_create_f pompi_errhandler_create_f -#define ompi_errhandler_free_f pompi_errhandler_free_f -#define ompi_errhandler_get_f pompi_errhandler_get_f -#define ompi_errhandler_set_f pompi_errhandler_set_f -#define ompi_error_class_f pompi_error_class_f -#define ompi_error_string_f pompi_error_string_f -#define ompi_exscan_f pompi_exscan_f -#define ompi_f_sync_reg_f pompi_f_sync_reg_f -#define ompi_fetch_and_op_f pompi_fetch_and_op_f -#define ompi_file_call_errhandler_f pompi_file_call_errhandler_f -#define ompi_file_create_errhandler_f pompi_file_create_errhandler_f -#define ompi_file_set_errhandler_f pompi_file_set_errhandler_f -#define ompi_file_get_errhandler_f pompi_file_get_errhandler_f -#define ompi_file_open_f pompi_file_open_f -#define ompi_file_close_f pompi_file_close_f -#define ompi_file_delete_f pompi_file_delete_f -#define ompi_file_set_size_f pompi_file_set_size_f -#define ompi_file_preallocate_f pompi_file_preallocate_f -#define ompi_file_get_size_f pompi_file_get_size_f -#define ompi_file_get_group_f pompi_file_get_group_f -#define ompi_file_get_amode_f pompi_file_get_amode_f -#define ompi_file_set_info_f pompi_file_set_info_f -#define ompi_file_get_info_f pompi_file_get_info_f -#define ompi_file_set_view_f pompi_file_set_view_f -#define ompi_file_get_view_f pompi_file_get_view_f -#define ompi_file_read_at_f pompi_file_read_at_f -#define ompi_file_read_at_all_f pompi_file_read_at_all_f -#define ompi_file_write_at_f pompi_file_write_at_f -#define ompi_file_write_at_all_f pompi_file_write_at_all_f -#define ompi_file_iread_at_f pompi_file_iread_at_f -#define ompi_file_iwrite_at_all_f pompi_file_iwrite_at_all_f -#define ompi_file_iread_at_all_f pompi_file_iread_at_all_f -#define ompi_file_iwrite_at_f pompi_file_iwrite_at_f -#define ompi_file_read_f pompi_file_read_f -#define ompi_file_read_all_f pompi_file_read_all_f -#define ompi_file_write_f pompi_file_write_f -#define ompi_file_write_all_f pompi_file_write_all_f -#define ompi_file_iread_f pompi_file_iread_f -#define ompi_file_iwrite_all_f pompi_file_iwrite_all_f -#define ompi_file_iread_all_f pompi_file_iread_all_f -#define ompi_file_iwrite_f pompi_file_iwrite_f -#define ompi_file_seek_f pompi_file_seek_f -#define ompi_file_get_position_f pompi_file_get_position_f -#define ompi_file_get_byte_offset_f pompi_file_get_byte_offset_f -#define ompi_file_read_shared_f pompi_file_read_shared_f -#define ompi_file_write_shared_f pompi_file_write_shared_f -#define ompi_file_iread_shared_f pompi_file_iread_shared_f -#define ompi_file_iwrite_shared_f pompi_file_iwrite_shared_f -#define ompi_file_read_ordered_f pompi_file_read_ordered_f -#define ompi_file_write_ordered_f pompi_file_write_ordered_f -#define ompi_file_seek_shared_f pompi_file_seek_shared_f -#define ompi_file_get_position_shared_f pompi_file_get_position_shared_f -#define ompi_file_read_at_all_begin_f pompi_file_read_at_all_begin_f -#define ompi_file_read_at_all_end_f pompi_file_read_at_all_end_f -#define ompi_file_write_at_all_begin_f pompi_file_write_at_all_begin_f -#define ompi_file_write_at_all_end_f pompi_file_write_at_all_end_f -#define ompi_file_read_all_begin_f pompi_file_read_all_begin_f -#define ompi_file_read_all_end_f pompi_file_read_all_end_f -#define ompi_file_write_all_begin_f pompi_file_write_all_begin_f -#define ompi_file_write_all_end_f pompi_file_write_all_end_f -#define ompi_file_read_ordered_begin_f pompi_file_read_ordered_begin_f -#define ompi_file_read_ordered_end_f pompi_file_read_ordered_end_f -#define ompi_file_write_ordered_begin_f pompi_file_write_ordered_begin_f -#define ompi_file_write_ordered_end_f pompi_file_write_ordered_end_f -#define ompi_file_get_type_extent_f pompi_file_get_type_extent_f -#define ompi_file_set_atomicity_f pompi_file_set_atomicity_f -#define ompi_file_get_atomicity_f pompi_file_get_atomicity_f -#define ompi_file_sync_f pompi_file_sync_f -#define ompi_finalize_f pompi_finalize_f -#define ompi_finalized_f pompi_finalized_f -#define ompi_free_mem_f pompi_free_mem_f -#define ompi_gather_f pompi_gather_f -#define ompi_gatherv_f pompi_gatherv_f -#define ompi_get_address_f pompi_get_address_f -#define ompi_get_count_f pompi_get_count_f -#define ompi_get_elements_f pompi_get_elements_f -#define ompi_get_elements_x_f pompi_get_elements_x_f -#define ompi_get_f pompi_get_f -#define ompi_get_accumulate_f pompi_get_accumulate_f -#define ompi_get_library_version_f pompi_get_library_version_f -#define ompi_get_processor_name_f pompi_get_processor_name_f -#define ompi_get_version_f pompi_get_version_f -#define ompi_graph_create_f pompi_graph_create_f -#define ompi_graph_get_f pompi_graph_get_f -#define ompi_graph_map_f pompi_graph_map_f -#define ompi_graph_neighbors_count_f pompi_graph_neighbors_count_f -#define ompi_graph_neighbors_f pompi_graph_neighbors_f -#define ompi_graphdims_get_f pompi_graphdims_get_f -#define ompi_grequest_complete_f pompi_grequest_complete_f -#define ompi_grequest_start_f pompi_grequest_start_f -#define ompi_group_compare_f pompi_group_compare_f -#define ompi_group_difference_f pompi_group_difference_f -#define ompi_group_excl_f pompi_group_excl_f -#define ompi_group_free_f pompi_group_free_f -#define ompi_group_incl_f pompi_group_incl_f -#define ompi_group_intersection_f pompi_group_intersection_f -#define ompi_group_range_excl_f pompi_group_range_excl_f -#define ompi_group_range_incl_f pompi_group_range_incl_f -#define ompi_group_rank_f pompi_group_rank_f -#define ompi_group_size_f pompi_group_size_f -#define ompi_group_translate_ranks_f pompi_group_translate_ranks_f -#define ompi_group_union_f pompi_group_union_f -#define ompi_iallgather_f pompi_iallgather_f -#define ompi_iallgatherv_f pompi_iallgatherv_f -#define ompi_iallgather_f pompi_iallgather_f -#define ompi_iallreduce_f pompi_iallreduce_f -#define ompi_ialltoall_f pompi_ialltoall_f -#define ompi_ialltoallv_f pompi_ialltoallv_f -#define ompi_ialltoallw_f pompi_ialltoallw_f -#define ompi_ibarrier_f pompi_ibarrier_f -#define ompi_ibcast_f pompi_ibcast_f -#define ompi_ibsend_f pompi_ibsend_f -#define ompi_iexscan_f pompi_iexscan_f -#define ompi_igather_f pompi_igather_f -#define ompi_igatherv_f pompi_igatherv_f -#define ompi_improbe_f pompi_improbe_f -#define ompi_imrecv_f pompi_imrecv_f -#define ompi_ineighbor_allgather_f pompi_ineighbor_allgather_f -#define ompi_ineighbor_allgatherv_f pompi_ineighbor_allgatherv_f -#define ompi_ineighbor_alltoall_f pompi_ineighbor_alltoall_f -#define ompi_ineighbor_alltoallv_f pompi_ineighbor_alltoallv_f -#define ompi_ineighbor_alltoallw_f pompi_ineighbor_alltoallw_f -#define ompi_ireduce_f pompi_ireduce_f -#define ompi_ireduce_scatter_f pompi_ireduce_scatter_f -#define ompi_ireduce_scatter_block_f pompi_ireduce_scatter_block_f -#define ompi_iscan_f pompi_iscan_f -#define ompi_iscatter_f pompi_iscatter_f -#define ompi_iscatterv_f pompi_iscatterv_f -#define ompi_info_create_f pompi_info_create_f -#define ompi_info_delete_f pompi_info_delete_f -#define ompi_info_dup_f pompi_info_dup_f -#define ompi_info_free_f pompi_info_free_f -#define ompi_info_get_f pompi_info_get_f -#define ompi_info_get_nkeys_f pompi_info_get_nkeys_f -#define ompi_info_get_nthkey_f pompi_info_get_nthkey_f -#define ompi_info_get_valuelen_f pompi_info_get_valuelen_f -#define ompi_info_set_f pompi_info_set_f -#define ompi_init_f pompi_init_f -#define ompi_initialized_f pompi_initialized_f -#define ompi_init_thread_f pompi_init_thread_f -#define ompi_intercomm_create_f pompi_intercomm_create_f -#define ompi_intercomm_merge_f pompi_intercomm_merge_f -#define ompi_iprobe_f pompi_iprobe_f -#define ompi_irecv_f pompi_irecv_f -#define ompi_irsend_f pompi_irsend_f -#define ompi_isend_f pompi_isend_f -#define ompi_issend_f pompi_issend_f -#define ompi_is_thread_main_f pompi_is_thread_main_f -#define ompi_keyval_create_f pompi_keyval_create_f -#define ompi_keyval_free_f pompi_keyval_free_f -#define ompi_lookup_name_f pompi_lookup_name_f -#define ompi_mprobe_f pompi_mprobe_f -#define ompi_mrecv_f pompi_mrecv_f -#define ompi_neighbor_allgather_f pompi_neighbor_allgather_f -#define ompi_neighbor_allgatherv_f pompi_neighbor_allgatherv_f -#define ompi_neighbor_alltoall_f pompi_neighbor_alltoall_f -#define ompi_neighbor_alltoallv_f pompi_neighbor_alltoallv_f -#define ompi_neighbor_alltoallw_f pompi_neighbor_alltoallw_f -#define ompi_op_commutative_f pompi_op_commutative_f -#define ompi_op_create_f pompi_op_create_f -#define ompi_open_port_f pompi_open_port_f -#define ompi_op_free_f pompi_op_free_f -#define ompi_pack_external_f pompi_pack_external_f -#define ompi_pack_external_size_f pompi_pack_external_size_f -#define ompi_pack_f pompi_pack_f -#define ompi_pack_size_f pompi_pack_size_f -#define ompi_pcontrol_f pompi_pcontrol_f -#define ompi_probe_f pompi_probe_f -#define ompi_publish_name_f pompi_publish_name_f -#define ompi_put_f pompi_put_f -#define ompi_query_thread_f pompi_query_thread_f -#define ompi_raccumulate_f pompi_raccumulate_f -#define ompi_recv_init_f pompi_recv_init_f -#define ompi_recv_f pompi_recv_f -#define ompi_reduce_f pompi_reduce_f -#define ompi_reduce_local_f pompi_reduce_local_f -#define ompi_reduce_scatter_f pompi_reduce_scatter_f -#define ompi_reduce_scatter_block_f pompi_reduce_scatter_block_f -#define ompi_register_datarep_f pompi_register_datarep_f -#define ompi_request_free_f pompi_request_free_f -#define ompi_request_get_status_f pompi_request_get_status_f -#define ompi_rget_f pompi_rget_f -#define ompi_rget_accumulate_f pompi_rget_accumulate_f -#define ompi_rput_f pompi_rput_f -#define ompi_rsend_f pompi_rsend_f -#define ompi_rsend_init_f pompi_rsend_init_f -#define ompi_scan_f pompi_scan_f -#define ompi_scatter_f pompi_scatter_f -#define ompi_scatterv_f pompi_scatterv_f -#define ompi_send_init_f pompi_send_init_f -#define ompi_send_f pompi_send_f -#define ompi_sendrecv_f pompi_sendrecv_f -#define ompi_sendrecv_replace_f pompi_sendrecv_replace_f -#define ompi_ssend_init_f pompi_ssend_init_f -#define ompi_ssend_f pompi_ssend_f -#define ompi_start_f pompi_start_f -#define ompi_startall_f pompi_startall_f -#define ompi_status_set_cancelled_f pompi_status_set_cancelled_f -#define ompi_status_set_elements_f pompi_status_set_elements_f -#define ompi_status_set_elements_x_f pompi_status_set_elements_x_f -#define ompi_testall_f pompi_testall_f -#define ompi_testany_f pompi_testany_f -#define ompi_test_f pompi_test_f -#define ompi_test_cancelled_f pompi_test_cancelled_f -#define ompi_testsome_f pompi_testsome_f -#define ompi_topo_test_f pompi_topo_test_f -#define ompi_type_commit_f pompi_type_commit_f -#define ompi_type_contiguous_f pompi_type_contiguous_f -#define ompi_type_create_darray_f pompi_type_create_darray_f -#define ompi_type_create_f90_complex_f pompi_type_create_f90_complex_f -#define ompi_type_create_f90_integer_f pompi_type_create_f90_integer_f -#define ompi_type_create_f90_real_f pompi_type_create_f90_real_f -#define ompi_type_create_hindexed_f pompi_type_create_hindexed_f -#define ompi_type_create_hvector_f pompi_type_create_hvector_f -#define ompi_type_create_keyval_f pompi_type_create_keyval_f -#define ompi_type_create_indexed_block_f pompi_type_create_indexed_block_f -#define ompi_type_create_hindexed_block_f pompi_type_create_hindexed_block_f -#define ompi_type_create_struct_f pompi_type_create_struct_f -#define ompi_type_create_subarray_f pompi_type_create_subarray_f -#define ompi_type_create_resized_f pompi_type_create_resized_f -#define ompi_type_delete_attr_f pompi_type_delete_attr_f -#define ompi_type_dup_f pompi_type_dup_f -#define ompi_type_extent_f pompi_type_extent_f -#define ompi_type_free_f pompi_type_free_f -#define ompi_type_free_keyval_f pompi_type_free_keyval_f -#define ompi_type_get_attr_f pompi_type_get_attr_f -#define ompi_type_get_contents_f pompi_type_get_contents_f -#define ompi_type_get_envelope_f pompi_type_get_envelope_f -#define ompi_type_get_extent_f pompi_type_get_extent_f -#define ompi_type_get_extent_x_f pompi_type_get_extent_x_f -#define ompi_type_get_name_f pompi_type_get_name_f -#define ompi_type_get_true_extent_f pompi_type_get_true_extent_f -#define ompi_type_get_true_extent_x_f pompi_type_get_true_extent_x_f -#define ompi_type_hindexed_f pompi_type_hindexed_f -#define ompi_type_hvector_f pompi_type_hvector_f -#define ompi_type_indexed_f pompi_type_indexed_f -#define ompi_type_lb_f pompi_type_lb_f -#define ompi_type_match_size_f pompi_type_match_size_f -#define ompi_type_set_attr_f pompi_type_set_attr_f -#define ompi_type_set_name_f pompi_type_set_name_f -#define ompi_type_size_f pompi_type_size_f -#define ompi_type_size_x_f pompi_type_size_x_f -#define ompi_type_struct_f pompi_type_struct_f -#define ompi_type_ub_f pompi_type_ub_f -#define ompi_type_vector_f pompi_type_vector_f -#define ompi_unpack_f pompi_unpack_f -#define ompi_unpublish_name_f pompi_unpublish_name_f -#define ompi_unpack_external_f pompi_unpack_external_f -#define ompi_waitall_f pompi_waitall_f -#define ompi_waitany_f pompi_waitany_f -#define ompi_wait_f pompi_wait_f -#define ompi_waitsome_f pompi_waitsome_f -#define ompi_win_allocate_f pompi_win_allocate_f -#define ompi_win_allocate_cptr_f pompi_win_allocate_cptr_f -#define ompi_win_allocate_shared_f pompi_win_allocate_shared_f -#define ompi_win_allocate_shared_cptr_f pompi_win_allocate_shared_cptr_f -#define ompi_win_attach_f pompi_win_attach_f -#define ompi_win_call_errhandler_f pompi_win_call_errhandler_f -#define ompi_win_complete_f pompi_win_complete_f -#define ompi_win_create_f pompi_win_create_f -#define ompi_win_create_dynamic_f pompi_win_create_dynamic_f -#define ompi_win_create_errhandler_f pompi_win_create_errhandler_f -#define ompi_win_create_keyval_f pompi_win_create_keyval_f -#define ompi_win_delete_attr_f pompi_win_delete_attr_f -#define ompi_win_detach_f pompi_win_detach_f -#define ompi_win_fence_f pompi_win_fence_f -#define ompi_win_flush_f pompi_win_flush_f -#define ompi_win_flush_all_f pompi_win_flush_all_f -#define ompi_win_flush_local_f pompi_win_flush_local_f -#define ompi_win_flush_local_all_f pompi_win_flush_local_all_f -#define ompi_win_free_f pompi_win_free_f -#define ompi_win_free_keyval_f pompi_win_free_keyval_f -#define ompi_win_get_attr_f pompi_win_get_attr_f -#define ompi_win_get_errhandler_f pompi_win_get_errhandler_f -#define ompi_win_get_group_f pompi_win_get_group_f -#define ompi_win_get_info_f pompi_win_get_info_f -#define ompi_win_get_name_f pompi_win_get_name_f -#define ompi_win_lock_f pompi_win_lock_f -#define ompi_win_lock_all_f pompi_win_lock_all_f -#define ompi_win_post_f pompi_win_post_f -#define ompi_win_set_attr_f pompi_win_set_attr_f -#define ompi_win_set_errhandler_f pompi_win_set_errhandler_f -#define ompi_win_set_info_f pompi_win_set_info_f -#define ompi_win_set_name_f pompi_win_set_name_f -#define ompi_win_shared_query_f pompi_win_shared_query_f -#define ompi_win_shared_query_cptr_f pompi_win_shared_query_cptr_f -#define ompi_win_start_f pompi_win_start_f -#define ompi_win_sync_f pompi_win_sync_f -#define ompi_win_test_f pompi_win_test_f -#define ompi_win_unlock_f pompi_win_unlock_f -#define ompi_win_unlock_all_f pompi_win_unlock_all_f -#define ompi_win_wait_f pompi_win_wait_f -#define ompi_wtick_f pompi_wtick_f -#define ompi_wtime_f pompi_wtime_f -#endif - diff --git a/ompi/mpi/fortran/mpif-h/publish_name_f.c b/ompi/mpi/fortran/mpif-h/publish_name_f.c index 195ab169e5..703fb57468 100644 --- a/ompi/mpi/fortran/mpif-h/publish_name_f.c +++ b/ompi/mpi/fortran/mpif-h/publish_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUBLISH_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_publish_name_f pompi_publish_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Publish_name PMPI_Publish_name #endif void ompi_publish_name_f(char *service_name, MPI_Fint *info, diff --git a/ompi/mpi/fortran/mpif-h/put_f.c b/ompi/mpi/fortran/mpif-h/put_f.c index 54b947e0bb..898876ec7c 100644 --- a/ompi/mpi/fortran/mpif-h/put_f.c +++ b/ompi/mpi/fortran/mpif-h/put_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_put_f pompi_put_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Put PMPI_Put #endif void ompi_put_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/query_thread_f.c b/ompi/mpi/fortran/mpif-h/query_thread_f.c index 118eca12b7..8bde78c1bd 100644 --- a/ompi/mpi/fortran/mpif-h/query_thread_f.c +++ b/ompi/mpi/fortran/mpif-h/query_thread_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_QUERY_THREAD, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_query_thread_f pompi_query_thread_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Query_thread PMPI_Query_thread #endif void ompi_query_thread_f(MPI_Fint *provided, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/raccumulate_f.c b/ompi/mpi/fortran/mpif-h/raccumulate_f.c index 0595d06bf5..f2b26eda7f 100644 --- a/ompi/mpi/fortran/mpif-h/raccumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/raccumulate_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RACCUMULATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_raccumulate_f pompi_raccumulate_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Raccumulate PMPI_Raccumulate #endif void ompi_raccumulate_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/recv_f.c b/ompi/mpi/fortran/mpif-h/recv_f.c index 569ba0899f..b7ee171eda 100644 --- a/ompi/mpi/fortran/mpif-h/recv_f.c +++ b/ompi/mpi/fortran/mpif-h/recv_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_recv_f pompi_recv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Recv PMPI_Recv #endif void ompi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/recv_init_f.c b/ompi/mpi/fortran/mpif-h/recv_init_f.c index ab68f59efb..593f29df4e 100644 --- a/ompi/mpi/fortran/mpif-h/recv_init_f.c +++ b/ompi/mpi/fortran/mpif-h/recv_init_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_recv_init_f pompi_recv_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Recv_init PMPI_Recv_init #endif void ompi_recv_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/reduce_f.c b/ompi/mpi/fortran/mpif-h/reduce_f.c index be3c086da6..d8235bce6e 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_reduce_f pompi_reduce_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Reduce PMPI_Reduce #endif void ompi_reduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/reduce_local_f.c b/ompi/mpi/fortran/mpif-h/reduce_local_f.c index e74229c36d..0003d7c4c5 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_local_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_local_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_LOCAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_reduce_local_f pompi_reduce_local_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Reduce_local PMPI_Reduce_local #endif void ompi_reduce_local_f(char *inbuf, char *inoutbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c b/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c index 090cbb838e..8479219ae1 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_SCATTER_BLOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_reduce_scatter_block_f pompi_reduce_scatter_block_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Reduce_scatter_block PMPI_Reduce_scatter_block #endif void ompi_reduce_scatter_block_f(char *sendbuf, char *recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c b/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c index a730bac9a1..e3ff3c23ed 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_SCATTER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_reduce_scatter_f pompi_reduce_scatter_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Reduce_scatter PMPI_Reduce_scatter #endif void ompi_reduce_scatter_f(char *sendbuf, char *recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/register_datarep_f.c b/ompi/mpi/fortran/mpif-h/register_datarep_f.c index 1a28da27a6..3f9fe7dda8 100644 --- a/ompi/mpi/fortran/mpif-h/register_datarep_f.c +++ b/ompi/mpi/fortran/mpif-h/register_datarep_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -69,7 +71,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REGISTER_DATAREP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_register_datarep_f pompi_register_datarep_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Register_datarep PMPI_Register_datarep #endif static const char FUNC_NAME[] = "MPI_REGISTER_DATAREP"; diff --git a/ompi/mpi/fortran/mpif-h/request_free_f.c b/ompi/mpi/fortran/mpif-h/request_free_f.c index c0597d071b..028b6c5256 100644 --- a/ompi/mpi/fortran/mpif-h/request_free_f.c +++ b/ompi/mpi/fortran/mpif-h/request_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_request_free_f pompi_request_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Request_free PMPI_Request_free #endif void ompi_request_free_f(MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/request_get_status_f.c b/ompi/mpi/fortran/mpif-h/request_get_status_f.c index a8d59d28d7..82ddb3c5c8 100644 --- a/ompi/mpi/fortran/mpif-h/request_get_status_f.c +++ b/ompi/mpi/fortran/mpif-h/request_get_status_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_GET_STATUS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_request_get_status_f pompi_request_get_status_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Request_get_status PMPI_Request_get_status #endif void ompi_request_get_status_f(MPI_Fint *request, ompi_fortran_logical_t *flag, diff --git a/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c b/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c index 5212c6c781..2a88848569 100644 --- a/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c @@ -14,6 +14,8 @@ * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 FUJITSU LIMITED. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -67,7 +69,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RGET_ACCUMULATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_rget_accumulate_f pompi_rget_accumulate_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Rget_accumulate PMPI_Rget_accumulate #endif void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/rget_f.c b/ompi/mpi/fortran/mpif-h/rget_f.c index 833986117a..e338f948fe 100644 --- a/ompi/mpi/fortran/mpif-h/rget_f.c +++ b/ompi/mpi/fortran/mpif-h/rget_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RGET, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_rget_f pompi_rget_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Rget PMPI_Rget #endif void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/rput_f.c b/ompi/mpi/fortran/mpif-h/rput_f.c index 395486c15b..2593770511 100644 --- a/ompi/mpi/fortran/mpif-h/rput_f.c +++ b/ompi/mpi/fortran/mpif-h/rput_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -66,7 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RPUT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_rput_f pompi_rput_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Rput PMPI_Rput #endif void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count, diff --git a/ompi/mpi/fortran/mpif-h/rsend_f.c b/ompi/mpi/fortran/mpif-h/rsend_f.c index 769d9a58f8..a8a2536d75 100644 --- a/ompi/mpi/fortran/mpif-h/rsend_f.c +++ b/ompi/mpi/fortran/mpif-h/rsend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_rsend_f pompi_rsend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Rsend PMPI_Rsend #endif void ompi_rsend_f(char *ibuf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/rsend_init_f.c b/ompi/mpi/fortran/mpif-h/rsend_init_f.c index 94922965e9..8f396b0dd8 100644 --- a/ompi/mpi/fortran/mpif-h/rsend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/rsend_init_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_rsend_init_f pompi_rsend_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Rsend_init PMPI_Rsend_init #endif void ompi_rsend_init_f(char *buf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/scan_f.c b/ompi/mpi/fortran/mpif-h/scan_f.c index 63327649f5..65c1057b15 100644 --- a/ompi/mpi/fortran/mpif-h/scan_f.c +++ b/ompi/mpi/fortran/mpif-h/scan_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCAN, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_scan_f pompi_scan_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Scan PMPI_Scan #endif void ompi_scan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, diff --git a/ompi/mpi/fortran/mpif-h/scatter_f.c b/ompi/mpi/fortran/mpif-h/scatter_f.c index f8df4bf101..6bcb297001 100644 --- a/ompi/mpi/fortran/mpif-h/scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/scatter_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_scatter_f pompi_scatter_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Scatter PMPI_Scatter #endif void ompi_scatter_f(char *sendbuf, MPI_Fint *sendcount, diff --git a/ompi/mpi/fortran/mpif-h/scatterv_f.c b/ompi/mpi/fortran/mpif-h/scatterv_f.c index 95a0081a1d..228593e35d 100644 --- a/ompi/mpi/fortran/mpif-h/scatterv_f.c +++ b/ompi/mpi/fortran/mpif-h/scatterv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTERV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_scatterv_f pompi_scatterv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Scatterv PMPI_Scatterv #endif void ompi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts, diff --git a/ompi/mpi/fortran/mpif-h/send_f.c b/ompi/mpi/fortran/mpif-h/send_f.c index 7a80aaaacb..8e83a27b37 100644 --- a/ompi/mpi/fortran/mpif-h/send_f.c +++ b/ompi/mpi/fortran/mpif-h/send_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_send_f pompi_send_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Send PMPI_Send #endif void ompi_send_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/send_init_f.c b/ompi/mpi/fortran/mpif-h/send_init_f.c index b4358c28d0..1262da58ed 100644 --- a/ompi/mpi/fortran/mpif-h/send_init_f.c +++ b/ompi/mpi/fortran/mpif-h/send_init_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_send_init_f pompi_send_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Send_init PMPI_Send_init #endif void ompi_send_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/sendrecv_f.c b/ompi/mpi/fortran/mpif-h/sendrecv_f.c index 5854dc3213..f63ee46d61 100644 --- a/ompi/mpi/fortran/mpif-h/sendrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/sendrecv_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_sendrecv_f pompi_sendrecv_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Sendrecv PMPI_Sendrecv #endif void ompi_sendrecv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, diff --git a/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c b/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c index d718a0c1b5..2f438fefa0 100644 --- a/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c +++ b/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV_REPLACE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_sendrecv_replace_f pompi_sendrecv_replace_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Sendrecv_replace PMPI_Sendrecv_replace #endif void ompi_sendrecv_replace_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/ssend_f.c b/ompi/mpi/fortran/mpif-h/ssend_f.c index b8dbe637d5..90ab16eda7 100644 --- a/ompi/mpi/fortran/mpif-h/ssend_f.c +++ b/ompi/mpi/fortran/mpif-h/ssend_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ssend_f pompi_ssend_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ssend PMPI_Ssend #endif void ompi_ssend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/ssend_init_f.c b/ompi/mpi/fortran/mpif-h/ssend_init_f.c index f937571830..6108357384 100644 --- a/ompi/mpi/fortran/mpif-h/ssend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/ssend_init_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND_INIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_ssend_init_f pompi_ssend_init_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Ssend_init PMPI_Ssend_init #endif void ompi_ssend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/start_f.c b/ompi/mpi/fortran/mpif-h/start_f.c index 34b21eceb4..cde2e601be 100644 --- a/ompi/mpi/fortran/mpif-h/start_f.c +++ b/ompi/mpi/fortran/mpif-h/start_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_START, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_start_f pompi_start_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Start PMPI_Start #endif void ompi_start_f(MPI_Fint *request, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/startall_f.c b/ompi/mpi/fortran/mpif-h/startall_f.c index b4814f0f2f..76d86a47b4 100644 --- a/ompi/mpi/fortran/mpif-h/startall_f.c +++ b/ompi/mpi/fortran/mpif-h/startall_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STARTALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_startall_f pompi_startall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Startall PMPI_Startall #endif static const char FUNC_NAME[] = "MPI_STARTALL"; diff --git a/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c b/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c index ca35c9aa98..48d1cc3ed8 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_CANCELLED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_status_set_cancelled_f pompi_status_set_cancelled_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Status_set_cancelled PMPI_Status_set_cancelled #endif void ompi_status_set_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/status_set_elements_f.c b/ompi/mpi/fortran/mpif-h/status_set_elements_f.c index 780d83ed32..cd14b57c96 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_elements_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_elements_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_status_set_elements_f pompi_status_set_elements_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Status_set_elements PMPI_Status_set_elements #endif void ompi_status_set_elements_f(MPI_Fint *status, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c b/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c index 80be451a19..4dbd7de602 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS_X, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_status_set_elements_x_f pompi_status_set_elements_x_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Status_set_elements_x PMPI_Status_set_elements_x #endif void ompi_status_set_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, diff --git a/ompi/mpi/fortran/mpif-h/test_cancelled_f.c b/ompi/mpi/fortran/mpif-h/test_cancelled_f.c index 8bda5515c7..5fa654b019 100644 --- a/ompi/mpi/fortran/mpif-h/test_cancelled_f.c +++ b/ompi/mpi/fortran/mpif-h/test_cancelled_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST_CANCELLED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_test_cancelled_f pompi_test_cancelled_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Test_cancelled PMPI_Test_cancelled #endif void ompi_test_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/test_f.c b/ompi/mpi/fortran/mpif-h/test_f.c index 92f7f6a1b0..179a4153e3 100644 --- a/ompi/mpi/fortran/mpif-h/test_f.c +++ b/ompi/mpi/fortran/mpif-h/test_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_test_f pompi_test_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Test PMPI_Test #endif void ompi_test_f(MPI_Fint *request, ompi_fortran_logical_t *flag, diff --git a/ompi/mpi/fortran/mpif-h/testall_f.c b/ompi/mpi/fortran/mpif-h/testall_f.c index 2fc285b503..5d7d8717f7 100644 --- a/ompi/mpi/fortran/mpif-h/testall_f.c +++ b/ompi/mpi/fortran/mpif-h/testall_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_testall_f pompi_testall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Testall PMPI_Testall #endif static const char FUNC_NAME[] = "MPI_TESTALL"; diff --git a/ompi/mpi/fortran/mpif-h/testany_f.c b/ompi/mpi/fortran/mpif-h/testany_f.c index 95e73c1718..9a5835c6ea 100644 --- a/ompi/mpi/fortran/mpif-h/testany_f.c +++ b/ompi/mpi/fortran/mpif-h/testany_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTANY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_testany_f pompi_testany_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Testany PMPI_Testany #endif static const char FUNC_NAME[] = "MPI_TESTANY"; diff --git a/ompi/mpi/fortran/mpif-h/testsome_f.c b/ompi/mpi/fortran/mpif-h/testsome_f.c index 05f6635701..c2948d7b90 100644 --- a/ompi/mpi/fortran/mpif-h/testsome_f.c +++ b/ompi/mpi/fortran/mpif-h/testsome_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTSOME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_testsome_f pompi_testsome_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Testsome PMPI_Testsome #endif static const char FUNC_NAME[] = "MPI_TESTSOME"; diff --git a/ompi/mpi/fortran/mpif-h/topo_test_f.c b/ompi/mpi/fortran/mpif-h/topo_test_f.c index 69f04f2c93..e07e5daa01 100644 --- a/ompi/mpi/fortran/mpif-h/topo_test_f.c +++ b/ompi/mpi/fortran/mpif-h/topo_test_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TOPO_TEST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_topo_test_f pompi_topo_test_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Topo_test PMPI_Topo_test #endif void ompi_topo_test_f(MPI_Fint *comm, MPI_Fint *topo_type, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_commit_f.c b/ompi/mpi/fortran/mpif-h/type_commit_f.c index cb32ebffb3..c1b472fa38 100644 --- a/ompi/mpi/fortran/mpif-h/type_commit_f.c +++ b/ompi/mpi/fortran/mpif-h/type_commit_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_COMMIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_commit_f pompi_type_commit_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_commit PMPI_Type_commit #endif void ompi_type_commit_f(MPI_Fint *type, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_contiguous_f.c b/ompi/mpi/fortran/mpif-h/type_contiguous_f.c index 1dcff9beca..b92e7a2b74 100644 --- a/ompi/mpi/fortran/mpif-h/type_contiguous_f.c +++ b/ompi/mpi/fortran/mpif-h/type_contiguous_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CONTIGUOUS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_contiguous_f pompi_type_contiguous_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_contiguous PMPI_Type_contiguous #endif void ompi_type_contiguous_f(MPI_Fint *count, MPI_Fint *oldtype, diff --git a/ompi/mpi/fortran/mpif-h/type_create_darray_f.c b/ompi/mpi/fortran/mpif-h/type_create_darray_f.c index 1986335b85..94c5ce537b 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_darray_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_darray_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_DARRAY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_darray_f pompi_type_create_darray_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_darray PMPI_Type_create_darray #endif void ompi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank, diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c index 2f030f82f2..ad03c9f02c 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_COMPLEX, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_f90_complex_f pompi_type_create_f90_complex_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_f90_complex PMPI_Type_create_f90_complex #endif void ompi_type_create_f90_complex_f(MPI_Fint *p, MPI_Fint *r, diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c index 799b1778c4..aa81676299 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_INTEGER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_f90_integer_f pompi_type_create_f90_integer_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_f90_integer PMPI_Type_create_f90_integer #endif void ompi_type_create_f90_integer_f(MPI_Fint *r, MPI_Fint *newtype, diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c index 24aa07a108..8825ec30b5 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_REAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_f90_real_f pompi_type_create_f90_real_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_f90_real PMPI_Type_create_f90_real #endif void ompi_type_create_f90_real_f(MPI_Fint *p, MPI_Fint *r, diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c index 7d2d4642ba..f3b1a05dc4 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c @@ -3,6 +3,8 @@ * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2012 Inria. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -54,7 +56,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED_BLOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_hindexed_block_f pompi_type_create_hindexed_block_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_hindexed_block PMPI_Type_create_hindexed_block #endif void ompi_type_create_hindexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c index 90cf54eba8..9ee9802f5f 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_hindexed_f pompi_type_create_hindexed_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_hindexed PMPI_Type_create_hindexed #endif diff --git a/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c b/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c index eeed7f373a..53206d1eee 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HVECTOR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_hvector_f pompi_type_create_hvector_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_hvector PMPI_Type_create_hvector #endif void ompi_type_create_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, diff --git a/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c b/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c index 117042ff14..0dcedd3ba3 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_INDEXED_BLOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_indexed_block_f pompi_type_create_indexed_block_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_indexed_block PMPI_Type_create_indexed_block #endif void ompi_type_create_indexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, diff --git a/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c index fbbc0cb15f..bb0e910e16 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_keyval_f pompi_type_create_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_keyval PMPI_Type_create_keyval #endif static char FUNC_NAME[] = "MPI_Type_create_keyval_f"; diff --git a/ompi/mpi/fortran/mpif-h/type_create_resized_f.c b/ompi/mpi/fortran/mpif-h/type_create_resized_f.c index d1e570b608..f184287475 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_resized_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_resized_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_RESIZED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_resized_f pompi_type_create_resized_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_resized PMPI_Type_create_resized #endif void ompi_type_create_resized_f(MPI_Fint *oldtype, MPI_Aint *lb, diff --git a/ompi/mpi/fortran/mpif-h/type_create_struct_f.c b/ompi/mpi/fortran/mpif-h/type_create_struct_f.c index 5bac9dec0e..b51d1d1945 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_struct_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_struct_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_STRUCT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_struct_f pompi_type_create_struct_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_struct PMPI_Type_create_struct #endif static const char FUNC_NAME[] = "MPI_TYPE_CREATE_STRUCT"; diff --git a/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c b/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c index c984e0c198..a44c00ba5e 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_SUBARRAY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_create_subarray_f pompi_type_create_subarray_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_create_subarray PMPI_Type_create_subarray #endif void ompi_type_create_subarray_f(MPI_Fint *ndims, MPI_Fint *size_array, diff --git a/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c index 455fcf4469..f407eeb5b1 100644 --- a/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DELETE_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_delete_attr_f pompi_type_delete_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_delete_attr PMPI_Type_delete_attr #endif void ompi_type_delete_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, diff --git a/ompi/mpi/fortran/mpif-h/type_dup_f.c b/ompi/mpi/fortran/mpif-h/type_dup_f.c index ba258cd953..17c4a53387 100644 --- a/ompi/mpi/fortran/mpif-h/type_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/type_dup_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_dup_f pompi_type_dup_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_dup PMPI_Type_dup #endif void ompi_type_dup_f(MPI_Fint *type, MPI_Fint *newtype, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_extent_f.c b/ompi/mpi/fortran/mpif-h/type_extent_f.c index e973a3384b..a3fd383342 100644 --- a/ompi/mpi/fortran/mpif-h/type_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_extent_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_EXTENT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_extent_f pompi_type_extent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_extent PMPI_Type_extent #endif void ompi_type_extent_f(MPI_Fint *type, MPI_Fint *extent, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_free_f.c b/ompi/mpi/fortran/mpif-h/type_free_f.c index 3c7c67792b..f5a2f512c7 100644 --- a/ompi/mpi/fortran/mpif-h/type_free_f.c +++ b/ompi/mpi/fortran/mpif-h/type_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_free_f pompi_type_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_free PMPI_Type_free #endif void ompi_type_free_f(MPI_Fint *type, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c index e2c3b63915..2c43dc7d9e 100644 --- a/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_free_keyval_f pompi_type_free_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_free_keyval PMPI_Type_free_keyval #endif void ompi_type_free_keyval_f(MPI_Fint *type_keyval, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_get_attr_f.c b/ompi/mpi/fortran/mpif-h/type_get_attr_f.c index 61013c754e..f155d93527 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_attr_f pompi_type_get_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_attr PMPI_Type_get_attr #endif void ompi_type_get_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, diff --git a/ompi/mpi/fortran/mpif-h/type_get_contents_f.c b/ompi/mpi/fortran/mpif-h/type_get_contents_f.c index 0fbb9c7715..a3c2e82f36 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_contents_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_contents_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_CONTENTS, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_contents_f pompi_type_get_contents_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_contents PMPI_Type_get_contents #endif static const char FUNC_NAME[] = "MPI_TYPE_GET_CONTENTS"; diff --git a/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c b/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c index afa72bb538..e546352039 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ENVELOPE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_envelope_f pompi_type_get_envelope_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_envelope PMPI_Type_get_envelope #endif void ompi_type_get_envelope_f(MPI_Fint *type, MPI_Fint *num_integers, diff --git a/ompi/mpi/fortran/mpif-h/type_get_extent_f.c b/ompi/mpi/fortran/mpif-h/type_get_extent_f.c index a58e791c37..e3e2bd581b 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_extent_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_EXTENT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_extent_f pompi_type_get_extent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_extent PMPI_Type_get_extent #endif void ompi_type_get_extent_f(MPI_Fint *type, MPI_Aint *lb, diff --git a/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c b/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c index bb4830e02b..6e68f8ea3c 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_EXTENT_X, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_extent_x_f pompi_type_get_extent_x_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_extent_x PMPI_Type_get_extent_x #endif void ompi_type_get_extent_x_f(MPI_Fint *type, MPI_Count *lb, diff --git a/ompi/mpi/fortran/mpif-h/type_get_name_f.c b/ompi/mpi/fortran/mpif-h/type_get_name_f.c index d278981c7f..74f68a172b 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_name_f pompi_type_get_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_name PMPI_Type_get_name #endif void ompi_type_get_name_f(MPI_Fint *type, char *type_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len) diff --git a/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c b/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c index 950da693af..33e088f142 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_TRUE_EXTENT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_true_extent_f pompi_type_get_true_extent_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_true_extent PMPI_Type_get_true_extent #endif void ompi_type_get_true_extent_f(MPI_Fint *datatype, MPI_Aint *true_lb, MPI_Aint *true_extent, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c b/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c index 6193d704b1..936c12bc88 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_TRUE_EXTENT_X, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_get_true_extent_x_f pompi_type_get_true_extent_x_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_get_true_extent_x PMPI_Type_get_true_extent_x #endif void ompi_type_get_true_extent_x_f(MPI_Fint *datatype, MPI_Count *true_lb, MPI_Count *true_extent, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_hindexed_f.c index 3ae070fd56..440a94b43f 100644 --- a/ompi/mpi/fortran/mpif-h/type_hindexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_hindexed_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HINDEXED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_hindexed_f pompi_type_hindexed_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_hindexed PMPI_Type_hindexed #endif static const char FUNC_NAME[] = "MPI_TYPE_HINDEXED"; diff --git a/ompi/mpi/fortran/mpif-h/type_hvector_f.c b/ompi/mpi/fortran/mpif-h/type_hvector_f.c index a52490ea9c..52ad580ef8 100644 --- a/ompi/mpi/fortran/mpif-h/type_hvector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_hvector_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HVECTOR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_hvector_f pompi_type_hvector_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_hvector PMPI_Type_hvector #endif void ompi_type_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, diff --git a/ompi/mpi/fortran/mpif-h/type_indexed_f.c b/ompi/mpi/fortran/mpif-h/type_indexed_f.c index 983390a514..19c669678b 100644 --- a/ompi/mpi/fortran/mpif-h/type_indexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_indexed_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_INDEXED, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_indexed_f pompi_type_indexed_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_indexed PMPI_Type_indexed #endif void ompi_type_indexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, diff --git a/ompi/mpi/fortran/mpif-h/type_lb_f.c b/ompi/mpi/fortran/mpif-h/type_lb_f.c index 6b17e288c8..5ddc05a9eb 100644 --- a/ompi/mpi/fortran/mpif-h/type_lb_f.c +++ b/ompi/mpi/fortran/mpif-h/type_lb_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_LB, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_lb_f pompi_type_lb_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_lb PMPI_Type_lb #endif void ompi_type_lb_f(MPI_Fint *type, MPI_Fint *lb, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_match_size_f.c b/ompi/mpi/fortran/mpif-h/type_match_size_f.c index f391ef55f9..7af1c9a762 100644 --- a/ompi/mpi/fortran/mpif-h/type_match_size_f.c +++ b/ompi/mpi/fortran/mpif-h/type_match_size_f.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -68,7 +70,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_MATCH_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_match_size_f pompi_type_match_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_match_size PMPI_Type_match_size #endif static const char FUNC_NAME[] = "MPI_Type_match_size_f"; diff --git a/ompi/mpi/fortran/mpif-h/type_set_attr_f.c b/ompi/mpi/fortran/mpif-h/type_set_attr_f.c index 4bbfd6f4b3..5f196fb93a 100644 --- a/ompi/mpi/fortran/mpif-h/type_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_set_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_set_attr_f pompi_type_set_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_set_attr PMPI_Type_set_attr #endif void ompi_type_set_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_set_name_f.c b/ompi/mpi/fortran/mpif-h/type_set_name_f.c index bae9a11637..cae4810fcf 100644 --- a/ompi/mpi/fortran/mpif-h/type_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/type_set_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_set_name_f pompi_type_set_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_set_name PMPI_Type_set_name #endif void ompi_type_set_name_f(MPI_Fint *type, char *type_name, MPI_Fint *ierr, diff --git a/ompi/mpi/fortran/mpif-h/type_size_f.c b/ompi/mpi/fortran/mpif-h/type_size_f.c index c2b429b451..2cee767f3f 100644 --- a/ompi/mpi/fortran/mpif-h/type_size_f.c +++ b/ompi/mpi/fortran/mpif-h/type_size_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SIZE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_size_f pompi_type_size_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_size PMPI_Type_size #endif void ompi_type_size_f(MPI_Fint *type, MPI_Fint *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_size_x_f.c b/ompi/mpi/fortran/mpif-h/type_size_x_f.c index b23867a023..ac707b48e1 100644 --- a/ompi/mpi/fortran/mpif-h/type_size_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_size_x_f.c @@ -12,6 +12,8 @@ * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SIZE_X, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_size_x_f pompi_type_size_x_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_size_x PMPI_Type_size_x #endif void ompi_type_size_x_f(MPI_Fint *type, MPI_Count *size, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_struct_f.c b/ompi/mpi/fortran/mpif-h/type_struct_f.c index cff8a66904..8405db23fb 100644 --- a/ompi/mpi/fortran/mpif-h/type_struct_f.c +++ b/ompi/mpi/fortran/mpif-h/type_struct_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_STRUCT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_struct_f pompi_type_struct_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_struct PMPI_Type_struct #endif static const char FUNC_NAME[] = "MPI_TYPE_STRUCT"; diff --git a/ompi/mpi/fortran/mpif-h/type_ub_f.c b/ompi/mpi/fortran/mpif-h/type_ub_f.c index 061cc94334..e1525069d4 100644 --- a/ompi/mpi/fortran/mpif-h/type_ub_f.c +++ b/ompi/mpi/fortran/mpif-h/type_ub_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_UB, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_ub_f pompi_type_ub_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_ub PMPI_Type_ub #endif void ompi_type_ub_f(MPI_Fint *mtype, MPI_Fint *ub, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/type_vector_f.c b/ompi/mpi/fortran/mpif-h/type_vector_f.c index 3fb6a7c868..0654b07a16 100644 --- a/ompi/mpi/fortran/mpif-h/type_vector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_vector_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_VECTOR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_type_vector_f pompi_type_vector_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Type_vector PMPI_Type_vector #endif void ompi_type_vector_f(MPI_Fint *count, MPI_Fint *blocklength, diff --git a/ompi/mpi/fortran/mpif-h/unpack_external_f.c b/ompi/mpi/fortran/mpif-h/unpack_external_f.c index 4c7edd552c..9deb7bc4f4 100644 --- a/ompi/mpi/fortran/mpif-h/unpack_external_f.c +++ b/ompi/mpi/fortran/mpif-h/unpack_external_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,7 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK_EXTERNAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_unpack_external_f pompi_unpack_external_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Unpack_external PMPI_Unpack_external #endif void ompi_unpack_external_f (char *datarep, char *inbuf, MPI_Aint *insize, diff --git a/ompi/mpi/fortran/mpif-h/unpack_f.c b/ompi/mpi/fortran/mpif-h/unpack_f.c index 40860c5889..05961fb9d1 100644 --- a/ompi/mpi/fortran/mpif-h/unpack_f.c +++ b/ompi/mpi/fortran/mpif-h/unpack_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_unpack_f pompi_unpack_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Unpack PMPI_Unpack #endif void ompi_unpack_f(char *inbuf, MPI_Fint *insize, MPI_Fint *position, diff --git a/ompi/mpi/fortran/mpif-h/unpublish_name_f.c b/ompi/mpi/fortran/mpif-h/unpublish_name_f.c index ffca01bc98..7b6bdbf4e4 100644 --- a/ompi/mpi/fortran/mpif-h/unpublish_name_f.c +++ b/ompi/mpi/fortran/mpif-h/unpublish_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPUBLISH_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_unpublish_name_f pompi_unpublish_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Unpublish_name PMPI_Unpublish_name #endif void ompi_unpublish_name_f(char *service_name, MPI_Fint *info, diff --git a/ompi/mpi/fortran/mpif-h/wait_f.c b/ompi/mpi/fortran/mpif-h/wait_f.c index 4fb940e0b0..a72aaf3ab8 100644 --- a/ompi/mpi/fortran/mpif-h/wait_f.c +++ b/ompi/mpi/fortran/mpif-h/wait_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_wait_f pompi_wait_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Wait PMPI_Wait #endif void ompi_wait_f(MPI_Fint *request, MPI_Fint *status, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/waitall_f.c b/ompi/mpi/fortran/mpif-h/waitall_f.c index ca72acc255..1069732208 100644 --- a/ompi/mpi/fortran/mpif-h/waitall_f.c +++ b/ompi/mpi/fortran/mpif-h/waitall_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_waitall_f pompi_waitall_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Waitall PMPI_Waitall #endif static const char FUNC_NAME[] = "MPI_WAITALL"; diff --git a/ompi/mpi/fortran/mpif-h/waitany_f.c b/ompi/mpi/fortran/mpif-h/waitany_f.c index 5e9ae7b95a..005c691c1c 100644 --- a/ompi/mpi/fortran/mpif-h/waitany_f.c +++ b/ompi/mpi/fortran/mpif-h/waitany_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITANY, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_waitany_f pompi_waitany_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Waitany PMPI_Waitany #endif static const char FUNC_NAME[] = "MPI_WAITANY"; diff --git a/ompi/mpi/fortran/mpif-h/waitsome_f.c b/ompi/mpi/fortran/mpif-h/waitsome_f.c index 006c1b44c1..902d8c1851 100644 --- a/ompi/mpi/fortran/mpif-h/waitsome_f.c +++ b/ompi/mpi/fortran/mpif-h/waitsome_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITSOME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_waitsome_f pompi_waitsome_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Waitsome PMPI_Waitsome #endif static const char FUNC_NAME[] = "MPI_WAITSOME"; diff --git a/ompi/mpi/fortran/mpif-h/win_allocate_f.c b/ompi/mpi/fortran/mpif-h/win_allocate_f.c index 9e956a90d1..3015736332 100644 --- a/ompi/mpi/fortran/mpif-h/win_allocate_f.c +++ b/ompi/mpi/fortran/mpif-h/win_allocate_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -101,7 +103,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ALLOCATE_CPTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_allocate_f pompi_win_allocate_f +#define ompi_win_allocate_cptr_f pompi_win_allocate_cptr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_allocate PMPI_Win_allocate #endif void ompi_win_allocate_f(MPI_Aint *size, MPI_Fint *disp_unit, diff --git a/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c b/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c index 0a5c604bc8..20225f2ead 100644 --- a/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -101,7 +103,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ALLOCATE_SHARED_CPTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_allocate_shared_f pompi_win_allocate_shared_f +#define ompi_win_allocate_shared_cptr_f pompi_win_allocate_shared_cptr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_allocate_shared PMPI_Win_allocate_shared #endif void ompi_win_allocate_shared_f(MPI_Aint *size, MPI_Fint *disp_unit, diff --git a/ompi/mpi/fortran/mpif-h/win_attach_f.c b/ompi/mpi/fortran/mpif-h/win_attach_f.c index 8c9f1efe96..c65413db32 100644 --- a/ompi/mpi/fortran/mpif-h/win_attach_f.c +++ b/ompi/mpi/fortran/mpif-h/win_attach_f.c @@ -52,7 +52,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ATTACH, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_attach_f pompi_win_attach_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_attach PMPI_Win_attach #endif void ompi_win_attach_f(MPI_Fint *win, char *base, MPI_Aint *size, diff --git a/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c index 5f13d6c054..d61e5adbc6 100644 --- a/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CALL_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_call_errhandler_f pompi_win_call_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_call_errhandler PMPI_Win_call_errhandler #endif void ompi_win_call_errhandler_f(MPI_Fint *win, MPI_Fint *errorcode, diff --git a/ompi/mpi/fortran/mpif-h/win_complete_f.c b/ompi/mpi/fortran/mpif-h/win_complete_f.c index cd2f9227c0..b0c5ae70e6 100644 --- a/ompi/mpi/fortran/mpif-h/win_complete_f.c +++ b/ompi/mpi/fortran/mpif-h/win_complete_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_COMPLETE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_complete_f pompi_win_complete_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_complete PMPI_Win_complete #endif void ompi_win_complete_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c b/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c index c5e3834886..edb5e3ce57 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c @@ -52,7 +52,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_DYNAMIC, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_create_dynamic_f pompi_win_create_dynamic_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_create_dynamic PMPI_Win_create_dynamic #endif void ompi_win_create_dynamic_f(MPI_Fint *info, MPI_Fint *comm, MPI_Fint *win, diff --git a/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c index 2a41eaf14a..c831ba81e9 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_create_errhandler_f pompi_win_create_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_create_errhandler PMPI_Win_create_errhandler #endif static const char FUNC_NAME[] = "MPI_WIN_CREATE_ERRHANDLER"; diff --git a/ompi/mpi/fortran/mpif-h/win_create_f.c b/ompi/mpi/fortran/mpif-h/win_create_f.c index d6cdef2bb0..1c1566d35b 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_create_f pompi_win_create_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_create PMPI_Win_create #endif void ompi_win_create_f(char *base, MPI_Aint *size, MPI_Fint *disp_unit, diff --git a/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c index e0ac9fd3f8..a2d6d2513a 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_create_keyval_f pompi_win_create_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_create_keyval PMPI_Win_create_keyval #endif static char FUNC_NAME[] = "MPI_Win_create_keyval"; diff --git a/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c index 9aca7145d5..b0e6121839 100644 --- a/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_DELETE_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_delete_attr_f pompi_win_delete_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_delete_attr PMPI_Win_delete_attr #endif diff --git a/ompi/mpi/fortran/mpif-h/win_detach_f.c b/ompi/mpi/fortran/mpif-h/win_detach_f.c index 76a4e3d66d..bde855033a 100644 --- a/ompi/mpi/fortran/mpif-h/win_detach_f.c +++ b/ompi/mpi/fortran/mpif-h/win_detach_f.c @@ -52,7 +52,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_DETACH, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_detach_f pompi_win_detach_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_detach PMPI_Win_detach #endif void ompi_win_detach_f(MPI_Fint *win, char *base, diff --git a/ompi/mpi/fortran/mpif-h/win_fence_f.c b/ompi/mpi/fortran/mpif-h/win_fence_f.c index ab755da49f..7f3b1df454 100644 --- a/ompi/mpi/fortran/mpif-h/win_fence_f.c +++ b/ompi/mpi/fortran/mpif-h/win_fence_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FENCE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_fence_f pompi_win_fence_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_fence PMPI_Win_fence #endif void ompi_win_fence_f(MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_flush_all_f.c b/ompi/mpi/fortran/mpif-h/win_flush_all_f.c index 945d4abfa8..e5257ed2dd 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_all_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_flush_all_f pompi_win_flush_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_flush_all PMPI_Win_flush_all #endif void ompi_win_flush_all_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_flush_f.c b/ompi/mpi/fortran/mpif-h/win_flush_f.c index a31ed2bc6b..770eba6088 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_flush_f pompi_win_flush_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_flush PMPI_Win_flush #endif void ompi_win_flush_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c b/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c index 3a6ec66b67..d551705310 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_LOCAL_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_flush_local_all_f pompi_win_flush_local_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_flush_local_all PMPI_Win_flush_local_all #endif void ompi_win_flush_local_all_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_flush_local_f.c b/ompi/mpi/fortran/mpif-h/win_flush_local_f.c index 52dc116ed3..1cb9f54153 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_local_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_local_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_LOCAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_flush_local_f pompi_win_flush_local_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_flush_local PMPI_Win_flush_local #endif void ompi_win_flush_local_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_free_f.c b/ompi/mpi/fortran/mpif-h/win_free_f.c index 1b511d8bd4..8b44fed3d8 100644 --- a/ompi/mpi/fortran/mpif-h/win_free_f.c +++ b/ompi/mpi/fortran/mpif-h/win_free_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_free_f pompi_win_free_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_free PMPI_Win_free #endif void ompi_win_free_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c index fb91687bfe..20a09f92a7 100644 --- a/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE_KEYVAL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_free_keyval_f pompi_win_free_keyval_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_free_keyval PMPI_Win_free_keyval #endif void ompi_win_free_keyval_f(MPI_Fint *win_keyval, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_get_attr_f.c b/ompi/mpi/fortran/mpif-h/win_get_attr_f.c index 821c8826c6..39e4c3e602 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_get_attr_f pompi_win_get_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_get_attr PMPI_Win_get_attr #endif void ompi_win_get_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, diff --git a/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c index 620f8a1cf4..e2100a558e 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_get_errhandler_f pompi_win_get_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_get_errhandler PMPI_Win_get_errhandler #endif void ompi_win_get_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler, diff --git a/ompi/mpi/fortran/mpif-h/win_get_group_f.c b/ompi/mpi/fortran/mpif-h/win_get_group_f.c index 2f3c6a8cda..9291c1e579 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_group_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_group_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_GROUP, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_get_group_f pompi_win_get_group_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_get_group PMPI_Win_get_group #endif void ompi_win_get_group_f(MPI_Fint *win, MPI_Fint *group, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_get_info_f.c b/ompi/mpi/fortran/mpif-h/win_get_info_f.c index 511660f80b..33eeb1249d 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_info_f.c @@ -52,7 +52,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_get_info_f pompi_win_get_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_get_info PMPI_Win_get_info #endif void ompi_win_get_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_get_name_f.c b/ompi/mpi/fortran/mpif-h/win_get_name_f.c index 8413560aa2..f26c3caf39 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_get_name_f pompi_win_get_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_get_name PMPI_Win_get_name #endif void ompi_win_get_name_f(MPI_Fint *win, char *win_name, diff --git a/ompi/mpi/fortran/mpif-h/win_lock_all_f.c b/ompi/mpi/fortran/mpif-h/win_lock_all_f.c index fbe1a1b49e..b0c3e3b0ba 100644 --- a/ompi/mpi/fortran/mpif-h/win_lock_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_lock_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_LOCK_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_lock_all_f pompi_win_lock_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_lock_all PMPI_Win_lock_all #endif void ompi_win_lock_all_f(MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_lock_f.c b/ompi/mpi/fortran/mpif-h/win_lock_f.c index 606794fb5c..4c538cc22a 100644 --- a/ompi/mpi/fortran/mpif-h/win_lock_f.c +++ b/ompi/mpi/fortran/mpif-h/win_lock_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_LOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_lock_f pompi_win_lock_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_lock PMPI_Win_lock #endif void ompi_win_lock_f(MPI_Fint *lock_type, MPI_Fint *rank, diff --git a/ompi/mpi/fortran/mpif-h/win_post_f.c b/ompi/mpi/fortran/mpif-h/win_post_f.c index 2273dca0af..a0659ae4ea 100644 --- a/ompi/mpi/fortran/mpif-h/win_post_f.c +++ b/ompi/mpi/fortran/mpif-h/win_post_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_POST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_post_f pompi_win_post_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_post PMPI_Win_post #endif void ompi_win_post_f(MPI_Fint *group, MPI_Fint *assert, diff --git a/ompi/mpi/fortran/mpif-h/win_set_attr_f.c b/ompi/mpi/fortran/mpif-h/win_set_attr_f.c index 4bddbf4afa..01d38e1510 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_attr_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ATTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_set_attr_f pompi_win_set_attr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_set_attr PMPI_Win_set_attr #endif void ompi_win_set_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, diff --git a/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c index d56136e934..9615634781 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,7 +64,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ERRHANDLER, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_set_errhandler_f pompi_win_set_errhandler_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_set_errhandler PMPI_Win_set_errhandler #endif void ompi_win_set_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler, diff --git a/ompi/mpi/fortran/mpif-h/win_set_info_f.c b/ompi/mpi/fortran/mpif-h/win_set_info_f.c index 5640c43af1..5b26aabbda 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_info_f.c @@ -52,7 +52,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_INFO, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_set_info_f pompi_win_set_info_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_set_info PMPI_Win_set_info #endif void ompi_win_set_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_set_name_f.c b/ompi/mpi/fortran/mpif-h/win_set_name_f.c index c5acd66620..c0496547aa 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_name_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,7 +66,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_NAME, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_set_name_f pompi_win_set_name_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_set_name PMPI_Win_set_name #endif void ompi_win_set_name_f(MPI_Fint *win, char *win_name, MPI_Fint *ierr, diff --git a/ompi/mpi/fortran/mpif-h/win_shared_query_f.c b/ompi/mpi/fortran/mpif-h/win_shared_query_f.c index c9db9c8282..5366cc8f7b 100644 --- a/ompi/mpi/fortran/mpif-h/win_shared_query_f.c +++ b/ompi/mpi/fortran/mpif-h/win_shared_query_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -101,7 +103,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SHARED_QUERY_CPTR, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_shared_query_f pompi_win_shared_query_f +#define ompi_win_shared_query_cptr_f pompi_win_shared_query_cptr_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_shared_query PMPI_Win_shared_query #endif void ompi_win_shared_query_f(MPI_Fint *win, MPI_Fint *rank, MPI_Aint *size, diff --git a/ompi/mpi/fortran/mpif-h/win_start_f.c b/ompi/mpi/fortran/mpif-h/win_start_f.c index 13efb3e159..c432e9d1c8 100644 --- a/ompi/mpi/fortran/mpif-h/win_start_f.c +++ b/ompi/mpi/fortran/mpif-h/win_start_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_START, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_start_f pompi_win_start_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_start PMPI_Win_start #endif void ompi_win_start_f(MPI_Fint *group, MPI_Fint *assert, diff --git a/ompi/mpi/fortran/mpif-h/win_sync_f.c b/ompi/mpi/fortran/mpif-h/win_sync_f.c index e86ee2ae3b..b2e520e015 100644 --- a/ompi/mpi/fortran/mpif-h/win_sync_f.c +++ b/ompi/mpi/fortran/mpif-h/win_sync_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SYNC, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_sync_f pompi_win_sync_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_sync PMPI_Win_sync #endif void ompi_win_sync_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_test_f.c b/ompi/mpi/fortran/mpif-h/win_test_f.c index 01f112ad98..1b141db239 100644 --- a/ompi/mpi/fortran/mpif-h/win_test_f.c +++ b/ompi/mpi/fortran/mpif-h/win_test_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_TEST, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_test_f pompi_win_test_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_test PMPI_Win_test #endif void ompi_win_test_f(MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c b/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c index 68adcf3978..e3fc798ef6 100644 --- a/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_UNLOCK_ALL, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_unlock_all_f pompi_win_unlock_all_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_unlock_all PMPI_Win_unlock_all #endif void ompi_win_unlock_all_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_unlock_f.c b/ompi/mpi/fortran/mpif-h/win_unlock_f.c index c932a7eace..c442301013 100644 --- a/ompi/mpi/fortran/mpif-h/win_unlock_f.c +++ b/ompi/mpi/fortran/mpif-h/win_unlock_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_UNLOCK, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_unlock_f pompi_win_unlock_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_unlock PMPI_Win_unlock #endif void ompi_win_unlock_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/win_wait_f.c b/ompi/mpi/fortran/mpif-h/win_wait_f.c index a5f6c92675..78e4b79aa4 100644 --- a/ompi/mpi/fortran/mpif-h/win_wait_f.c +++ b/ompi/mpi/fortran/mpif-h/win_wait_f.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,7 +63,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_WAIT, #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_win_wait_f pompi_win_wait_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Win_wait PMPI_Win_wait #endif void ompi_win_wait_f(MPI_Fint *win, MPI_Fint *ierr) diff --git a/ompi/mpi/fortran/mpif-h/wtick_f.c b/ompi/mpi/fortran/mpif-h/wtick_f.c index 7d9e0fa922..a90e4af44a 100644 --- a/ompi/mpi/fortran/mpif-h/wtick_f.c +++ b/ompi/mpi/fortran/mpif-h/wtick_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ double mpi_wtick__(void) { return ompi_wtick_f(); } #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_wtick_f pompi_wtick_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Wtick PMPI_Wtick #endif double ompi_wtick_f(void) diff --git a/ompi/mpi/fortran/mpif-h/wtime_f.c b/ompi/mpi/fortran/mpif-h/wtime_f.c index ea8776cb33..a9095f6623 100644 --- a/ompi/mpi/fortran/mpif-h/wtime_f.c +++ b/ompi/mpi/fortran/mpif-h/wtime_f.c @@ -13,6 +13,8 @@ * Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,7 +65,11 @@ double mpi_wtime__(void) { return ompi_wtime_f(); } #if OMPI_PROFILE_LAYER && ! OPAL_HAVE_WEAK_SYMBOLS -#include "ompi/mpi/fortran/mpif-h/profile/defines.h" +#define ompi_wtime_f pompi_wtime_f +#endif + +#if OMPI_ENABLE_MPI_PROFILING +#define MPI_Wtime PMPI_Wtime #endif double ompi_wtime_f(void) From 0d86cc161add3f2c5c5da35ac074ed541c799533 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 5 Oct 2015 08:45:40 +0900 Subject: [PATCH 02/12] fortran: do not build the f08 bindings if PMPI is not built (cherry picked from commit open-mpi/ompi@2d1a8fa920325b785553abce0b3408010d1f5b6b) --- config/ompi_setup_mpi_fortran.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index eac502d003..7ed96d952d 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -374,6 +374,12 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_FORTRAN_F08_TYPE=$OMPI_FORTRAN_IGNORE_TKR_TYPE ]) + # F08 bindings require the usempi PMPI profiling bindings + AS_IF([test "$WANT_MPI_PROFILING" -eq 0], + [OMPI_TRY_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS + OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS + AC_MSG_WARN([PMPI is not built, cannot build usempif08 bindings])]) + # The overall "_BIND_C" variable will be set to 1 if we have all # the necessary forms of BIND(C) OMPI_FORTRAN_HAVE_BIND_C=0 From 89fda80f5942c5b2a7a930484d3d7bb96b371b47 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 7 Oct 2015 09:29:27 +0900 Subject: [PATCH 03/12] configury: do not build usempif08 is PMPI is not built this is a revamp of commit open-mpi/ompi@2d1a8fa920325b785553abce0b3408010d1f5b6b Thanks Jeff for the review ! (cherry picked from commit open-mpi/ompi@d7e6daf75faa30cbe0da6f82d713fb6339519211) --- config/ompi_setup_mpi_fortran.m4 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index 7ed96d952d..5bb986a44b 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -367,18 +367,21 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ # We need to have ignore TKR functionality to build the mpi_f08 # module - AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && + AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1], [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPIF08_BINDINGS OMPI_FORTRAN_F08_PREDECL=$OMPI_FORTRAN_IGNORE_TKR_PREDECL OMPI_FORTRAN_F08_TYPE=$OMPI_FORTRAN_IGNORE_TKR_TYPE ]) - # F08 bindings require the usempi PMPI profiling bindings - AS_IF([test "$WANT_MPI_PROFILING" -eq 0], - [OMPI_TRY_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS - OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS - AC_MSG_WARN([PMPI is not built, cannot build usempif08 bindings])]) + AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ + test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], + [ # If we don't have PMPI, we won't build mpi_f08 at all + AC_MSG_CHECKING([whether PMPI is enabled]) + AS_IF([test $WANT_MPI_PROFILING -eq 1], + [AC_MSG_RESULT([yes])], + [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS + AC_MSG_RESULT([no])])]) # The overall "_BIND_C" variable will be set to 1 if we have all # the necessary forms of BIND(C) From c86695b836d15c6c825f4566f966432046bc1d07 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 12 Oct 2015 10:26:08 -0700 Subject: [PATCH 04/12] ompi_setup_mpi_fortran.m4: add more verbosity Add a little more to the verbose messages from d7e6daf. (cherry picked from commit open-mpi/ompi@eeddb7abc1ec0ad3cba331903ecf7c8dbac433ff) --- config/ompi_setup_mpi_fortran.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index 5bb986a44b..78d02bcc43 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -377,11 +377,11 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], [ # If we don't have PMPI, we won't build mpi_f08 at all - AC_MSG_CHECKING([whether PMPI is enabled]) + AC_MSG_CHECKING([whether PMPI is enabled (needed for mpi_f08)]) AS_IF([test $WANT_MPI_PROFILING -eq 1], [AC_MSG_RESULT([yes])], [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS - AC_MSG_RESULT([no])])]) + AC_MSG_RESULT([no (cannot build mpi_f08)])])]) # The overall "_BIND_C" variable will be set to 1 if we have all # the necessary forms of BIND(C) From 881e2dd2b7494d273b378da5372473d6055d6486 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 13 Oct 2015 08:52:35 +0900 Subject: [PATCH 05/12] configury: remove the --enable-mpi-profiling option and directly call the PMPI_* symbols from C and Fortran bindings (back-ported from commit open-mpi/ompi@291a464efb571806dab1386d43a90a170e014757) --- config/ompi_configure_options.m4 | 21 -------------- config/ompi_setup_mpi_fortran.m4 | 14 ++------- config/ompi_setup_mpi_profiling.m4 | 8 ++--- configure.ac | 18 +++--------- ompi/Makefile.am | 6 ++-- ompi/mpi/c/errhandler_create.c | 6 +--- ompi/mpi/c/errhandler_get.c | 6 +--- ompi/mpi/c/errhandler_set.c | 6 +--- ompi/mpi/c/profile/Makefile.am | 5 +--- ompi/mpi/c/sendrecv_replace.c | 16 ++++------ ompi/mpi/c/type_hindexed.c | 6 +--- ompi/mpi/c/type_hvector.c | 6 +--- ompi/mpi/c/type_struct.c | 6 +--- ompi/mpi/fortran/mpif-h/abort_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/accumulate_f.c | 25 +++++++--------- ompi/mpi/fortran/mpif-h/add_error_class_f.c | 5 +--- ompi/mpi/fortran/mpif-h/add_error_code_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/add_error_string_f.c | 5 +--- ompi/mpi/fortran/mpif-h/address_f.c | 5 +--- ompi/mpi/fortran/mpif-h/allgather_f.c | 21 ++++++-------- ompi/mpi/fortran/mpif-h/allgatherv_f.c | 25 +++++++--------- ompi/mpi/fortran/mpif-h/alloc_mem_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/allreduce_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/alltoall_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/alltoallv_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/alltoallw_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/attr_delete_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/attr_get_f.c | 6 +--- ompi/mpi/fortran/mpif-h/attr_put_f.c | 6 +--- ompi/mpi/fortran/mpif-h/barrier_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/bcast_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/bsend_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/bsend_init_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/buffer_attach_f.c | 5 +--- ompi/mpi/fortran/mpif-h/buffer_detach_f.c | 5 +--- ompi/mpi/fortran/mpif-h/cancel_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/cart_coords_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/cart_create_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/cart_get_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/cart_map_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/cart_rank_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/cart_shift_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/cart_sub_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/cartdim_get_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/close_port_f.c | 5 +--- ompi/mpi/fortran/mpif-h/comm_accept_f.c | 11 +++---- .../fortran/mpif-h/comm_call_errhandler_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_compare_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_connect_f.c | 11 +++---- .../fortran/mpif-h/comm_create_errhandler_f.c | 6 +--- ompi/mpi/fortran/mpif-h/comm_create_f.c | 12 +++----- ompi/mpi/fortran/mpif-h/comm_create_group_f.c | 12 +++----- .../mpi/fortran/mpif-h/comm_create_keyval_f.c | 5 +--- ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_disconnect_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_dup_f.c | 9 ++---- .../mpi/fortran/mpif-h/comm_dup_with_info_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/comm_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c | 5 +--- ompi/mpi/fortran/mpif-h/comm_get_attr_f.c | 6 +--- .../fortran/mpif-h/comm_get_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_get_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_get_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_get_parent_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_group_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_idup_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/comm_join_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_rank_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_remote_group_f.c | 10 ++----- ompi/mpi/fortran/mpif-h/comm_remote_size_f.c | 8 ++--- ompi/mpi/fortran/mpif-h/comm_set_attr_f.c | 6 +--- .../fortran/mpif-h/comm_set_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_set_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_set_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_size_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/comm_spawn_f.c | 13 ++++----- .../fortran/mpif-h/comm_spawn_multiple_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/comm_split_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/comm_split_type_f.c | 19 +++++------- ompi/mpi/fortran/mpif-h/comm_test_inter_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/compare_and_swap_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/dims_create_f.c | 5 +--- .../mpif-h/dist_graph_create_adjacent_f.c | 27 ++++++++--------- ompi/mpi/fortran/mpif-h/dist_graph_create_f.c | 15 ++++------ .../mpif-h/dist_graph_neighbors_count_f.c | 13 ++++----- .../fortran/mpif-h/dist_graph_neighbors_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/errhandler_create_f.c | 4 --- ompi/mpi/fortran/mpif-h/errhandler_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/errhandler_get_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/errhandler_set_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/error_class_f.c | 5 +--- ompi/mpi/fortran/mpif-h/error_string_f.c | 5 +--- ompi/mpi/fortran/mpif-h/exscan_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/f_sync_reg_f.c | 4 --- ompi/mpi/fortran/mpif-h/fetch_and_op_f.c | 11 +++---- .../fortran/mpif-h/file_call_errhandler_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_close_f.c | 9 ++---- .../fortran/mpif-h/file_create_errhandler_f.c | 6 +--- ompi/mpi/fortran/mpif-h/file_delete_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_get_amode_f.c | 7 ++--- .../mpi/fortran/mpif-h/file_get_atomicity_f.c | 7 ++--- .../fortran/mpif-h/file_get_byte_offset_f.c | 7 ++--- .../fortran/mpif-h/file_get_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_get_group_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_get_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_get_position_f.c | 7 ++--- .../mpif-h/file_get_position_shared_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_get_size_f.c | 7 ++--- .../fortran/mpif-h/file_get_type_extent_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_get_view_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iread_all_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iread_at_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iread_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iread_shared_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c | 11 +++---- .../mpi/fortran/mpif-h/file_iwrite_at_all_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_iwrite_f.c | 11 +++---- .../mpi/fortran/mpif-h/file_iwrite_shared_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_open_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/file_preallocate_f.c | 7 ++--- .../fortran/mpif-h/file_read_all_begin_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_read_all_end_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_read_all_f.c | 9 ++---- .../fortran/mpif-h/file_read_at_all_begin_f.c | 9 ++---- .../fortran/mpif-h/file_read_at_all_end_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_read_at_all_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_read_at_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_read_f.c | 9 ++---- .../mpif-h/file_read_ordered_begin_f.c | 9 ++---- .../fortran/mpif-h/file_read_ordered_end_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_read_ordered_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_read_shared_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_seek_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_seek_shared_f.c | 7 ++--- .../mpi/fortran/mpif-h/file_set_atomicity_f.c | 7 ++--- .../fortran/mpif-h/file_set_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_set_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_set_size_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_set_view_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/file_sync_f.c | 7 ++--- .../fortran/mpif-h/file_write_all_begin_f.c | 9 ++---- .../mpi/fortran/mpif-h/file_write_all_end_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_write_all_f.c | 9 ++---- .../mpif-h/file_write_at_all_begin_f.c | 9 ++---- .../fortran/mpif-h/file_write_at_all_end_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/file_write_at_all_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_write_at_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_write_f.c | 9 ++---- .../mpif-h/file_write_ordered_begin_f.c | 9 ++---- .../fortran/mpif-h/file_write_ordered_end_f.c | 7 ++--- .../mpi/fortran/mpif-h/file_write_ordered_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/file_write_shared_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/finalize_f.c | 5 +--- ompi/mpi/fortran/mpif-h/finalized_f.c | 5 +--- ompi/mpi/fortran/mpif-h/free_mem_f.c | 5 +--- ompi/mpi/fortran/mpif-h/gather_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/gatherv_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/get_accumulate_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/get_address_f.c | 5 +--- ompi/mpi/fortran/mpif-h/get_count_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/get_elements_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/get_elements_x_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/get_f.c | 11 +++---- .../fortran/mpif-h/get_library_version_f.c | 5 +--- .../mpi/fortran/mpif-h/get_processor_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/get_version_f.c | 5 +--- ompi/mpi/fortran/mpif-h/graph_create_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/graph_get_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/graph_map_f.c | 7 ++--- .../fortran/mpif-h/graph_neighbors_count_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/graph_neighbors_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/graphdims_get_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/grequest_complete_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/grequest_start_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_compare_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/group_difference_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/group_excl_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_free_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_incl_f.c | 7 ++--- .../mpi/fortran/mpif-h/group_intersection_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/group_range_excl_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_range_incl_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_rank_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/group_size_f.c | 7 ++--- .../fortran/mpif-h/group_translate_ranks_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/group_union_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/iallgather_f.c | 23 +++++++-------- ompi/mpi/fortran/mpif-h/iallgatherv_f.c | 27 ++++++++--------- ompi/mpi/fortran/mpif-h/iallreduce_f.c | 17 +++++------ ompi/mpi/fortran/mpif-h/ialltoall_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/ialltoallv_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/ialltoallw_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/ibarrier_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/ibcast_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/ibsend_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/iexscan_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/igather_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/igatherv_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/improbe_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/imrecv_f.c | 15 ++++------ .../fortran/mpif-h/ineighbor_allgather_f.c | 23 +++++++-------- .../fortran/mpif-h/ineighbor_allgatherv_f.c | 27 ++++++++--------- .../mpi/fortran/mpif-h/ineighbor_alltoall_f.c | 13 ++++----- .../fortran/mpif-h/ineighbor_alltoallv_f.c | 15 ++++------ .../fortran/mpif-h/ineighbor_alltoallw_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/info_create_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_delete_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_dup_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/info_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/info_get_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/info_set_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/init_f.c | 5 +--- ompi/mpi/fortran/mpif-h/init_thread_f.c | 5 +--- ompi/mpi/fortran/mpif-h/initialized_f.c | 5 +--- ompi/mpi/fortran/mpif-h/intercomm_create_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/intercomm_merge_f.c | 10 ++----- ompi/mpi/fortran/mpif-h/iprobe_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/irecv_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/ireduce_f.c | 13 ++++----- .../fortran/mpif-h/ireduce_scatter_block_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/irsend_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/is_thread_main_f.c | 5 +--- ompi/mpi/fortran/mpif-h/iscan_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/iscatter_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/iscatterv_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/isend_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/issend_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/keyval_create_f.c | 4 --- ompi/mpi/fortran/mpif-h/keyval_free_f.c | 5 +--- ompi/mpi/fortran/mpif-h/lookup_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/mprobe_f.c | 15 ++++------ ompi/mpi/fortran/mpif-h/mrecv_f.c | 15 ++++------ .../mpi/fortran/mpif-h/neighbor_allgather_f.c | 21 ++++++-------- .../fortran/mpif-h/neighbor_allgatherv_f.c | 25 +++++++--------- ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c | 11 +++---- .../mpi/fortran/mpif-h/neighbor_alltoallv_f.c | 13 ++++----- .../mpi/fortran/mpif-h/neighbor_alltoallw_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/op_commutative_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/op_create_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/op_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/open_port_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/pack_external_f.c | 7 ++--- .../mpi/fortran/mpif-h/pack_external_size_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/pack_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/pack_size_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/pcontrol_f.c | 5 +--- ompi/mpi/fortran/mpif-h/probe_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/publish_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/put_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/query_thread_f.c | 5 +--- ompi/mpi/fortran/mpif-h/raccumulate_f.c | 29 +++++++++---------- ompi/mpi/fortran/mpif-h/recv_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/recv_init_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/reduce_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/reduce_local_f.c | 9 ++---- .../fortran/mpif-h/reduce_scatter_block_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/reduce_scatter_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/register_datarep_f.c | 16 ++++------ ompi/mpi/fortran/mpif-h/request_free_f.c | 7 ++--- .../mpi/fortran/mpif-h/request_get_status_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/rget_accumulate_f.c | 17 +++++------ ompi/mpi/fortran/mpif-h/rget_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/rput_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/rsend_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/rsend_init_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/scan_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/scatter_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/scatterv_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/send_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/send_init_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/sendrecv_f.c | 13 ++++----- ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/ssend_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/ssend_init_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/start_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/startall_f.c | 9 ++---- .../fortran/mpif-h/status_set_cancelled_f.c | 9 ++---- .../fortran/mpif-h/status_set_elements_f.c | 11 +++---- .../fortran/mpif-h/status_set_elements_x_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/test_cancelled_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/test_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/testall_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/testany_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/testsome_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/topo_test_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_commit_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_contiguous_f.c | 9 ++---- .../mpi/fortran/mpif-h/type_create_darray_f.c | 9 ++---- .../mpif-h/type_create_f90_complex_f.c | 9 ++---- .../mpif-h/type_create_f90_integer_f.c | 9 ++---- .../fortran/mpif-h/type_create_f90_real_f.c | 9 ++---- .../mpif-h/type_create_hindexed_block_f.c | 9 ++---- .../fortran/mpif-h/type_create_hindexed_f.c | 11 +++---- .../fortran/mpif-h/type_create_hvector_f.c | 10 ++----- .../mpif-h/type_create_indexed_block_f.c | 9 ++---- .../mpi/fortran/mpif-h/type_create_keyval_f.c | 4 --- .../fortran/mpif-h/type_create_resized_f.c | 9 ++---- .../mpi/fortran/mpif-h/type_create_struct_f.c | 9 ++---- .../fortran/mpif-h/type_create_subarray_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_delete_attr_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_dup_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_extent_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_free_keyval_f.c | 5 +--- ompi/mpi/fortran/mpif-h/type_get_attr_f.c | 6 +--- ompi/mpi/fortran/mpif-h/type_get_contents_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_get_envelope_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_get_extent_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_get_name_f.c | 7 ++--- .../fortran/mpif-h/type_get_true_extent_f.c | 7 ++--- .../fortran/mpif-h/type_get_true_extent_x_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_hindexed_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_hvector_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_indexed_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_lb_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_match_size_f.c | 6 +--- ompi/mpi/fortran/mpif-h/type_set_attr_f.c | 6 +--- ompi/mpi/fortran/mpif-h/type_set_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_size_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_size_x_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_struct_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/type_ub_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/type_vector_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/unpack_external_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/unpack_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/unpublish_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/wait_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/waitall_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/waitany_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/waitsome_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_allocate_f.c | 11 +++---- .../fortran/mpif-h/win_allocate_shared_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/win_attach_f.c | 7 ++--- .../fortran/mpif-h/win_call_errhandler_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_complete_f.c | 7 ++--- .../mpi/fortran/mpif-h/win_create_dynamic_f.c | 11 +++---- .../fortran/mpif-h/win_create_errhandler_f.c | 6 +--- ompi/mpi/fortran/mpif-h/win_create_f.c | 11 +++---- ompi/mpi/fortran/mpif-h/win_create_keyval_f.c | 4 --- ompi/mpi/fortran/mpif-h/win_delete_attr_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_detach_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_fence_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_flush_all_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_flush_f.c | 7 ++--- .../fortran/mpif-h/win_flush_local_all_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_flush_local_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_free_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_free_keyval_f.c | 5 +--- ompi/mpi/fortran/mpif-h/win_get_attr_f.c | 6 +--- .../mpi/fortran/mpif-h/win_get_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_get_group_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_get_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_get_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_lock_all_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_lock_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_post_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_set_attr_f.c | 6 +--- .../mpi/fortran/mpif-h/win_set_errhandler_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_set_info_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_set_name_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_shared_query_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_start_f.c | 9 ++---- ompi/mpi/fortran/mpif-h/win_sync_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_test_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_unlock_all_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_unlock_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/win_wait_f.c | 7 ++--- ompi/mpi/fortran/mpif-h/wtick_f.c | 5 +--- ompi/mpi/fortran/mpif-h/wtime_f.c | 5 +--- ompi/mpi/fortran/use-mpi-f08/buffer_detach.c | 4 ++- ompi/mpi/tool/profile/Makefile.am | 9 +++--- .../example/c/mpiext_example_progress.c | 6 ++-- ompi/tools/ompi_info/param.c | 10 +++---- opal/tools/wrappers/opal_wrapper.c | 11 ++----- oshmem/mca/memheap/base/memheap_base_mkey.c | 15 +++++----- oshmem/runtime/oshmem_shmem_exchange.c | 6 ++-- oshmem/runtime/oshmem_shmem_finalize.c | 2 +- oshmem/runtime/oshmem_shmem_init.c | 2 +- oshmem/tools/oshmem_info/param.c | 12 ++++---- 386 files changed, 1188 insertions(+), 2388 deletions(-) diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index 0759a4c660..5d5e7676f7 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -166,27 +166,6 @@ case "x$enable_mpi_fortran" in ;; esac -# -# MPI profiling -# - -AC_MSG_CHECKING([if want PMPI]) -AC_ARG_ENABLE(mpi-profile, - AC_HELP_STRING([--enable-mpi-profile], - [enable MPI profiling (default: enabled)])) -if test "$enable_mpi_profile" != "no"; then - AC_MSG_RESULT([yes]) - WANT_MPI_PROFILING=1 - MPIF_H_PMPI_W_FUNCS=", PMPI_WTICK, PMPI_WTIME" -else - AC_MSG_RESULT([no]) - WANT_MPI_PROFILING=0 - MPIF_H_PMPI_W_FUNCS= -fi -AC_SUBST(MPIF_H_PMPI_W_FUNCS) -AM_CONDITIONAL(WANT_MPI_PROFILING, test "$WANT_MPI_PROFILING" = 1) - - # # C++ # diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index 78d02bcc43..3a74195fa2 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -374,15 +374,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_FORTRAN_F08_TYPE=$OMPI_FORTRAN_IGNORE_TKR_TYPE ]) - AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ - test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], - [ # If we don't have PMPI, we won't build mpi_f08 at all - AC_MSG_CHECKING([whether PMPI is enabled (needed for mpi_f08)]) - AS_IF([test $WANT_MPI_PROFILING -eq 1], - [AC_MSG_RESULT([yes])], - [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS - AC_MSG_RESULT([no (cannot build mpi_f08)])])]) - # The overall "_BIND_C" variable will be set to 1 if we have all # the necessary forms of BIND(C) OMPI_FORTRAN_HAVE_BIND_C=0 @@ -644,11 +635,10 @@ end type test_mpi_handle], # these layers need to be built or NOT AM_CONDITIONAL(BUILD_MPI_FORTRAN_MPIFH_BINDINGS_LAYER, - [( test $WANT_MPI_PROFILING -eq 0 || test $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 ) && \ + [test $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 && \ test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS]) AM_CONDITIONAL(BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER, - [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS && \ - test $WANT_MPI_PROFILING -eq 1]) + [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS]) AM_CONDITIONAL(OMPI_BUILD_FORTRAN_MPIFH_BINDINGS, [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS]) diff --git a/config/ompi_setup_mpi_profiling.m4 b/config/ompi_setup_mpi_profiling.m4 index 455517c11f..2fc2ba1f0f 100644 --- a/config/ompi_setup_mpi_profiling.m4 +++ b/config/ompi_setup_mpi_profiling.m4 @@ -15,6 +15,8 @@ # Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -39,14 +41,10 @@ AC_DEFUN([OMPI_SETUP_MPI_PROFILING],[ # AM_CONDITIONAL(BUILD_MPI_BINDINGS_LAYER, - test "$WANT_MPI_PROFILING" = 0 -o "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1) + test "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1) - AM_CONDITIONAL(BUILD_PMPI_BINDINGS_LAYER, - test "$WANT_MPI_PROFILING" = 1) AM_CONDITIONAL(COMPILE_PROFILING_SEPARATELY, test "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1) - AC_DEFINE_UNQUOTED(OMPI_ENABLE_MPI_PROFILING, $WANT_MPI_PROFILING, - [Whether we want MPI profiling or not]) AC_DEFINE_UNQUOTED(OPAL_HAVE_WEAK_SYMBOLS, $OPAL_C_HAVE_WEAK_SYMBOLS, [Whether we have weak symbols or not]) ]) diff --git a/configure.ac b/configure.ac index e6b4e31ba1..6ba49957dd 100644 --- a/configure.ac +++ b/configure.ac @@ -495,14 +495,10 @@ fi if test "$WANT_WEAK_SYMBOLS" = "0"; then OPAL_C_HAVE_WEAK_SYMBOLS=0 fi -if test "$WANT_MPI_PROFILING" = "1"; then - if test "$OPAL_C_HAVE_WEAK_SYMBOLS" = "1"; then - OMPI_PROFILING_COMPILE_SEPARATELY=0 - else - OMPI_PROFILING_COMPILE_SEPARATELY=1 - fi -else +if test "$OPAL_C_HAVE_WEAK_SYMBOLS" = "1"; then OMPI_PROFILING_COMPILE_SEPARATELY=0 +else + OMPI_PROFILING_COMPILE_SEPARATELY=1 fi # Check if we support the offsetof compiler directive @@ -547,13 +543,7 @@ m4_ifdef([project_ompi], [OMPI_SETUP_JAVA_BINDINGS]) ################################## # Setup profiling bindings (if we're building the relevant projects). -# Note that opal_wrapper.c has a hard-coded use of the -# OMPI_ENABLE_MPI_PROFILING macro, so we need to define it (to 0) even -# if we're not building the OMPI project. - -m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING], - [AC_DEFINE([OMPI_ENABLE_MPI_PROFILING], [0], - [We are not building OMPI, so no profiling])]) +m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING]) m4_ifdef([project_oshmem], [OSHMEM_SETUP_PROFILING]) diff --git a/ompi/Makefile.am b/ompi/Makefile.am index 8d7b689fc0..1b7babe23d 100644 --- a/ompi/Makefile.am +++ b/ompi/Makefile.am @@ -15,6 +15,8 @@ # Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -29,11 +31,7 @@ c_mpi_lib = mpi/c/libmpi_c_mpi.la mpi/tool/libmpi_mpit.la else c_mpi_lib = endif -if BUILD_PMPI_BINDINGS_LAYER c_pmpi_lib = mpi/c/profile/libmpi_c_pmpi.la mpi/tool/profile/libmpi_pmpit.la -else -c_pmpi_lib = -endif # See if we have Fortran mpif.h MPI bindings diff --git a/ompi/mpi/c/errhandler_create.c b/ompi/mpi/c/errhandler_create.c index 142f179101..9d41783d81 100644 --- a/ompi/mpi/c/errhandler_create.c +++ b/ompi/mpi/c/errhandler_create.c @@ -32,10 +32,6 @@ #define MPI_Errhandler_create PMPI_Errhandler_create #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler -#endif - int MPI_Errhandler_create(MPI_Handler_function *function, MPI_Errhandler *errhandler) { @@ -43,5 +39,5 @@ int MPI_Errhandler_create(MPI_Handler_function *function, /* This is a deprecated -- just turn around and call the real function */ - return MPI_Comm_create_errhandler(function, errhandler); + return PMPI_Comm_create_errhandler(function, errhandler); } diff --git a/ompi/mpi/c/errhandler_get.c b/ompi/mpi/c/errhandler_get.c index 8cdff57372..c6ed109fef 100644 --- a/ompi/mpi/c/errhandler_get.c +++ b/ompi/mpi/c/errhandler_get.c @@ -34,10 +34,6 @@ #define MPI_Errhandler_get PMPI_Errhandler_get #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler -#endif - static const char FUNC_NAME[] = "MPI_Errhandler_get"; @@ -54,5 +50,5 @@ int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) /* This is a deprecated -- just turn around and call the real function */ - return MPI_Comm_get_errhandler(comm, errhandler); + return PMPI_Comm_get_errhandler(comm, errhandler); } diff --git a/ompi/mpi/c/errhandler_set.c b/ompi/mpi/c/errhandler_set.c index fac741cab1..6457d74bf6 100644 --- a/ompi/mpi/c/errhandler_set.c +++ b/ompi/mpi/c/errhandler_set.c @@ -34,10 +34,6 @@ #define MPI_Errhandler_set PMPI_Errhandler_set #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler -#endif - static const char FUNC_NAME[] = "MPI_Errhandler_set"; @@ -54,5 +50,5 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) /* This is a deprecated -- just turn around and call the real function */ - return MPI_Comm_set_errhandler(comm, errhandler); + return PMPI_Comm_set_errhandler(comm, errhandler); } diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am index 43a84bde1d..ed8b77c827 100644 --- a/ompi/mpi/c/profile/Makefile.am +++ b/ompi/mpi/c/profile/Makefile.am @@ -38,10 +38,7 @@ AM_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1 # Further, this build HAS to go through if profiling is required. # -noinst_LTLIBRARIES = -if BUILD_PMPI_BINDINGS_LAYER -noinst_LTLIBRARIES += libmpi_c_pmpi.la -endif +noinst_LTLIBRARIES = libmpi_c_pmpi.la nodist_libmpi_c_pmpi_la_SOURCES = \ pabort.c \ diff --git a/ompi/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c index 56ebe49650..4add91f2bd 100644 --- a/ompi/mpi/c/sendrecv_replace.c +++ b/ompi/mpi/c/sendrecv_replace.c @@ -38,12 +38,6 @@ #define MPI_Sendrecv_replace PMPI_Sendrecv_replace #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Alloc_mem PMPI_Alloc_mem -#define MPI_Free_mem PMPI_Free_mem -#define MPI_Sendrecv PMPI_Sendrecv -#endif - static const char FUNC_NAME[] = "MPI_Sendrecv_replace"; @@ -81,7 +75,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype, /* simple case */ if ( source == MPI_PROC_NULL || dest == MPI_PROC_NULL || count == 0 ) { - rc = MPI_Sendrecv(buf,count,datatype,dest,sendtag,buf,count,datatype,source,recvtag,comm,status); + rc = PMPI_Sendrecv(buf,count,datatype,dest,sendtag,buf,count,datatype,source,recvtag,comm,status); return rc; } else { @@ -106,7 +100,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype, /* setup a buffer for recv */ opal_convertor_get_packed_size( &convertor, &packed_size ); if( packed_size > sizeof(recv_data) ) { - rc = MPI_Alloc_mem(packed_size, MPI_INFO_NULL, &iov.iov_base); + rc = PMPI_Alloc_mem(packed_size, MPI_INFO_NULL, &iov.iov_base); if(OMPI_SUCCESS != rc) { OMPI_ERRHANDLER_RETURN(OMPI_ERR_OUT_OF_RESOURCE, comm, MPI_ERR_BUFFER, FUNC_NAME); } @@ -115,11 +109,11 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype, } /* recv into temporary buffer */ - rc = MPI_Sendrecv( buf, count, datatype, dest, sendtag, iov.iov_base, packed_size, + rc = PMPI_Sendrecv( buf, count, datatype, dest, sendtag, iov.iov_base, packed_size, MPI_BYTE, source, recvtag, comm, &recv_status ); if (rc != MPI_SUCCESS) { if(packed_size > sizeof(recv_data)) - MPI_Free_mem(iov.iov_base); + PMPI_Free_mem(iov.iov_base); OBJ_DESTRUCT(&convertor); OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME); } @@ -137,7 +131,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype, /* release resources */ if(packed_size > sizeof(recv_data)) { - MPI_Free_mem(iov.iov_base); + PMPI_Free_mem(iov.iov_base); } OBJ_DESTRUCT(&convertor); diff --git a/ompi/mpi/c/type_hindexed.c b/ompi/mpi/c/type_hindexed.c index e32d28700d..dfaa3f64cd 100644 --- a/ompi/mpi/c/type_hindexed.c +++ b/ompi/mpi/c/type_hindexed.c @@ -34,10 +34,6 @@ #define MPI_Type_hindexed PMPI_Type_hindexed #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_hindexed PMPI_Type_create_hindexed -#endif - static const char FUNC_NAME[] = "MPI_Type_hindexed"; @@ -75,7 +71,7 @@ int MPI_Type_hindexed(int count, } } - return MPI_Type_create_hindexed(count, + return PMPI_Type_create_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, diff --git a/ompi/mpi/c/type_hvector.c b/ompi/mpi/c/type_hvector.c index 3dc1312a05..0e989b9ca6 100644 --- a/ompi/mpi/c/type_hvector.c +++ b/ompi/mpi/c/type_hvector.c @@ -34,10 +34,6 @@ #define MPI_Type_hvector PMPI_Type_hvector #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_hvector PMPI_Type_create_hvector -#endif - static const char FUNC_NAME[] = "MPI_Type_hvector"; @@ -66,7 +62,7 @@ int MPI_Type_hvector(int count, } } - return MPI_Type_create_hvector(count, + return PMPI_Type_create_hvector(count, blocklength, stride, oldtype, diff --git a/ompi/mpi/c/type_struct.c b/ompi/mpi/c/type_struct.c index c051367a4f..9619fce01d 100644 --- a/ompi/mpi/c/type_struct.c +++ b/ompi/mpi/c/type_struct.c @@ -30,10 +30,6 @@ #define MPI_Type_struct PMPI_Type_struct #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_struct PMPI_Type_create_struct -#endif - int MPI_Type_struct(int count, int array_of_blocklengths[], MPI_Aint array_of_displacements[], @@ -41,7 +37,7 @@ int MPI_Type_struct(int count, MPI_Datatype *newtype) { /* the param check will be done if necessary on the MPI_Type_create_struct */ - return MPI_Type_create_struct(count, + return PMPI_Type_create_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, diff --git a/ompi/mpi/fortran/mpif-h/abort_f.c b/ompi/mpi/fortran/mpif-h/abort_f.c index ef0d30928d..641299d7e4 100644 --- a/ompi/mpi/fortran/mpif-h/abort_f.c +++ b/ompi/mpi/fortran/mpif-h/abort_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS(MPI_ABORT, #define ompi_abort_f pompi_abort_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Abort PMPI_Abort -#endif void ompi_abort_f(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr) { int ierr_c; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); - ierr_c = MPI_Abort(c_comm, OMPI_FINT_2_INT(*errorcode)); + ierr_c = PMPI_Abort(c_comm, OMPI_FINT_2_INT(*errorcode)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/accumulate_f.c b/ompi/mpi/fortran/mpif-h/accumulate_f.c index ee1eab8993..cd263dde75 100644 --- a/ompi/mpi/fortran/mpif-h/accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/accumulate_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ACCUMULATE, #define ompi_accumulate_f pompi_accumulate_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Accumulate PMPI_Accumulate -#endif void ompi_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -80,18 +77,18 @@ void ompi_accumulate_f(char *origin_addr, MPI_Fint *origin_count, { int ierr_c; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Op c_op = MPI_Op_f2c(*op); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Op c_op = PMPI_Op_f2c(*op); - ierr_c = MPI_Accumulate(OMPI_F2C_BOTTOM(origin_addr), - OMPI_FINT_2_INT(*origin_count), - c_origin_datatype, - OMPI_FINT_2_INT(*target_rank), - *target_disp, - OMPI_FINT_2_INT(*target_count), - c_target_datatype, c_op, c_win); + ierr_c = PMPI_Accumulate(OMPI_F2C_BOTTOM(origin_addr), + OMPI_FINT_2_INT(*origin_count), + c_origin_datatype, + OMPI_FINT_2_INT(*target_rank), + *target_disp, + OMPI_FINT_2_INT(*target_count), + c_target_datatype, c_op, c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/add_error_class_f.c b/ompi/mpi/fortran/mpif-h/add_error_class_f.c index 3ff6968d58..79bddde791 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_class_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_class_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CLASS, #define ompi_add_error_class_f pompi_add_error_class_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Add_error_class PMPI_Add_error_class -#endif void ompi_add_error_class_f(MPI_Fint *errorclass, MPI_Fint *ierr) { int ierr_c; OMPI_SINGLE_NAME_DECL(errorclass); - ierr_c = MPI_Add_error_class(OMPI_SINGLE_NAME_CONVERT(errorclass)); + ierr_c = PMPI_Add_error_class(OMPI_SINGLE_NAME_CONVERT(errorclass)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); if (MPI_SUCCESS == ierr_c) { diff --git a/ompi/mpi/fortran/mpif-h/add_error_code_f.c b/ompi/mpi/fortran/mpif-h/add_error_code_f.c index 9e7a5b96c0..e8c6ed9721 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_code_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_code_f.c @@ -66,18 +66,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CODE, #define ompi_add_error_code_f pompi_add_error_code_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Add_error_code PMPI_Add_error_code -#endif void ompi_add_error_code_f(MPI_Fint *errorclass, MPI_Fint *errorcode, MPI_Fint *ierr) { int ierr_c; OMPI_SINGLE_NAME_DECL(errorcode); - ierr_c = MPI_Add_error_code(OMPI_FINT_2_INT(*errorclass), - OMPI_SINGLE_NAME_CONVERT(errorcode) - ); + ierr_c = PMPI_Add_error_code(OMPI_FINT_2_INT(*errorclass), + OMPI_SINGLE_NAME_CONVERT(errorcode) + ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); if (MPI_SUCCESS == ierr_c) { diff --git a/ompi/mpi/fortran/mpif-h/add_error_string_f.c b/ompi/mpi/fortran/mpif-h/add_error_string_f.c index 158199eb32..92de3f64db 100644 --- a/ompi/mpi/fortran/mpif-h/add_error_string_f.c +++ b/ompi/mpi/fortran/mpif-h/add_error_string_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_STRING, #define ompi_add_error_string_f pompi_add_error_string_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Add_error_string PMPI_Add_error_string -#endif void ompi_add_error_string_f(MPI_Fint *errorcode, char *string, MPI_Fint *ierr, int len) @@ -87,7 +84,7 @@ void ompi_add_error_string_f(MPI_Fint *errorcode, char *string, } ompi_fortran_string_f2c(string, len, &c_string); - ierr_c = MPI_Add_error_string(OMPI_FINT_2_INT(*errorcode), c_string); + ierr_c = PMPI_Add_error_string(OMPI_FINT_2_INT(*errorcode), c_string); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); free(c_string); } diff --git a/ompi/mpi/fortran/mpif-h/address_f.c b/ompi/mpi/fortran/mpif-h/address_f.c index 7b750b2254..0ba20ce877 100644 --- a/ompi/mpi/fortran/mpif-h/address_f.c +++ b/ompi/mpi/fortran/mpif-h/address_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADDRESS, #define ompi_address_f pompi_address_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Address PMPI_Address -#endif void ompi_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr) { int ierr_c; MPI_Aint addr; - ierr_c = MPI_Address(location, &addr); + ierr_c = PMPI_Address(location, &addr); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); if (MPI_SUCCESS == ierr_c) { diff --git a/ompi/mpi/fortran/mpif-h/allgather_f.c b/ompi/mpi/fortran/mpif-h/allgather_f.c index d021b0909d..e88c378b03 100644 --- a/ompi/mpi/fortran/mpif-h/allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/allgather_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHER, #define ompi_allgather_f pompi_allgather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Allgather PMPI_Allgather -#endif void ompi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -79,20 +76,20 @@ void ompi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Comm c_comm; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Allgather(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_FINT_2_INT(*recvcount), - c_recvtype, c_comm); + ierr_c = PMPI_Allgather(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_FINT_2_INT(*recvcount), + c_recvtype, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/allgatherv_f.c b/ompi/mpi/fortran/mpif-h/allgatherv_f.c index 84966a36c3..90e2b94689 100644 --- a/ompi/mpi/fortran/mpif-h/allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/allgatherv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHERV, #define ompi_allgatherv_f pompi_allgatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Allgatherv PMPI_Allgatherv -#endif void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -81,11 +78,11 @@ void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -93,13 +90,13 @@ void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Allgatherv(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_ARRAY_NAME_CONVERT(recvcounts), - OMPI_ARRAY_NAME_CONVERT(displs), - c_recvtype, c_comm); + ierr_c = PMPI_Allgatherv(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_ARRAY_NAME_CONVERT(recvcounts), + OMPI_ARRAY_NAME_CONVERT(displs), + c_recvtype, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); diff --git a/ompi/mpi/fortran/mpif-h/alloc_mem_f.c b/ompi/mpi/fortran/mpif-h/alloc_mem_f.c index 1e7a71e441..7561b12cf2 100644 --- a/ompi/mpi/fortran/mpif-h/alloc_mem_f.c +++ b/ompi/mpi/fortran/mpif-h/alloc_mem_f.c @@ -94,15 +94,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLOC_MEM_CPTR, #define ompi_alloc_mem_f pompi_alloc_mem_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Alloc_mem PMPI_Alloc_mem -#endif void ompi_alloc_mem_f(MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr) { int ierr_c; - MPI_Info c_info = MPI_Info_f2c(*info); + MPI_Info c_info = PMPI_Info_f2c(*info); - ierr_c = MPI_Alloc_mem(*size, c_info, baseptr); + ierr_c = PMPI_Alloc_mem(*size, c_info, baseptr); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/allreduce_f.c b/ompi/mpi/fortran/mpif-h/allreduce_f.c index b8b0f853a7..ed6243b081 100644 --- a/ompi/mpi/fortran/mpif-h/allreduce_f.c +++ b/ompi/mpi/fortran/mpif-h/allreduce_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLREDUCE, #define ompi_allreduce_f pompi_allreduce_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Allreduce PMPI_Allreduce -#endif void ompi_allreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -80,16 +77,16 @@ void ompi_allreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Datatype c_type; MPI_Op c_op; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Allreduce(sendbuf, recvbuf, - OMPI_FINT_2_INT(*count), - c_type, c_op, c_comm); + ierr_c = PMPI_Allreduce(sendbuf, recvbuf, + OMPI_FINT_2_INT(*count), + c_type, c_op, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/alltoall_f.c b/ompi/mpi/fortran/mpif-h/alltoall_f.c index 47f28e90ad..1ee3e1a331 100644 --- a/ompi/mpi/fortran/mpif-h/alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoall_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALL, #define ompi_alltoall_f pompi_alltoall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Alltoall PMPI_Alltoall -#endif void ompi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -79,15 +76,15 @@ void ompi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Comm c_comm; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Alltoall(sendbuf, + c_ierr = PMPI_Alltoall(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/alltoallv_f.c b/ompi/mpi/fortran/mpif-h/alltoallv_f.c index ffbc28e948..8abbce370d 100644 --- a/ompi/mpi/fortran/mpif-h/alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoallv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLV, #define ompi_alltoallv_f pompi_alltoallv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Alltoallv PMPI_Alltoallv -#endif void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, @@ -84,11 +81,11 @@ void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(sdispls, size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); @@ -98,7 +95,7 @@ void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Alltoallv(sendbuf, + c_ierr = PMPI_Alltoallv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtype, diff --git a/ompi/mpi/fortran/mpif-h/alltoallw_f.c b/ompi/mpi/fortran/mpif-h/alltoallw_f.c index 6eba7aba6d..5150f281af 100644 --- a/ompi/mpi/fortran/mpif-h/alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/alltoallw_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLW, #define ompi_alltoallw_f pompi_alltoallw_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Alltoallw PMPI_Alltoallw -#endif void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtypes, @@ -85,8 +82,8 @@ void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - MPI_Comm_size(c_comm, &size); + c_comm = PMPI_Comm_f2c(*comm); + PMPI_Comm_size(c_comm, &size); c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); @@ -97,8 +94,8 @@ void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_FINT_2_INT(rdispls, size); while (size > 0) { - c_sendtypes[size - 1] = MPI_Type_f2c(sendtypes[size - 1]); - c_recvtypes[size - 1] = MPI_Type_f2c(recvtypes[size - 1]); + c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]); + c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]); --size; } @@ -106,7 +103,7 @@ void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Alltoallw(sendbuf, + c_ierr = PMPI_Alltoallw(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtypes, diff --git a/ompi/mpi/fortran/mpif-h/attr_delete_f.c b/ompi/mpi/fortran/mpif-h/attr_delete_f.c index 4b372c1de1..25955feb25 100644 --- a/ompi/mpi/fortran/mpif-h/attr_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_delete_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_DELETE, #define ompi_attr_delete_f pompi_attr_delete_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Attr_delete PMPI_Attr_delete -#endif void ompi_attr_delete_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Attr_delete(c_comm, OMPI_FINT_2_INT(*keyval)); + c_ierr = PMPI_Attr_delete(c_comm, OMPI_FINT_2_INT(*keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/attr_get_f.c b/ompi/mpi/fortran/mpif-h/attr_get_f.c index d9bf172099..98f6791877 100644 --- a/ompi/mpi/fortran/mpif-h/attr_get_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_get_f.c @@ -68,15 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_GET, #define ompi_attr_get_f pompi_attr_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Attr_get PMPI_Attr_get -#endif - void ompi_attr_get_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); OMPI_LOGICAL_NAME_DECL(flag); /* This stuff is very confusing. Be sure to see the comment at diff --git a/ompi/mpi/fortran/mpif-h/attr_put_f.c b/ompi/mpi/fortran/mpif-h/attr_put_f.c index 949cbf41c3..94f13b3b3d 100644 --- a/ompi/mpi/fortran/mpif-h/attr_put_f.c +++ b/ompi/mpi/fortran/mpif-h/attr_put_f.c @@ -68,15 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_PUT, #define ompi_attr_put_f pompi_attr_put_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Attr_put PMPI_Attr_put -#endif - void ompi_attr_put_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, MPI_Fint *ierr) { int c_err; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); /* This stuff is very confusing. Be sure to see the comment at the top of src/attributes/attributes.c. */ diff --git a/ompi/mpi/fortran/mpif-h/barrier_f.c b/ompi/mpi/fortran/mpif-h/barrier_f.c index c884247df7..cb133fe95f 100644 --- a/ompi/mpi/fortran/mpif-h/barrier_f.c +++ b/ompi/mpi/fortran/mpif-h/barrier_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BARRIER, #define ompi_barrier_f pompi_barrier_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Barrier PMPI_Barrier -#endif void ompi_barrier_f(MPI_Fint *comm, MPI_Fint *ierr) { int ierr_c; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - ierr_c = MPI_Barrier(c_comm); + ierr_c = PMPI_Barrier(c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/bcast_f.c b/ompi/mpi/fortran/mpif-h/bcast_f.c index 016044ac5f..8b13dcb67e 100644 --- a/ompi/mpi/fortran/mpif-h/bcast_f.c +++ b/ompi/mpi/fortran/mpif-h/bcast_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BCAST, #define ompi_bcast_f pompi_bcast_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Bcast PMPI_Bcast -#endif void ompi_bcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr) @@ -78,10 +75,10 @@ void ompi_bcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, MPI_Comm c_comm; MPI_Datatype c_type; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Bcast(OMPI_F2C_BOTTOM(buffer), + c_ierr = PMPI_Bcast(OMPI_F2C_BOTTOM(buffer), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*root), diff --git a/ompi/mpi/fortran/mpif-h/bsend_f.c b/ompi/mpi/fortran/mpif-h/bsend_f.c index b61e6d82e4..cc37d947db 100644 --- a/ompi/mpi/fortran/mpif-h/bsend_f.c +++ b/ompi/mpi/fortran/mpif-h/bsend_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND, #define ompi_bsend_f pompi_bsend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Bsend PMPI_Bsend -#endif void ompi_bsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_comm; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Bsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Bsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/bsend_init_f.c b/ompi/mpi/fortran/mpif-h/bsend_init_f.c index 62e9d2f28f..8cc2b7b363 100644 --- a/ompi/mpi/fortran/mpif-h/bsend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/bsend_init_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND_INIT, #define ompi_bsend_init_f pompi_bsend_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Bsend_init PMPI_Bsend_init -#endif void ompi_bsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Bsend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Bsend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), @@ -88,6 +85,6 @@ void ompi_bsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/buffer_attach_f.c b/ompi/mpi/fortran/mpif-h/buffer_attach_f.c index d862f3c892..d7530ffe25 100644 --- a/ompi/mpi/fortran/mpif-h/buffer_attach_f.c +++ b/ompi/mpi/fortran/mpif-h/buffer_attach_f.c @@ -66,12 +66,9 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_ATTACH, #define ompi_buffer_attach_f pompi_buffer_attach_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Buffer_attach PMPI_Buffer_attach -#endif void ompi_buffer_attach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr) { - int c_ierr = MPI_Buffer_attach(buffer, OMPI_FINT_2_INT(*size)); + int c_ierr = PMPI_Buffer_attach(buffer, OMPI_FINT_2_INT(*size)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/buffer_detach_f.c b/ompi/mpi/fortran/mpif-h/buffer_detach_f.c index d69c5e1237..47eca6cad6 100644 --- a/ompi/mpi/fortran/mpif-h/buffer_detach_f.c +++ b/ompi/mpi/fortran/mpif-h/buffer_detach_f.c @@ -65,9 +65,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_DETACH, #define ompi_buffer_detach_f pompi_buffer_detach_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Buffer_detach PMPI_Buffer_detach -#endif /* (this comment is repeated in ompi/mpi/fortran/use-mpi-f08/buffer_detach.c) * @@ -88,7 +85,7 @@ void ompi_buffer_detach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr) void *dummy; OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Buffer_detach(&dummy, OMPI_SINGLE_NAME_CONVERT(size)); + c_ierr = PMPI_Buffer_detach(&dummy, OMPI_SINGLE_NAME_CONVERT(size)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/cancel_f.c b/ompi/mpi/fortran/mpif-h/cancel_f.c index c33284e71c..71ed66e44f 100644 --- a/ompi/mpi/fortran/mpif-h/cancel_f.c +++ b/ompi/mpi/fortran/mpif-h/cancel_f.c @@ -65,15 +65,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CANCEL, #define ompi_cancel_f pompi_cancel_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cancel PMPI_Cancel -#endif void ompi_cancel_f(MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c(*request); + MPI_Request c_req = PMPI_Request_f2c(*request); - c_ierr = MPI_Cancel(&c_req); + c_ierr = PMPI_Cancel(&c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/cart_coords_f.c b/ompi/mpi/fortran/mpif-h/cart_coords_f.c index 102c2889d2..ce5514385b 100644 --- a/ompi/mpi/fortran/mpif-h/cart_coords_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_coords_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_COORDS, #define ompi_cart_coords_f pompi_cart_coords_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_coords PMPI_Cart_coords -#endif void ompi_cart_coords_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims, MPI_Fint *coords, MPI_Fint *ierr) @@ -77,10 +74,10 @@ void ompi_cart_coords_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims, MPI_Comm c_comm; OMPI_ARRAY_NAME_DECL(coords); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); OMPI_ARRAY_FINT_2_INT_ALLOC(coords, OMPI_FINT_2_INT(*maxdims)); - c_ierr = MPI_Cart_coords(c_comm, + c_ierr = PMPI_Cart_coords(c_comm, OMPI_FINT_2_INT(*rank), OMPI_FINT_2_INT(*maxdims), OMPI_ARRAY_NAME_CONVERT(coords)); diff --git a/ompi/mpi/fortran/mpif-h/cart_create_f.c b/ompi/mpi/fortran/mpif-h/cart_create_f.c index b08818b26f..0d59be6200 100644 --- a/ompi/mpi/fortran/mpif-h/cart_create_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_CREATE, #define ompi_cart_create_f pompi_cart_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_create PMPI_Cart_create -#endif void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, ompi_fortran_logical_t *reorder, @@ -79,13 +76,13 @@ void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, OMPI_ARRAY_NAME_DECL(dims); OMPI_LOGICAL_ARRAY_NAME_DECL(periods); - c_comm1 = MPI_Comm_f2c(*old_comm); + c_comm1 = PMPI_Comm_f2c(*old_comm); size = OMPI_FINT_2_INT(*ndims); OMPI_ARRAY_FINT_2_INT(dims, size); OMPI_ARRAY_LOGICAL_2_INT(periods, size); - c_ierr = MPI_Cart_create(c_comm1, size, + c_ierr = PMPI_Cart_create(c_comm1, size, OMPI_ARRAY_NAME_CONVERT(dims), OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods), OMPI_LOGICAL_2_INT(*reorder), @@ -93,7 +90,7 @@ void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *comm_cart = MPI_Comm_c2f(c_comm2); + *comm_cart = PMPI_Comm_c2f(c_comm2); } /* diff --git a/ompi/mpi/fortran/mpif-h/cart_get_f.c b/ompi/mpi/fortran/mpif-h/cart_get_f.c index 6a2e1dd762..c1265864d4 100644 --- a/ompi/mpi/fortran/mpif-h/cart_get_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_get_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_GET, #define ompi_cart_get_f pompi_cart_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_get PMPI_Cart_get -#endif void ompi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *coords, MPI_Fint *ierr) @@ -79,14 +76,14 @@ void ompi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, OMPI_ARRAY_NAME_DECL(coords); OMPI_LOGICAL_ARRAY_NAME_DECL(periods); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); size = OMPI_FINT_2_INT(*maxdims); OMPI_ARRAY_FINT_2_INT_ALLOC(dims, size); OMPI_ARRAY_FINT_2_INT_ALLOC(coords, size); OMPI_ARRAY_LOGICAL_2_INT_ALLOC(periods, size); - c_ierr = MPI_Cart_get(c_comm, + c_ierr = PMPI_Cart_get(c_comm, size, OMPI_ARRAY_NAME_CONVERT(dims), OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods), diff --git a/ompi/mpi/fortran/mpif-h/cart_map_f.c b/ompi/mpi/fortran/mpif-h/cart_map_f.c index 2b1b05bfb9..75f5648a80 100644 --- a/ompi/mpi/fortran/mpif-h/cart_map_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_map_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_MAP, #define ompi_cart_map_f pompi_cart_map_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_map PMPI_Cart_map -#endif void ompi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *newrank, MPI_Fint *ierr) @@ -79,13 +76,13 @@ void ompi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, OMPI_LOGICAL_ARRAY_NAME_DECL(periods); OMPI_SINGLE_NAME_DECL(newrank); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); size = OMPI_FINT_2_INT(*ndims); OMPI_ARRAY_FINT_2_INT(dims, size); OMPI_ARRAY_LOGICAL_2_INT(periods, size); - c_ierr = MPI_Cart_map(c_comm, + c_ierr = PMPI_Cart_map(c_comm, size, OMPI_ARRAY_NAME_CONVERT(dims), OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods), diff --git a/ompi/mpi/fortran/mpif-h/cart_rank_f.c b/ompi/mpi/fortran/mpif-h/cart_rank_f.c index c8bc882644..7e293f384d 100644 --- a/ompi/mpi/fortran/mpif-h/cart_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_rank_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_RANK, #define ompi_cart_rank_f pompi_cart_rank_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_rank PMPI_Cart_rank -#endif void ompi_cart_rank_f(MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank, MPI_Fint *ierr) @@ -78,16 +75,16 @@ void ompi_cart_rank_f(MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank, OMPI_ARRAY_NAME_DECL(coords); OMPI_SINGLE_NAME_DECL(rank); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Cartdim_get(c_comm, &ndims); + c_ierr = PMPI_Cartdim_get(c_comm, &ndims); if (MPI_SUCCESS != c_ierr) { if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); return; } OMPI_ARRAY_FINT_2_INT(coords, ndims); - c_ierr = MPI_Cart_rank(c_comm, + c_ierr = PMPI_Cart_rank(c_comm, OMPI_ARRAY_NAME_CONVERT(coords), OMPI_SINGLE_NAME_CONVERT(rank)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/cart_shift_f.c b/ompi/mpi/fortran/mpif-h/cart_shift_f.c index c0d8da4ec1..3f9fa61a12 100644 --- a/ompi/mpi/fortran/mpif-h/cart_shift_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_shift_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SHIFT, #define ompi_cart_shift_f pompi_cart_shift_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_shift PMPI_Cart_shift -#endif void ompi_cart_shift_f(MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp, MPI_Fint *rank_source, MPI_Fint *rank_dest, @@ -79,9 +76,9 @@ void ompi_cart_shift_f(MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp, OMPI_SINGLE_NAME_DECL(rank_source); OMPI_SINGLE_NAME_DECL(rank_dest); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Cart_shift(c_comm, + c_ierr = PMPI_Cart_shift(c_comm, OMPI_FINT_2_INT(*direction), OMPI_FINT_2_INT(*disp), OMPI_SINGLE_NAME_CONVERT(rank_source), diff --git a/ompi/mpi/fortran/mpif-h/cart_sub_f.c b/ompi/mpi/fortran/mpif-h/cart_sub_f.c index c3881954e1..4128e83a5c 100644 --- a/ompi/mpi/fortran/mpif-h/cart_sub_f.c +++ b/ompi/mpi/fortran/mpif-h/cart_sub_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SUB, #define ompi_cart_sub_f pompi_cart_sub_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cart_sub PMPI_Cart_sub -#endif void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr) @@ -85,8 +82,8 @@ void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, #endif OMPI_LOGICAL_ARRAY_NAME_DECL(remain_dims); - c_comm = MPI_Comm_f2c(*comm); - c_new_comm = MPI_Comm_f2c(*new_comm); + c_comm = PMPI_Comm_f2c(*comm); + c_new_comm = PMPI_Comm_f2c(*new_comm); #if OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT == 1 *ierr = OMPI_INT_2_FINT(MPI_Cartdim_get(c_comm, &ndims)); @@ -96,13 +93,13 @@ void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, #endif OMPI_ARRAY_LOGICAL_2_INT(remain_dims, ndims); - c_ierr = MPI_Cart_sub(c_comm, + c_ierr = PMPI_Cart_sub(c_comm, OMPI_LOGICAL_ARRAY_NAME_CONVERT(remain_dims), &c_new_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *new_comm = MPI_Comm_c2f(c_new_comm); + *new_comm = PMPI_Comm_c2f(c_new_comm); } OMPI_ARRAY_INT_2_LOGICAL(remain_dims, ndims); diff --git a/ompi/mpi/fortran/mpif-h/cartdim_get_f.c b/ompi/mpi/fortran/mpif-h/cartdim_get_f.c index 2cd09944a6..fe384a500d 100644 --- a/ompi/mpi/fortran/mpif-h/cartdim_get_f.c +++ b/ompi/mpi/fortran/mpif-h/cartdim_get_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CARTDIM_GET, #define ompi_cartdim_get_f pompi_cartdim_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Cartdim_get PMPI_Cartdim_get -#endif void ompi_cartdim_get_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr) { @@ -76,9 +73,9 @@ void ompi_cartdim_get_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr) MPI_Comm c_comm; OMPI_SINGLE_NAME_DECL(ndims); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Cartdim_get(c_comm, OMPI_SINGLE_NAME_CONVERT(ndims)); + c_ierr = PMPI_Cartdim_get(c_comm, OMPI_SINGLE_NAME_CONVERT(ndims)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/close_port_f.c b/ompi/mpi/fortran/mpif-h/close_port_f.c index 7223717b96..60d9f6f940 100644 --- a/ompi/mpi/fortran/mpif-h/close_port_f.c +++ b/ompi/mpi/fortran/mpif-h/close_port_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CLOSE_PORT, #define ompi_close_port_f pompi_close_port_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Close_port PMPI_Close_port -#endif void ompi_close_port_f(char *port_name, MPI_Fint *ierr, int port_name_len) { @@ -77,7 +74,7 @@ void ompi_close_port_f(char *port_name, MPI_Fint *ierr, int port_name_len) char *c_port_name; ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name); - c_ierr = MPI_Close_port(c_port_name); + c_ierr = PMPI_Close_port(c_port_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free ( c_port_name); diff --git a/ompi/mpi/fortran/mpif-h/comm_accept_f.c b/ompi/mpi/fortran/mpif-h/comm_accept_f.c index 44165031f8..0757ccbf72 100644 --- a/ompi/mpi/fortran/mpif-h/comm_accept_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_accept_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_ACCEPT, #define ompi_comm_accept_f pompi_comm_accept_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_accept PMPI_Comm_accept -#endif void ompi_comm_accept_f(char *port_name, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr, @@ -80,18 +77,18 @@ void ompi_comm_accept_f(char *port_name, MPI_Fint *info, MPI_Fint *root, MPI_Info c_info; char *c_port_name; - c_comm = MPI_Comm_f2c(*comm); - c_info = MPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name); - c_ierr = MPI_Comm_accept(c_port_name, c_info, + c_ierr = PMPI_Comm_accept(c_port_name, c_info, OMPI_FINT_2_INT(*root), c_comm, &c_new_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f(c_new_comm); + *newcomm = PMPI_Comm_c2f(c_new_comm); } free ( c_port_name ); } diff --git a/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c index 09ddad1105..31107a31c9 100644 --- a/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CALL_ERRHANDLER, #define ompi_comm_call_errhandler_f pompi_comm_call_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler -#endif void ompi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr) @@ -76,8 +73,8 @@ void ompi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, int c_ierr; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_call_errhandler(c_comm, OMPI_FINT_2_INT(*errorcode)); + c_ierr = PMPI_Comm_call_errhandler(c_comm, OMPI_FINT_2_INT(*errorcode)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/comm_compare_f.c b/ompi/mpi/fortran/mpif-h/comm_compare_f.c index 52fe53664b..f8fe538581 100644 --- a/ompi/mpi/fortran/mpif-h/comm_compare_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_compare_f.c @@ -66,18 +66,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_COMPARE, #define ompi_comm_compare_f pompi_comm_compare_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_compare PMPI_Comm_compare -#endif void ompi_comm_compare_f(MPI_Fint *comm1, MPI_Fint *comm2, MPI_Fint *result, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm1 = MPI_Comm_f2c(*comm1); - MPI_Comm c_comm2 = MPI_Comm_f2c(*comm2); + MPI_Comm c_comm1 = PMPI_Comm_f2c(*comm1); + MPI_Comm c_comm2 = PMPI_Comm_f2c(*comm2); OMPI_SINGLE_NAME_DECL(result); - c_ierr = MPI_Comm_compare(c_comm1, c_comm2, + c_ierr = PMPI_Comm_compare(c_comm1, c_comm2, OMPI_SINGLE_NAME_CONVERT(result)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/comm_connect_f.c b/ompi/mpi/fortran/mpif-h/comm_connect_f.c index 897a6aff96..60916b22ed 100644 --- a/ompi/mpi/fortran/mpif-h/comm_connect_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_connect_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CONNECT, #define ompi_comm_connect_f pompi_comm_connect_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_connect PMPI_Comm_connect -#endif void ompi_comm_connect_f(char *port_name, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, @@ -81,17 +78,17 @@ void ompi_comm_connect_f(char *port_name, MPI_Fint *info, MPI_Info c_info; char *c_port_name; - c_comm = MPI_Comm_f2c(*comm); - c_info = MPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name); - c_ierr = MPI_Comm_connect(c_port_name, c_info, + c_ierr = PMPI_Comm_connect(c_port_name, c_info, OMPI_FINT_2_INT(*root), c_comm, &c_new_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f(c_new_comm); + *newcomm = PMPI_Comm_c2f(c_new_comm); } free ( c_port_name ); } diff --git a/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c index 8a39e942d7..e1dd9270a4 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_errhandler_f.c @@ -68,10 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_ERRHANDLER, #define ompi_comm_create_errhandler_f pompi_comm_create_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler -#endif - static const char FUNC_NAME[] = "MPI_COMM_CREATE_ERRHANDLER"; @@ -84,7 +80,7 @@ void ompi_comm_create_errhandler_f(ompi_errhandler_fortran_handler_fn_t *functio (ompi_errhandler_generic_handler_fn_t*) function, OMPI_ERRHANDLER_LANG_FORTRAN); if (MPI_ERRHANDLER_NULL != c_errhandler) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); c_ierr = MPI_SUCCESS; } else { c_ierr = MPI_ERR_INTERN; diff --git a/ompi/mpi/fortran/mpif-h/comm_create_f.c b/ompi/mpi/fortran/mpif-h/comm_create_f.c index 13092e0ba4..847156a336 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_f.c @@ -66,21 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE, #define ompi_comm_create_f pompi_comm_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_create PMPI_Comm_create -#endif - void ompi_comm_create_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c (*comm); - MPI_Group c_group = MPI_Group_f2c(*group); + MPI_Comm c_comm = PMPI_Comm_f2c (*comm); + MPI_Group c_group = PMPI_Group_f2c(*group); - c_ierr = MPI_Comm_create (c_comm, c_group, &c_newcomm); + c_ierr = PMPI_Comm_create(c_comm, c_group, &c_newcomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f (c_newcomm); + *newcomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c index db7d8f0bed..a63383d771 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c @@ -69,21 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_GROUP, #define ompi_comm_create_group_f pompi_comm_create_group_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_create_group PMPI_Comm_create_group -#endif - void ompi_comm_create_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *tag, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c (*comm); - MPI_Group c_group = MPI_Group_f2c(*group); + MPI_Comm c_comm = PMPI_Comm_f2c (*comm); + MPI_Group c_group = PMPI_Group_f2c(*group); - c_ierr = MPI_Comm_create_group (c_comm, c_group, OMPI_FINT_2_INT(*tag), &c_newcomm); + c_ierr = PMPI_Comm_create_group (c_comm, c_group, OMPI_FINT_2_INT(*tag), &c_newcomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f (c_newcomm); + *newcomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c index 5ef5ff77ac..6a7f07d258 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_keyval_f.c @@ -67,11 +67,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_KEYVAL, #define ompi_comm_create_keyval_f pompi_comm_create_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_create_keyval PMPI_Comm_create_keyval -#endif +static const char FUNC_NAME[] = "MPI_Comm_create_keyval_f"; - static const char FUNC_NAME[] = "MPI_Comm_create_keyval_f"; void ompi_comm_create_keyval_f(ompi_mpi2_fortran_copy_attr_function* comm_copy_attr_fn, ompi_mpi2_fortran_delete_attr_function* comm_delete_attr_fn, diff --git a/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c index d89f992f17..1726928937 100644 --- a/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DELETE_ATTR, #define ompi_comm_delete_attr_f pompi_comm_delete_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_delete_attr PMPI_Comm_delete_attr -#endif void ompi_comm_delete_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Fint *ierr) @@ -76,8 +73,8 @@ void ompi_comm_delete_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, int c_ierr; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_delete_attr(c_comm, OMPI_FINT_2_INT(*comm_keyval)); + c_ierr = PMPI_Comm_delete_attr(c_comm, OMPI_FINT_2_INT(*comm_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c b/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c index a77f48ea17..7fe647fb50 100644 --- a/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DISCONNECT, #define ompi_comm_disconnect_f pompi_comm_disconnect_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_disconnect PMPI_Comm_disconnect -#endif void ompi_comm_disconnect_f(MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_disconnect(&c_comm); + c_ierr = PMPI_Comm_disconnect(&c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *comm = MPI_Comm_c2f(c_comm); + *comm = PMPI_Comm_c2f(c_comm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_f.c index 2e64df1ee6..29c686e625 100644 --- a/ompi/mpi/fortran/mpif-h/comm_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_dup_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DUP, #define ompi_comm_dup_f pompi_comm_dup_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_dup PMPI_Comm_dup -#endif void ompi_comm_dup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_dup(c_comm, &c_newcomm); + c_ierr = PMPI_Comm_dup(c_comm, &c_newcomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f(c_newcomm); + *newcomm = PMPI_Comm_c2f(c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c index fa4c30d9e7..967d921878 100644 --- a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c @@ -69,23 +69,20 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DUP_WITH_INFO, #define ompi_comm_dup_with_info_f pompi_comm_dup_with_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info -#endif void ompi_comm_dup_with_info_f(MPI_Fint *comm, MPI_Fint *info, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); MPI_Info c_info; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Comm_dup_with_info(c_comm, c_info, &c_newcomm); + c_ierr = PMPI_Comm_dup_with_info(c_comm, c_info, &c_newcomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f(c_newcomm); + *newcomm = PMPI_Comm_c2f(c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_free_f.c b/ompi/mpi/fortran/mpif-h/comm_free_f.c index 5a692a4111..9fd46fe0ba 100644 --- a/ompi/mpi/fortran/mpif-h/comm_free_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_free_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE, #define ompi_comm_free_f pompi_comm_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_free PMPI_Comm_free -#endif void ompi_comm_free_f(MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_free(&c_comm); + c_ierr = PMPI_Comm_free(&c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *comm = MPI_Comm_c2f(c_comm); + *comm = PMPI_Comm_c2f(c_comm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c index 9e15eb053a..5b1d7f11c2 100644 --- a/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_free_keyval_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE_KEYVAL, #define ompi_comm_free_keyval_f pompi_comm_free_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_free_keyval PMPI_Comm_free_keyval -#endif void ompi_comm_free_keyval_f(MPI_Fint *comm_keyval, MPI_Fint *ierr) { @@ -77,7 +74,7 @@ void ompi_comm_free_keyval_f(MPI_Fint *comm_keyval, MPI_Fint *ierr) OMPI_SINGLE_FINT_2_INT(comm_keyval); - c_ierr = MPI_Comm_free_keyval(OMPI_SINGLE_NAME_CONVERT(comm_keyval)); + c_ierr = PMPI_Comm_free_keyval(OMPI_SINGLE_NAME_CONVERT(comm_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c index be7962e421..a90a38b337 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_attr_f.c @@ -68,16 +68,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ATTR, #define ompi_comm_get_attr_f pompi_comm_get_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_attr PMPI_Comm_get_attr -#endif - void ompi_comm_get_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); OMPI_LOGICAL_NAME_DECL(flag); /* This stuff is very confusing. Be sure to see the comment at diff --git a/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c index 0cbcb56a31..571f7ff910 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_errhandler_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ERRHANDLER, #define ompi_comm_get_errhandler_f pompi_comm_get_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler -#endif void ompi_comm_get_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) @@ -77,12 +74,12 @@ void ompi_comm_get_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Comm c_comm; MPI_Errhandler c_errhandler; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Comm_get_errhandler(c_comm, &c_errhandler); + c_ierr = PMPI_Comm_get_errhandler(c_comm, &c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_get_info_f.c b/ompi/mpi/fortran/mpif-h/comm_get_info_f.c index adc9041474..050edcbfe4 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_info_f.c @@ -58,20 +58,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_INFO, #define ompi_comm_get_info_f pompi_comm_get_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_info PMPI_Comm_get_info -#endif void ompi_comm_get_info_f(MPI_Fint *comm, MPI_Fint *info_used, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); MPI_Info c_info; - c_ierr = MPI_Comm_get_info(c_comm, &c_info); + c_ierr = PMPI_Comm_get_info(c_comm, &c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *info_used = MPI_Info_c2f(c_info); + *info_used = PMPI_Info_c2f(c_info); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_get_name_f.c b/ompi/mpi/fortran/mpif-h/comm_get_name_f.c index 5594adb9f1..a26310ef46 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_name_f.c @@ -69,19 +69,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_NAME, #define ompi_comm_get_name_f pompi_comm_get_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_name PMPI_Comm_get_name -#endif void ompi_comm_get_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len) { int c_ierr, c_len; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); char c_name[MPI_MAX_OBJECT_NAME]; - c_ierr = MPI_Comm_get_name(c_comm, c_name, &c_len); + c_ierr = PMPI_Comm_get_name(c_comm, c_name, &c_len); if (MPI_SUCCESS == c_ierr) { ompi_fortran_string_c2f(c_name, comm_name, name_len); *resultlen = OMPI_INT_2_FINT(c_len); diff --git a/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c b/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c index 5450b29f2a..c876e40a06 100644 --- a/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_get_parent_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_PARENT, #define ompi_comm_get_parent_f pompi_comm_get_parent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_get_parent PMPI_Comm_get_parent -#endif void ompi_comm_get_parent_f(MPI_Fint *parent, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_parent; - c_ierr = MPI_Comm_get_parent(&c_parent); + c_ierr = PMPI_Comm_get_parent(&c_parent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *parent = MPI_Comm_c2f(c_parent); + *parent = PMPI_Comm_c2f(c_parent); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_group_f.c b/ompi/mpi/fortran/mpif-h/comm_group_f.c index dccff265f8..04ec584783 100644 --- a/ompi/mpi/fortran/mpif-h/comm_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_group_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GROUP, #define ompi_comm_group_f pompi_comm_group_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_group PMPI_Comm_group -#endif void ompi_comm_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr) { int c_ierr; MPI_Group c_group; - MPI_Comm c_comm = MPI_Comm_f2c( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c( *comm ); - c_ierr = MPI_Comm_group( c_comm, &c_group); + c_ierr = PMPI_Comm_group( c_comm, &c_group); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *group = MPI_Group_c2f (c_group); + *group = PMPI_Group_c2f (c_group); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_idup_f.c b/ompi/mpi/fortran/mpif-h/comm_idup_f.c index 5992086c6b..ef03420e72 100644 --- a/ompi/mpi/fortran/mpif-h/comm_idup_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_idup_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_IDUP, #define ompi_comm_idup_f pompi_comm_idup_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_idup PMPI_Comm_idup -#endif void ompi_comm_idup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); MPI_Request c_req; - c_ierr = MPI_Comm_idup(c_comm, &c_newcomm, &c_req); + c_ierr = PMPI_Comm_idup(c_comm, &c_newcomm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f(c_newcomm); - *request = MPI_Request_c2f(c_req); + *newcomm = PMPI_Comm_c2f(c_newcomm); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_join_f.c b/ompi/mpi/fortran/mpif-h/comm_join_f.c index fbeaa4ae31..b2edaaa29f 100644 --- a/ompi/mpi/fortran/mpif-h/comm_join_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_join_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_JOIN, #define ompi_comm_join_f pompi_comm_join_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_join PMPI_Comm_join -#endif void ompi_comm_join_f(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_intercomm; - c_ierr = MPI_Comm_join(OMPI_FINT_2_INT(*fd), &c_intercomm); + c_ierr = PMPI_Comm_join(OMPI_FINT_2_INT(*fd), &c_intercomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *intercomm = MPI_Comm_c2f(c_intercomm); + *intercomm = PMPI_Comm_c2f(c_intercomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_rank_f.c b/ompi/mpi/fortran/mpif-h/comm_rank_f.c index 1a0b4088db..62f0aa0c0d 100644 --- a/ompi/mpi/fortran/mpif-h/comm_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_rank_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_RANK, #define ompi_comm_rank_f pompi_comm_rank_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_rank PMPI_Comm_rank -#endif void ompi_comm_rank_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c( *comm ); OMPI_SINGLE_NAME_DECL(rank); - c_ierr = MPI_Comm_rank( c_comm, OMPI_SINGLE_NAME_CONVERT(rank)); + c_ierr = PMPI_Comm_rank( c_comm, OMPI_SINGLE_NAME_CONVERT(rank)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c b/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c index f5c0d6a307..34b6b398e8 100644 --- a/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_remote_group_f.c @@ -66,20 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_GROUP, #define ompi_comm_remote_group_f pompi_comm_remote_group_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_remote_group PMPI_Comm_remote_group -#endif - void ompi_comm_remote_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr) { int c_ierr; MPI_Group c_group; - MPI_Comm c_comm = MPI_Comm_f2c ( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c ( *comm ); - c_ierr = MPI_Comm_remote_group ( c_comm, &c_group ); + c_ierr = PMPI_Comm_remote_group(c_comm, &c_group); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *group = MPI_Group_c2f (c_group); + *group = PMPI_Group_c2f (c_group); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c b/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c index 98950dd6ca..cd807c05e4 100644 --- a/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_remote_size_f.c @@ -66,17 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_SIZE, #define ompi_comm_remote_size_f pompi_comm_remote_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_remote_size PMPI_Comm_remote_size -#endif - void ompi_comm_remote_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c ( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c ( *comm ); OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Comm_remote_size ( c_comm, OMPI_SINGLE_NAME_CONVERT(size )); + c_ierr = PMPI_Comm_remote_size(c_comm, OMPI_SINGLE_NAME_CONVERT(size )); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c index f0b0fb7e9c..f3a5f1340d 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_attr_f.c @@ -68,15 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ATTR, #define ompi_comm_set_attr_f pompi_comm_set_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_set_attr PMPI_Comm_set_attr -#endif - void ompi_comm_set_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); /* This stuff is very confusing. Be sure to see the comment at the top of src/attributes/attributes.c. */ diff --git a/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c index 5143d2fd18..02fa8b55a7 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_errhandler_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ERRHANDLER, #define ompi_comm_set_errhandler_f pompi_comm_set_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler -#endif void ompi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) @@ -78,9 +75,9 @@ void ompi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Comm c_comm; MPI_Errhandler c_errhandler; - c_comm = MPI_Comm_f2c(*comm); - c_errhandler = MPI_Errhandler_f2c(*errhandler); + c_comm = PMPI_Comm_f2c(*comm); + c_errhandler = PMPI_Errhandler_f2c(*errhandler); - c_ierr = MPI_Comm_set_errhandler(c_comm, c_errhandler); + c_ierr = PMPI_Comm_set_errhandler(c_comm, c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/comm_set_info_f.c b/ompi/mpi/fortran/mpif-h/comm_set_info_f.c index f42482b999..d3c21a0619 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_info_f.c @@ -58,16 +58,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_INFO, #define ompi_comm_set_info_f pompi_comm_set_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_set_info PMPI_Comm_set_info -#endif void ompi_comm_set_info_f(MPI_Fint *comm, MPI_Fint *info, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); - MPI_Info c_info = MPI_Info_f2c(*info); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); + MPI_Info c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Comm_set_info(c_comm, c_info); + c_ierr = PMPI_Comm_set_info(c_comm, c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/comm_set_name_f.c b/ompi/mpi/fortran/mpif-h/comm_set_name_f.c index d03aa72eda..00a5b26949 100644 --- a/ompi/mpi/fortran/mpif-h/comm_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_set_name_f.c @@ -69,16 +69,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_NAME, #define ompi_comm_set_name_f pompi_comm_set_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_set_name PMPI_Comm_set_name -#endif void ompi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len) { int ret, c_ierr; char *c_name; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); /* Convert the fortran string */ @@ -92,7 +89,7 @@ void ompi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, /* Call the C function */ - c_ierr = MPI_Comm_set_name(c_comm, c_name); + c_ierr = PMPI_Comm_set_name(c_comm, c_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* Free the C name */ diff --git a/ompi/mpi/fortran/mpif-h/comm_size_f.c b/ompi/mpi/fortran/mpif-h/comm_size_f.c index 55c25d0b7a..1f978636d4 100644 --- a/ompi/mpi/fortran/mpif-h/comm_size_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_size_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SIZE, #define ompi_comm_size_f pompi_comm_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_size PMPI_Comm_size -#endif #include void ompi_comm_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c( *comm ); OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Comm_size( c_comm, OMPI_SINGLE_NAME_CONVERT(size) ); + c_ierr = PMPI_Comm_size( c_comm, OMPI_SINGLE_NAME_CONVERT(size) ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/comm_spawn_f.c b/ompi/mpi/fortran/mpif-h/comm_spawn_f.c index 7264bafe5b..3290e97c89 100644 --- a/ompi/mpi/fortran/mpif-h/comm_spawn_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_spawn_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN, #define ompi_comm_spawn_f pompi_comm_spawn_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_spawn PMPI_Comm_spawn -#endif void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, @@ -86,9 +83,9 @@ void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, char *c_command; OMPI_ARRAY_NAME_DECL(array_of_errcodes); - c_comm = MPI_Comm_f2c(*comm); - c_info = MPI_Info_f2c(*info); - MPI_Comm_size(c_comm, &size); + c_comm = PMPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); + PMPI_Comm_size(c_comm, &size); ompi_fortran_string_f2c(command, cmd_len, &c_command); /* It's allowed to ignore the errcodes */ @@ -108,7 +105,7 @@ void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, ompi_fortran_argv_f2c(argv, string_len, string_len, &c_argv); } - c_ierr = MPI_Comm_spawn(c_command, c_argv, + c_ierr = PMPI_Comm_spawn(c_command, c_argv, OMPI_FINT_2_INT(*maxprocs), c_info, OMPI_FINT_2_INT(*root), @@ -116,7 +113,7 @@ void ompi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *intercomm = MPI_Comm_c2f(c_new_comm); + *intercomm = PMPI_Comm_c2f(c_new_comm); } free(c_command); if (MPI_ARGV_NULL != c_argv && NULL != c_argv) { diff --git a/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c b/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c index 119740305f..d2051a6dad 100644 --- a/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN_MULTIPLE, #define ompi_comm_spawn_multiple_f pompi_comm_spawn_multiple_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple -#endif void ompi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands, char *array_argv, @@ -91,9 +88,9 @@ void ompi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands, OMPI_ARRAY_NAME_DECL(array_maxprocs); OMPI_ARRAY_NAME_DECL(array_errcds); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); array_size = OMPI_FINT_2_INT(*count); @@ -122,10 +119,10 @@ void ompi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands, c_info = (MPI_Info *) malloc (array_size * sizeof(MPI_Info)); for (i = 0; i < array_size; ++i) { - c_info[i] = MPI_Info_f2c(array_info[i]); + c_info[i] = PMPI_Info_f2c(array_info[i]); } - c_ierr = MPI_Comm_spawn_multiple(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Comm_spawn_multiple(OMPI_FINT_2_INT(*count), c_array_commands, c_array_argv, OMPI_ARRAY_NAME_CONVERT(array_maxprocs), @@ -136,7 +133,7 @@ void ompi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *intercomm = MPI_Comm_c2f(c_new_comm); + *intercomm = PMPI_Comm_c2f(c_new_comm); } if (!OMPI_IS_FORTRAN_ERRCODES_IGNORE(array_errcds)) { diff --git a/ompi/mpi/fortran/mpif-h/comm_split_f.c b/ompi/mpi/fortran/mpif-h/comm_split_f.c index 2006daff26..e3a531ccf2 100644 --- a/ompi/mpi/fortran/mpif-h/comm_split_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_split_f.c @@ -66,24 +66,21 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPLIT, #define ompi_comm_split_f pompi_comm_split_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_split PMPI_Comm_split -#endif void ompi_comm_split_f(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c ( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c ( *comm ); - c_ierr = MPI_Comm_split(c_comm, + c_ierr = PMPI_Comm_split(c_comm, OMPI_FINT_2_INT(*color), OMPI_FINT_2_INT(*key), &c_newcomm ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f (c_newcomm); + *newcomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_split_type_f.c b/ompi/mpi/fortran/mpif-h/comm_split_type_f.c index 8c16b588a5..6c117c42e8 100644 --- a/ompi/mpi/fortran/mpif-h/comm_split_type_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_split_type_f.c @@ -67,28 +67,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPLIT_TYPE, #define ompi_comm_split_type_f pompi_comm_split_type_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_split_type PMPI_Comm_split_type -#endif void ompi_comm_split_type_f(MPI_Fint *comm, MPI_Fint *split_type, MPI_Fint *key, MPI_Fint *info, MPI_Fint *newcomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_comm = MPI_Comm_f2c ( *comm ); + MPI_Comm c_comm = PMPI_Comm_f2c ( *comm ); MPI_Info c_info; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = OMPI_INT_2_FINT(MPI_Comm_split_type(c_comm, - OMPI_FINT_2_INT(*split_type), - OMPI_FINT_2_INT(*key), - c_info, - &c_newcomm )); + c_ierr = OMPI_INT_2_FINT(PMPI_Comm_split_type(c_comm, + OMPI_FINT_2_INT(*split_type), + OMPI_FINT_2_INT(*key), + c_info, + &c_newcomm )); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newcomm = MPI_Comm_c2f (c_newcomm); + *newcomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c b/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c index d5dc8e1ac3..264bcc243f 100644 --- a/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_test_inter_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_TEST_INTER, #define ompi_comm_test_inter_f pompi_comm_test_inter_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Comm_test_inter PMPI_Comm_test_inter -#endif void ompi_comm_test_inter_f(MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c (*comm); + MPI_Comm c_comm = PMPI_Comm_f2c (*comm); OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Comm_test_inter(c_comm, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); + c_ierr = PMPI_Comm_test_inter(c_comm, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c b/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c index ec694e8273..5de711893e 100644 --- a/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c +++ b/ompi/mpi/fortran/mpif-h/compare_and_swap_f.c @@ -71,19 +71,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMPARE_AND_SWAP, #define ompi_compare_and_swap_f pompi_compare_and_swap_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Compare_and_swap PMPI_Compare_and_swap -#endif void ompi_compare_and_swap_f(char *origin_addr, char *compare_addr, char *result_addr, MPI_Fint *datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_datatype = MPI_Type_f2c(*datatype); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Datatype c_datatype = PMPI_Type_f2c(*datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Compare_and_swap(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Compare_and_swap(OMPI_F2C_BOTTOM(origin_addr), OMPI_F2C_BOTTOM(compare_addr), OMPI_F2C_BOTTOM(result_addr), c_datatype, diff --git a/ompi/mpi/fortran/mpif-h/dims_create_f.c b/ompi/mpi/fortran/mpif-h/dims_create_f.c index 7a2d27091a..22db201029 100644 --- a/ompi/mpi/fortran/mpif-h/dims_create_f.c +++ b/ompi/mpi/fortran/mpif-h/dims_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIMS_CREATE, #define ompi_dims_create_f pompi_dims_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Dims_create PMPI_Dims_create -#endif void ompi_dims_create_f(MPI_Fint *nnodes, MPI_Fint *ndims, MPI_Fint *dims, MPI_Fint *ierr) @@ -78,7 +75,7 @@ void ompi_dims_create_f(MPI_Fint *nnodes, MPI_Fint *ndims, OMPI_ARRAY_FINT_2_INT(dims, *ndims); - c_ierr = MPI_Dims_create(OMPI_FINT_2_INT(*nnodes), + c_ierr = PMPI_Dims_create(OMPI_FINT_2_INT(*nnodes), OMPI_FINT_2_INT(*ndims), OMPI_ARRAY_NAME_CONVERT(dims)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c index 23e48d2df4..b3981ef848 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c @@ -64,9 +64,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_CREATE_ADJACENT, #define ompi_dist_graph_create_adjacent_f pompi_dist_graph_create_adjacent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent -#endif void ompi_dist_graph_create_adjacent_f(MPI_Fint *comm_old, MPI_Fint *indegree, @@ -83,8 +80,8 @@ void ompi_dist_graph_create_adjacent_f(MPI_Fint *comm_old, MPI_Fint *indegree, OMPI_ARRAY_NAME_DECL(sources); OMPI_ARRAY_NAME_DECL(destinations); - c_comm_old = MPI_Comm_f2c(*comm_old); - c_info = MPI_Info_f2c(*info); + c_comm_old = PMPI_Comm_f2c(*comm_old); + c_info = PMPI_Info_f2c(*info); OMPI_ARRAY_FINT_2_INT(sources, *indegree); if (OMPI_IS_FORTRAN_UNWEIGHTED(sourceweights)) { @@ -106,17 +103,17 @@ void ompi_dist_graph_create_adjacent_f(MPI_Fint *comm_old, MPI_Fint *indegree, c_destweights = OMPI_ARRAY_NAME_CONVERT(destweights); } - *ierr = OMPI_INT_2_FINT(MPI_Dist_graph_create_adjacent(c_comm_old, OMPI_FINT_2_INT(*indegree), - OMPI_ARRAY_NAME_CONVERT(sources), - c_sourceweights, - OMPI_FINT_2_INT(*outdegree), - OMPI_ARRAY_NAME_CONVERT(destinations), - c_destweights, - c_info, - OMPI_LOGICAL_2_INT(*reorder), - &c_comm_graph)); + *ierr = OMPI_INT_2_FINT(PMPI_Dist_graph_create_adjacent(c_comm_old, OMPI_FINT_2_INT(*indegree), + OMPI_ARRAY_NAME_CONVERT(sources), + c_sourceweights, + OMPI_FINT_2_INT(*outdegree), + OMPI_ARRAY_NAME_CONVERT(destinations), + c_destweights, + c_info, + OMPI_LOGICAL_2_INT(*reorder), + &c_comm_graph)); if (OMPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { - *comm_graph = MPI_Comm_c2f(c_comm_graph); + *comm_graph = PMPI_Comm_c2f(c_comm_graph); } OMPI_ARRAY_FINT_2_INT_CLEANUP(sources); diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c index a346b9e143..7759b3f841 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_create_f.c @@ -63,9 +63,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_CREATE, #define ompi_dist_graph_create_f pompi_dist_graph_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Dist_graph_create PMPI_Dist_graph_create -#endif void ompi_dist_graph_create_f(MPI_Fint *comm_old, MPI_Fint *n, MPI_Fint *sources, MPI_Fint *degrees, MPI_Fint *destinations, MPI_Fint *weights, @@ -81,8 +78,8 @@ void ompi_dist_graph_create_f(MPI_Fint *comm_old, MPI_Fint *n, MPI_Fint *sources OMPI_ARRAY_NAME_DECL(degrees); OMPI_ARRAY_NAME_DECL(destinations); - c_comm_old = MPI_Comm_f2c(*comm_old); - c_info = MPI_Info_f2c(*info); + c_comm_old = PMPI_Comm_f2c(*comm_old); + c_info = PMPI_Info_f2c(*info); OMPI_ARRAY_FINT_2_INT(sources, *n); OMPI_ARRAY_FINT_2_INT(degrees, *n); for( i = 0; i < OMPI_FINT_2_INT(*n); i++ ) @@ -99,11 +96,11 @@ void ompi_dist_graph_create_f(MPI_Fint *comm_old, MPI_Fint *n, MPI_Fint *sources } - *ierr = OMPI_INT_2_FINT(MPI_Dist_graph_create(c_comm_old, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(sources), - OMPI_ARRAY_NAME_CONVERT(degrees), OMPI_ARRAY_NAME_CONVERT(destinations), - c_weights, c_info, OMPI_LOGICAL_2_INT(*reorder), &c_comm_graph)); + *ierr = OMPI_INT_2_FINT(PMPI_Dist_graph_create(c_comm_old, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(sources), + OMPI_ARRAY_NAME_CONVERT(degrees), OMPI_ARRAY_NAME_CONVERT(destinations), + c_weights, c_info, OMPI_LOGICAL_2_INT(*reorder), &c_comm_graph)); if (OMPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { - *comm_graph = MPI_Comm_c2f(c_comm_graph); + *comm_graph = PMPI_Comm_c2f(c_comm_graph); } OMPI_ARRAY_FINT_2_INT_CLEANUP(sources); diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c index 479a36a274..756e22c32f 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_count_f.c @@ -61,9 +61,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_NEIGHBORS_COUNT, #define ompi_dist_graph_neighbors_count_f pompi_dist_graph_neighbors_count_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count -#endif void ompi_dist_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *inneighbors, MPI_Fint *outneighbors, ompi_fortran_logical_t *weighted, @@ -74,12 +71,12 @@ void ompi_dist_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *inneighbors, OMPI_SINGLE_NAME_DECL(outneighbors); OMPI_LOGICAL_NAME_DECL(weighted); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - *ierr = OMPI_INT_2_FINT(MPI_Dist_graph_neighbors_count(c_comm, - OMPI_SINGLE_NAME_CONVERT(inneighbors), - OMPI_SINGLE_NAME_CONVERT(outneighbors), - OMPI_LOGICAL_SINGLE_NAME_CONVERT(weighted))); + *ierr = OMPI_INT_2_FINT(PMPI_Dist_graph_neighbors_count(c_comm, + OMPI_SINGLE_NAME_CONVERT(inneighbors), + OMPI_SINGLE_NAME_CONVERT(outneighbors), + OMPI_LOGICAL_SINGLE_NAME_CONVERT(weighted))); OMPI_SINGLE_INT_2_LOGICAL(weighted); if (OMPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { OMPI_SINGLE_INT_2_FINT(inneighbors); diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c index e5bedf0655..3b2691683e 100644 --- a/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c +++ b/ompi/mpi/fortran/mpif-h/dist_graph_neighbors_f.c @@ -60,9 +60,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_NEIGHBORS, #define ompi_dist_graph_neighbors_f pompi_dist_graph_neighbors_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors -#endif void ompi_dist_graph_neighbors_f(MPI_Fint* comm, MPI_Fint* maxindegree, MPI_Fint* sources, MPI_Fint* sourceweights, @@ -76,7 +73,7 @@ void ompi_dist_graph_neighbors_f(MPI_Fint* comm, MPI_Fint* maxindegree, OMPI_ARRAY_NAME_DECL(destinations); OMPI_ARRAY_NAME_DECL(destweights); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); OMPI_ARRAY_FINT_2_INT_ALLOC(sources, *maxindegree); if( !OMPI_IS_FORTRAN_UNWEIGHTED(sourceweights) ) { @@ -87,11 +84,11 @@ void ompi_dist_graph_neighbors_f(MPI_Fint* comm, MPI_Fint* maxindegree, OMPI_ARRAY_FINT_2_INT_ALLOC(destweights, *maxoutdegree); } - *ierr = OMPI_INT_2_FINT(MPI_Dist_graph_neighbors(c_comm, OMPI_FINT_2_INT(*maxindegree), - OMPI_ARRAY_NAME_CONVERT(sources), - OMPI_IS_FORTRAN_UNWEIGHTED(sourceweights) ? MPI_UNWEIGHTED : OMPI_ARRAY_NAME_CONVERT(sourceweights), - OMPI_FINT_2_INT(*maxoutdegree), OMPI_ARRAY_NAME_CONVERT(destinations), - OMPI_IS_FORTRAN_UNWEIGHTED(destweights) ? MPI_UNWEIGHTED : OMPI_ARRAY_NAME_CONVERT(destweights))); + *ierr = OMPI_INT_2_FINT(PMPI_Dist_graph_neighbors(c_comm, OMPI_FINT_2_INT(*maxindegree), + OMPI_ARRAY_NAME_CONVERT(sources), + OMPI_IS_FORTRAN_UNWEIGHTED(sourceweights) ? MPI_UNWEIGHTED : OMPI_ARRAY_NAME_CONVERT(sourceweights), + OMPI_FINT_2_INT(*maxoutdegree), OMPI_ARRAY_NAME_CONVERT(destinations), + OMPI_IS_FORTRAN_UNWEIGHTED(destweights) ? MPI_UNWEIGHTED : OMPI_ARRAY_NAME_CONVERT(destweights))); if (OMPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { OMPI_ARRAY_INT_2_FINT(sources, *maxindegree); if( !OMPI_IS_FORTRAN_UNWEIGHTED(sourceweights) ) { diff --git a/ompi/mpi/fortran/mpif-h/errhandler_create_f.c b/ompi/mpi/fortran/mpif-h/errhandler_create_f.c index 9c2fc4fd0d..2c4effb42f 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_create_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_create_f.c @@ -67,10 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_CREATE, #define ompi_errhandler_create_f pompi_errhandler_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Errhandler_create PMPI_Errhandler_create -#endif - void ompi_errhandler_create_f(ompi_errhandler_fortran_handler_fn_t* function, MPI_Fint *errhandler, MPI_Fint *ierr) { diff --git a/ompi/mpi/fortran/mpif-h/errhandler_free_f.c b/ompi/mpi/fortran/mpif-h/errhandler_free_f.c index c807e0a377..031754d0be 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_free_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_free_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_FREE, #define ompi_errhandler_free_f pompi_errhandler_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Errhandler_free PMPI_Errhandler_free -#endif void ompi_errhandler_free_f(MPI_Fint *errhandler, MPI_Fint *ierr) { int c_ierr; MPI_Errhandler c_errhandler; - c_errhandler = MPI_Errhandler_f2c(*errhandler); + c_errhandler = PMPI_Errhandler_f2c(*errhandler); - c_ierr = MPI_Errhandler_free(&c_errhandler); + c_ierr = PMPI_Errhandler_free(&c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); } } diff --git a/ompi/mpi/fortran/mpif-h/errhandler_get_f.c b/ompi/mpi/fortran/mpif-h/errhandler_get_f.c index b0e3f378ef..106f2bbffe 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_get_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_get_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_GET, #define ompi_errhandler_get_f pompi_errhandler_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Errhandler_get PMPI_Errhandler_get -#endif void ompi_errhandler_get_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) { @@ -76,13 +73,13 @@ void ompi_errhandler_get_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) MPI_Comm c_comm; MPI_Errhandler c_errhandler; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Errhandler_get(c_comm, &c_errhandler); + c_ierr = PMPI_Errhandler_get(c_comm, &c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); } } diff --git a/ompi/mpi/fortran/mpif-h/errhandler_set_f.c b/ompi/mpi/fortran/mpif-h/errhandler_set_f.c index a6ce95e8d8..ea45bf15a0 100644 --- a/ompi/mpi/fortran/mpif-h/errhandler_set_f.c +++ b/ompi/mpi/fortran/mpif-h/errhandler_set_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_SET, #define ompi_errhandler_set_f pompi_errhandler_set_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Errhandler_set PMPI_Errhandler_set -#endif void ompi_errhandler_set_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) { @@ -77,9 +74,9 @@ void ompi_errhandler_set_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr) MPI_Comm c_comm; MPI_Errhandler c_errhandler; - c_comm = MPI_Comm_f2c(*comm); - c_errhandler = MPI_Errhandler_f2c(*errhandler); + c_comm = PMPI_Comm_f2c(*comm); + c_errhandler = PMPI_Errhandler_f2c(*errhandler); - c_ierr = MPI_Errhandler_set(c_comm, c_errhandler); + c_ierr = PMPI_Errhandler_set(c_comm, c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/error_class_f.c b/ompi/mpi/fortran/mpif-h/error_class_f.c index 886717e1a1..2e28e6c90f 100644 --- a/ompi/mpi/fortran/mpif-h/error_class_f.c +++ b/ompi/mpi/fortran/mpif-h/error_class_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_CLASS, #define ompi_error_class_f pompi_error_class_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Error_class PMPI_Error_class -#endif void ompi_error_class_f(MPI_Fint *errorcode, MPI_Fint *errorclass, MPI_Fint *ierr) @@ -76,7 +73,7 @@ void ompi_error_class_f(MPI_Fint *errorcode, MPI_Fint *errorclass, int c_ierr; OMPI_SINGLE_NAME_DECL(errorclass); - c_ierr = MPI_Error_class(OMPI_FINT_2_INT(*errorcode), + c_ierr = PMPI_Error_class(OMPI_FINT_2_INT(*errorcode), OMPI_SINGLE_NAME_CONVERT(errorclass)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/error_string_f.c b/ompi/mpi/fortran/mpif-h/error_string_f.c index d2e4d1d4b3..9089b73763 100644 --- a/ompi/mpi/fortran/mpif-h/error_string_f.c +++ b/ompi/mpi/fortran/mpif-h/error_string_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_STRING, #define ompi_error_string_f pompi_error_string_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Error_string PMPI_Error_string -#endif static const char FUNC_NAME[] = "MPI_ERROR_STRING"; @@ -87,7 +84,7 @@ void ompi_error_string_f(MPI_Fint *errorcode, char *string, char c_string[MPI_MAX_ERROR_STRING + 1]; OMPI_SINGLE_NAME_DECL(resultlen); - c_ierr = MPI_Error_string(OMPI_FINT_2_INT(*errorcode), + c_ierr = PMPI_Error_string(OMPI_FINT_2_INT(*errorcode), c_string, OMPI_SINGLE_NAME_CONVERT(resultlen) ); diff --git a/ompi/mpi/fortran/mpif-h/exscan_f.c b/ompi/mpi/fortran/mpif-h/exscan_f.c index 39c6b9ff24..73f8372ffa 100644 --- a/ompi/mpi/fortran/mpif-h/exscan_f.c +++ b/ompi/mpi/fortran/mpif-h/exscan_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_EXSCAN, #define ompi_exscan_f pompi_exscan_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Exscan PMPI_Exscan -#endif void ompi_exscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -80,15 +77,15 @@ void ompi_exscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Datatype c_type; MPI_Op c_op; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); /* MPI_IN_PLACE is not supported */ sendbuf = (char *) OMPI_F2C_BOTTOM (sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM (recvbuf); - c_ierr = MPI_Exscan(sendbuf, recvbuf, + c_ierr = PMPI_Exscan(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c b/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c index 57ae0b3bb4..a364849bf0 100644 --- a/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c +++ b/ompi/mpi/fortran/mpif-h/f_sync_reg_f.c @@ -68,10 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_F_SYNC_REG, #define ompi_f_sync_reg_f pompi_f_sync_reg_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_F_sync_reg PMPI_F_sync_reg -#endif - void ompi_f_sync_reg_f(char *buf) { /* This is a noop in C to disable potential Fortran optimizations. */ diff --git a/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c b/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c index b597b92f70..f1a8c747f8 100644 --- a/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c +++ b/ompi/mpi/fortran/mpif-h/fetch_and_op_f.c @@ -71,20 +71,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FETCH_AND_OP, #define ompi_fetch_and_op_f pompi_fetch_and_op_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Fetch_and_op PMPI_Fetch_and_op -#endif void ompi_fetch_and_op_f(char *origin_addr, char *result_addr, MPI_Fint *datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_datatype = MPI_Type_f2c(*datatype); - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Op c_op = MPI_Op_f2c(*op); + MPI_Datatype c_datatype = PMPI_Type_f2c(*datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Op c_op = PMPI_Op_f2c(*op); - c_ierr = MPI_Fetch_and_op(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Fetch_and_op(OMPI_F2C_BOTTOM(origin_addr), OMPI_F2C_BOTTOM(result_addr), c_datatype, OMPI_FINT_2_INT(*target_rank), diff --git a/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c index bcb1a89337..21844e6ae3 100644 --- a/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_call_errhandler_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CALL_ERRHANDLER, #define ompi_file_call_errhandler_f pompi_file_call_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_call_errhandler PMPI_File_call_errhandler -#endif void ompi_file_call_errhandler_f(MPI_Fint *fh, MPI_Fint *errorcode, MPI_Fint *ierr) @@ -76,8 +73,8 @@ void ompi_file_call_errhandler_f(MPI_Fint *fh, MPI_Fint *errorcode, int c_ierr; MPI_File c_fh; - c_fh = MPI_File_f2c(*fh); + c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_call_errhandler(c_fh, OMPI_FINT_2_INT(*errorcode)); + c_ierr = PMPI_File_call_errhandler(c_fh, OMPI_FINT_2_INT(*errorcode)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_close_f.c b/ompi/mpi/fortran/mpif-h/file_close_f.c index add4a59351..0e8ac4adb0 100644 --- a/ompi/mpi/fortran/mpif-h/file_close_f.c +++ b/ompi/mpi/fortran/mpif-h/file_close_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CLOSE, #define ompi_file_close_f pompi_file_close_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_close PMPI_File_close -#endif void ompi_file_close_f(MPI_Fint *fh, MPI_Fint *ierr) { int c_ierr; MPI_File c_fh; - c_fh = MPI_File_f2c(*fh); + c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_close(&c_fh); + c_ierr = PMPI_File_close(&c_fh); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *fh = MPI_File_c2f(c_fh); + *fh = PMPI_File_c2f(c_fh); } } diff --git a/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c index d6098717f3..4e0802dac5 100644 --- a/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_create_errhandler_f.c @@ -68,10 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CREATE_ERRHANDLER, #define ompi_file_create_errhandler_f pompi_file_create_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_create_errhandler PMPI_File_create_errhandler -#endif - static const char FUNC_NAME[] = "MPI_FILE_CREATE_ERRHANDLER"; @@ -84,7 +80,7 @@ void ompi_file_create_errhandler_f(ompi_errhandler_fortran_handler_fn_t* functio (ompi_errhandler_generic_handler_fn_t*) function, OMPI_ERRHANDLER_LANG_FORTRAN); if (MPI_ERRHANDLER_NULL != c_errhandler) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); c_ierr = MPI_SUCCESS; } else { c_ierr = MPI_ERR_INTERN; diff --git a/ompi/mpi/fortran/mpif-h/file_delete_f.c b/ompi/mpi/fortran/mpif-h/file_delete_f.c index ce79698c0c..834e06fb33 100644 --- a/ompi/mpi/fortran/mpif-h/file_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/file_delete_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_DELETE, #define ompi_file_delete_f pompi_file_delete_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_delete PMPI_File_delete -#endif void ompi_file_delete_f(char *filename, MPI_Fint *info, MPI_Fint *ierr, int filename_len) { @@ -78,7 +75,7 @@ void ompi_file_delete_f(char *filename, MPI_Fint *info, MPI_Fint *ierr, int file char *c_filename; int c_ierr, ret; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); /* Convert the fortran string */ if (OMPI_SUCCESS != (ret = ompi_fortran_string_f2c(filename, filename_len, @@ -88,7 +85,7 @@ void ompi_file_delete_f(char *filename, MPI_Fint *info, MPI_Fint *ierr, int file return; } - c_ierr = MPI_File_delete(c_filename, c_info); + c_ierr = PMPI_File_delete(c_filename, c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free(c_filename); diff --git a/ompi/mpi/fortran/mpif-h/file_get_amode_f.c b/ompi/mpi/fortran/mpif-h/file_get_amode_f.c index 1b313ed9fe..28457b7539 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_amode_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_amode_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_AMODE, #define ompi_file_get_amode_f pompi_file_get_amode_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_amode PMPI_File_get_amode -#endif void ompi_file_get_amode_f(MPI_Fint *fh, MPI_Fint *amode, MPI_Fint *ierr) { @@ -76,8 +73,8 @@ void ompi_file_get_amode_f(MPI_Fint *fh, MPI_Fint *amode, MPI_Fint *ierr) MPI_File c_fh; OMPI_SINGLE_NAME_DECL(amode); - c_fh = MPI_File_f2c(*fh); - c_ierr = MPI_File_get_amode(c_fh, OMPI_SINGLE_NAME_CONVERT(amode)); + c_fh = PMPI_File_f2c(*fh); + c_ierr = PMPI_File_get_amode(c_fh, OMPI_SINGLE_NAME_CONVERT(amode)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c b/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c index a70530a720..43b3716a74 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_atomicity_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ATOMICITY, #define ompi_file_get_atomicity_f pompi_file_get_atomicity_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_atomicity PMPI_File_get_atomicity -#endif void ompi_file_get_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { @@ -76,8 +73,8 @@ void ompi_file_get_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_F MPI_File c_fh; OMPI_LOGICAL_NAME_DECL(flag); - c_fh = MPI_File_f2c(*fh); - c_ierr = MPI_File_get_atomicity(c_fh, + c_fh = PMPI_File_f2c(*fh); + c_ierr = PMPI_File_get_atomicity(c_fh, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c b/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c index 88bd48d0b1..e7f0cd15c9 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_byte_offset_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_BYTE_OFFSET, #define ompi_file_get_byte_offset_f pompi_file_get_byte_offset_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_byte_offset PMPI_File_get_byte_offset -#endif void ompi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr) @@ -76,9 +73,9 @@ void ompi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset, int c_ierr; MPI_File c_fh; - c_fh = MPI_File_f2c(*fh); + c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_get_byte_offset(c_fh, + c_ierr = PMPI_File_get_byte_offset(c_fh, (MPI_Offset) *offset, disp); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c index 12149cb489..cf3b44528f 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_errhandler_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ERRHANDLER, #define ompi_file_get_errhandler_f pompi_file_get_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_errhandler PMPI_File_get_errhandler -#endif void ompi_file_get_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, MPI_Fint *ierr) { @@ -76,12 +73,12 @@ void ompi_file_get_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, MPI_Fint *ie MPI_File c_fh; MPI_Errhandler c_errhandler; - c_fh = MPI_File_f2c(*fh); + c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_get_errhandler(c_fh, &c_errhandler); + c_ierr = PMPI_File_get_errhandler(c_fh, &c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); } } diff --git a/ompi/mpi/fortran/mpif-h/file_get_group_f.c b/ompi/mpi/fortran/mpif-h/file_get_group_f.c index ccf48d2513..ab2ac59e94 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_group_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_group_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_GROUP, #define ompi_file_get_group_f pompi_file_get_group_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_group PMPI_File_get_group -#endif void ompi_file_get_group_f(MPI_Fint *fh, MPI_Fint *group, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Group c_grp; - c_ierr = MPI_File_get_group(c_fh, &c_grp); + c_ierr = PMPI_File_get_group(c_fh, &c_grp); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *group = MPI_Group_c2f(c_grp); + *group = PMPI_Group_c2f(c_grp); } } diff --git a/ompi/mpi/fortran/mpif-h/file_get_info_f.c b/ompi/mpi/fortran/mpif-h/file_get_info_f.c index 579c295947..84cc8b1b58 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_info_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_INFO, #define ompi_file_get_info_f pompi_file_get_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_info PMPI_File_get_info -#endif void ompi_file_get_info_f(MPI_Fint *fh, MPI_Fint *info_used, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Info c_info; - c_ierr = MPI_File_get_info(c_fh, &c_info); + c_ierr = PMPI_File_get_info(c_fh, &c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *info_used = MPI_Info_c2f(c_info); + *info_used = PMPI_Info_c2f(c_info); } } diff --git a/ompi/mpi/fortran/mpif-h/file_get_position_f.c b/ompi/mpi/fortran/mpif-h/file_get_position_f.c index 4d74c720b8..3c1b2440fb 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_position_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_position_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION, #define ompi_file_get_position_f pompi_file_get_position_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_position PMPI_File_get_position -#endif void ompi_file_get_position_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Offset c_offset; - c_ierr = MPI_File_get_position(c_fh, &c_offset); + c_ierr = PMPI_File_get_position(c_fh, &c_offset); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c b/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c index a29858ca1f..79a4b45460 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_position_shared_f.c @@ -66,18 +66,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION_SHARED, #define ompi_file_get_position_shared_f pompi_file_get_position_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_position_shared PMPI_File_get_position_shared -#endif void ompi_file_get_position_shared_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Offset c_offset; - c_ierr = MPI_File_get_position_shared(c_fh, &c_offset); + c_ierr = PMPI_File_get_position_shared(c_fh, &c_offset); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/file_get_size_f.c b/ompi/mpi/fortran/mpif-h/file_get_size_f.c index 11f7058898..1363e2b2a1 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_size_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_size_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_SIZE, #define ompi_file_get_size_f pompi_file_get_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_size PMPI_File_get_size -#endif void ompi_file_get_size_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Offset c_size; - c_ierr = MPI_File_get_size(c_fh, &c_size); + c_ierr = PMPI_File_get_size(c_fh, &c_size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c b/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c index cd718a855d..d05d010e14 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_type_extent_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_TYPE_EXTENT, #define ompi_file_get_type_extent_f pompi_file_get_type_extent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_type_extent PMPI_File_get_type_extent -#endif void ompi_file_get_type_extent_f(MPI_Fint *fh, MPI_Fint *datatype, MPI_Aint *extent, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Datatype c_type; - c_type = MPI_Type_f2c(*datatype); + c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_get_type_extent(c_fh, c_type, extent); + c_ierr = PMPI_File_get_type_extent(c_fh, c_type, extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_get_view_f.c b/ompi/mpi/fortran/mpif-h/file_get_view_f.c index 6d87a36a30..b0a2904b44 100644 --- a/ompi/mpi/fortran/mpif-h/file_get_view_f.c +++ b/ompi/mpi/fortran/mpif-h/file_get_view_f.c @@ -68,28 +68,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_VIEW, #define ompi_file_get_view_f pompi_file_get_view_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_get_view PMPI_File_get_view -#endif void ompi_file_get_view_f(MPI_Fint *fh, MPI_Offset *disp, MPI_Fint *etype, MPI_Fint *filetype, char *datarep, MPI_Fint *ierr, int datarep_len) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); MPI_Datatype c_etype, c_filetype; MPI_Offset c_disp; char c_datarep[MPI_MAX_DATAREP_STRING]; - c_ierr = MPI_File_get_view(c_fh, &c_disp, &c_etype, + c_ierr = PMPI_File_get_view(c_fh, &c_disp, &c_etype, &c_filetype, c_datarep); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { *disp = (MPI_Offset) c_disp; - *etype = MPI_Type_c2f(c_etype); - *filetype = MPI_Type_c2f(c_filetype); + *etype = PMPI_Type_c2f(c_etype); + *filetype = PMPI_Type_c2f(c_filetype); ompi_fortran_string_c2f(c_datarep, datarep, datarep_len); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iread_all_f.c b/ompi/mpi/fortran/mpif-h/file_iread_all_f.c index f6ceea30ec..0a66972580 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_all_f.c @@ -67,24 +67,21 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_ALL, #define ompi_file_iread_all_f pompi_file_iread_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iread_all PMPI_File_iread_all -#endif void ompi_file_iread_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iread_all(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_iread_all(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c index 2289cdee27..5415c3a846 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_at_all_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_IREAD_AT_ALL, #define ompi_file_iread_at_all_f pompi_file_iread_at_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iread_at_all PMPI_File_iread_at_all -#endif void ompi_file_iread_at_all_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iread_at_all(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_iread_at_all(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, @@ -88,6 +85,6 @@ void ompi_file_iread_at_all_f(MPI_Fint *fh, MPI_Offset *offset, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iread_at_f.c b/ompi/mpi/fortran/mpif-h/file_iread_at_f.c index 65adbd950b..3a580555a2 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_at_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_IREAD_AT, #define ompi_file_iread_at_f pompi_file_iread_at_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iread_at PMPI_File_iread_at -#endif void ompi_file_iread_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iread_at(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_iread_at(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, @@ -88,6 +85,6 @@ void ompi_file_iread_at_f(MPI_Fint *fh, MPI_Offset *offset, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iread_f.c b/ompi/mpi/fortran/mpif-h/file_iread_f.c index c2a284c560..03c32fb631 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_f.c @@ -67,24 +67,21 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD, #define ompi_file_iread_f pompi_file_iread_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iread PMPI_File_iread -#endif void ompi_file_iread_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iread(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_iread(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c b/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c index 8bf5ba15a7..e58a260e13 100644 --- a/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iread_shared_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_SHARED, #define ompi_file_iread_shared_f pompi_file_iread_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iread_shared PMPI_File_iread_shared -#endif void ompi_file_iread_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iread_shared(c_fh, + c_ierr = PMPI_File_iread_shared(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, @@ -88,6 +85,6 @@ void ompi_file_iread_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c index b2a62a9257..6745b6ad7c 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_all_f.c @@ -67,23 +67,20 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_ALL, #define ompi_file_iwrite_all_f pompi_file_iwrite_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iwrite_all PMPI_File_iwrite_all -#endif void ompi_file_iwrite_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iwrite_all(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_iwrite_all(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c index c114c835ae..253279d5df 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_at_all_f.c @@ -67,26 +67,23 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_AT_ALL, #define ompi_file_iwrite_at_all_f pompi_file_iwrite_at_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all -#endif void ompi_file_iwrite_at_all_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iwrite_at_all(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_iwrite_at_all(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c index a2f96dfce8..21bdcb3971 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_at_f.c @@ -67,26 +67,23 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_AT, #define ompi_file_iwrite_at_f pompi_file_iwrite_at_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iwrite_at PMPI_File_iwrite_at -#endif void ompi_file_iwrite_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iwrite_at(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_iwrite_at(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_f.c index a0b4cf4bdc..9125505521 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_f.c @@ -67,23 +67,20 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE, #define ompi_file_iwrite_f pompi_file_iwrite_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iwrite PMPI_File_iwrite -#endif void ompi_file_iwrite_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iwrite(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_iwrite(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c b/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c index b2251eb015..6855f38df8 100644 --- a/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_iwrite_shared_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_SHARED, #define ompi_file_iwrite_shared_f pompi_file_iwrite_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_iwrite_shared PMPI_File_iwrite_shared -#endif void ompi_file_iwrite_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_request; - c_ierr = MPI_File_iwrite_shared(c_fh, + c_ierr = PMPI_File_iwrite_shared(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, @@ -88,6 +85,6 @@ void ompi_file_iwrite_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_request); + *request = PMPI_Request_c2f(c_request); } } diff --git a/ompi/mpi/fortran/mpif-h/file_open_f.c b/ompi/mpi/fortran/mpif-h/file_open_f.c index 258296056c..bfd220dd48 100644 --- a/ompi/mpi/fortran/mpif-h/file_open_f.c +++ b/ompi/mpi/fortran/mpif-h/file_open_f.c @@ -68,15 +68,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_OPEN, #define ompi_file_open_f pompi_file_open_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_open PMPI_File_open -#endif void ompi_file_open_f(MPI_Fint *comm, char *filename, MPI_Fint *amode, MPI_Fint *info, MPI_Fint *fh, MPI_Fint *ierr, int name_len) { - MPI_Comm c_comm = MPI_Comm_f2c(*comm); - MPI_Info c_info = MPI_Info_f2c(*info); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); + MPI_Info c_info = PMPI_Info_f2c(*info); MPI_File c_fh; char *c_filename; int c_ierr, ret; @@ -89,13 +86,13 @@ void ompi_file_open_f(MPI_Fint *comm, char *filename, MPI_Fint *amode, return; } - c_ierr = MPI_File_open(c_comm, c_filename, + c_ierr = PMPI_File_open(c_comm, c_filename, OMPI_FINT_2_INT(*amode), c_info, &c_fh); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *fh = MPI_File_c2f(c_fh); + *fh = PMPI_File_c2f(c_fh); } free(c_filename); diff --git a/ompi/mpi/fortran/mpif-h/file_preallocate_f.c b/ompi/mpi/fortran/mpif-h/file_preallocate_f.c index 5a0d41a259..330671d6b2 100644 --- a/ompi/mpi/fortran/mpif-h/file_preallocate_f.c +++ b/ompi/mpi/fortran/mpif-h/file_preallocate_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_PREALLOCATE, #define ompi_file_preallocate_f pompi_file_preallocate_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_preallocate PMPI_File_preallocate -#endif void ompi_file_preallocate_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_preallocate(c_fh, (MPI_Offset) *size); + c_ierr = PMPI_File_preallocate(c_fh, (MPI_Offset) *size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c index cef681a285..be07c2dfb2 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_begin_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_BEGIN, #define ompi_file_read_all_begin_f pompi_file_read_all_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_all_begin PMPI_File_read_all_begin -#endif void ompi_file_read_all_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_read_all_begin(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_read_all_begin(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c index 9b25448eb5..743a93ac89 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_END, #define ompi_file_read_all_end_f pompi_file_read_all_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_all_end PMPI_File_read_all_end -#endif void ompi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_all_end(c_fh, buf, c_status); + c_ierr = PMPI_File_read_all_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_read_all_f.c b/ompi/mpi/fortran/mpif-h/file_read_all_f.c index 2270618bf1..01eb990555 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_all_f.c @@ -69,21 +69,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL, #define ompi_file_read_all_f pompi_file_read_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_all PMPI_File_read_all -#endif void ompi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_all(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_read_all(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c index 034cc41254..fba1203a0f 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_begin_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_BEGIN, #define ompi_file_read_at_all_begin_f pompi_file_read_at_all_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_at_all_begin PMPI_File_read_at_all_begin -#endif void ompi_file_read_at_all_begin_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_read_at_all_begin(c_fh, + c_ierr = PMPI_File_read_at_all_begin(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c index 93b88bf0e5..a5da5897ed 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_END, #define ompi_file_read_at_all_end_f pompi_file_read_at_all_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_at_all_end PMPI_File_read_at_all_end -#endif void ompi_file_read_at_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_at_all_end(c_fh, buf, c_status); + c_ierr = PMPI_File_read_at_all_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c index 17f3cfa7ad..33655d314d 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_all_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL, #define ompi_file_read_at_all_f pompi_file_read_at_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_at_all PMPI_File_read_at_all -#endif void ompi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, @@ -79,13 +76,13 @@ void ompi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_at_all(c_fh, + c_ierr = PMPI_File_read_at_all(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_read_at_f.c b/ompi/mpi/fortran/mpif-h/file_read_at_f.c index c5c68b4016..6e2e437169 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_at_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT, #define ompi_file_read_at_f pompi_file_read_at_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_at PMPI_File_read_at -#endif void ompi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_at(c_fh, + c_ierr = PMPI_File_read_at(c_fh, (MPI_Offset) *offset, buf, OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_read_f.c b/ompi/mpi/fortran/mpif-h/file_read_f.c index e3d2b5543e..847ff32447 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_f.c @@ -69,21 +69,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ, #define ompi_file_read_f pompi_file_read_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read PMPI_File_read -#endif void ompi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_read(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c index a4a1fd7d1d..109b85c551 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_begin_f.c @@ -67,18 +67,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_BEGIN, #define ompi_file_read_ordered_begin_f pompi_file_read_ordered_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_ordered_begin PMPI_File_read_ordered_begin -#endif void ompi_file_read_ordered_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_read_ordered_begin(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_read_ordered_begin(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c index 65d4ffb3cc..d2a3ba5315 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_END, #define ompi_file_read_ordered_end_f pompi_file_read_ordered_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_ordered_end PMPI_File_read_ordered_end -#endif void ompi_file_read_ordered_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_ordered_end(c_fh, buf, c_status); + c_ierr = PMPI_File_read_ordered_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c b/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c index c71e1af961..38c83b0d64 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_ordered_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED, #define ompi_file_read_ordered_f pompi_file_read_ordered_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_ordered PMPI_File_read_ordered -#endif void ompi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_ordered(c_fh, + c_ierr = PMPI_File_read_ordered(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, diff --git a/ompi/mpi/fortran/mpif-h/file_read_shared_f.c b/ompi/mpi/fortran/mpif-h/file_read_shared_f.c index ba585b2a26..0475c9af6c 100644 --- a/ompi/mpi/fortran/mpif-h/file_read_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_read_shared_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_SHARED, #define ompi_file_read_shared_f pompi_file_read_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_read_shared PMPI_File_read_shared -#endif void ompi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_read_shared(c_fh, + c_ierr = PMPI_File_read_shared(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, diff --git a/ompi/mpi/fortran/mpif-h/file_seek_f.c b/ompi/mpi/fortran/mpif-h/file_seek_f.c index 5345fab75d..2474d15a90 100644 --- a/ompi/mpi/fortran/mpif-h/file_seek_f.c +++ b/ompi/mpi/fortran/mpif-h/file_seek_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK, #define ompi_file_seek_f pompi_file_seek_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_seek PMPI_File_seek -#endif void ompi_file_seek_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_seek(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_seek(c_fh, (MPI_Offset) *offset, OMPI_FINT_2_INT(*whence)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c b/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c index 8deee2594a..52fdfa2be6 100644 --- a/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_seek_shared_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK_SHARED, #define ompi_file_seek_shared_f pompi_file_seek_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_seek_shared PMPI_File_seek_shared -#endif void ompi_file_seek_shared_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_seek_shared(c_fh, (MPI_Offset) *offset, + c_ierr = PMPI_File_seek_shared(c_fh, (MPI_Offset) *offset, OMPI_FINT_2_INT(*whence)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c b/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c index dfbcd67c96..c255611b37 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_atomicity_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ATOMICITY, #define ompi_file_set_atomicity_f pompi_file_set_atomicity_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_set_atomicity PMPI_File_set_atomicity -#endif void ompi_file_set_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_set_atomicity(c_fh, + c_ierr = PMPI_File_set_atomicity(c_fh, OMPI_LOGICAL_2_INT(*flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c index 1374522c61..6415e38953 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_errhandler_f.c @@ -67,17 +67,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ERRHANDLER, #define ompi_file_set_errhandler_f pompi_file_set_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_set_errhandler PMPI_File_set_errhandler -#endif void ompi_file_set_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Errhandler c_err = MPI_Errhandler_f2c(*errhandler); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Errhandler c_err = PMPI_Errhandler_f2c(*errhandler); - c_ierr = MPI_File_set_errhandler(c_fh, c_err); + c_ierr = PMPI_File_set_errhandler(c_fh, c_err); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_set_info_f.c b/ompi/mpi/fortran/mpif-h/file_set_info_f.c index 9c0a9a1c05..da551cb0c0 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_info_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_INFO, #define ompi_file_set_info_f pompi_file_set_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_set_info PMPI_File_set_info -#endif void ompi_file_set_info_f(MPI_Fint *fh, MPI_Fint *info, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Info c_info = MPI_Info_f2c(*info); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Info c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_File_set_info(c_fh, c_info); + c_ierr = PMPI_File_set_info(c_fh, c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_set_size_f.c b/ompi/mpi/fortran/mpif-h/file_set_size_f.c index 41f81805f0..d6b5defeca 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_size_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_size_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_SIZE, #define ompi_file_set_size_f pompi_file_set_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_set_size PMPI_File_set_size -#endif void ompi_file_set_size_f(MPI_Fint *fh, MPI_Offset *size, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_set_size(c_fh, (MPI_Offset) *size); + c_ierr = PMPI_File_set_size(c_fh, (MPI_Offset) *size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_set_view_f.c b/ompi/mpi/fortran/mpif-h/file_set_view_f.c index 845cab8508..06794cf64f 100644 --- a/ompi/mpi/fortran/mpif-h/file_set_view_f.c +++ b/ompi/mpi/fortran/mpif-h/file_set_view_f.c @@ -68,19 +68,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_VIEW, #define ompi_file_set_view_f pompi_file_set_view_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_set_view PMPI_File_set_view -#endif void ompi_file_set_view_f(MPI_Fint *fh, MPI_Offset *disp, MPI_Fint *etype, MPI_Fint *filetype, char *datarep, MPI_Fint *info, MPI_Fint *ierr, int datarep_len) { - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_etype = MPI_Type_f2c(*etype); - MPI_Datatype c_filetype = MPI_Type_f2c(*filetype); - MPI_Info c_info = MPI_Info_f2c(*info); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_etype = PMPI_Type_f2c(*etype); + MPI_Datatype c_filetype = PMPI_Type_f2c(*filetype); + MPI_Info c_info = PMPI_Info_f2c(*info); char *c_datarep; int c_ierr, ret; @@ -92,7 +89,7 @@ void ompi_file_set_view_f(MPI_Fint *fh, MPI_Offset *disp, return; } - c_ierr = MPI_File_set_view(c_fh, (MPI_Offset) *disp, + c_ierr = PMPI_File_set_view(c_fh, (MPI_Offset) *disp, c_etype, c_filetype, c_datarep, c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_sync_f.c b/ompi/mpi/fortran/mpif-h/file_sync_f.c index 9f46cbaff9..090af850e6 100644 --- a/ompi/mpi/fortran/mpif-h/file_sync_f.c +++ b/ompi/mpi/fortran/mpif-h/file_sync_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SYNC, #define ompi_file_sync_f pompi_file_sync_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_sync PMPI_File_sync -#endif void ompi_file_sync_f(MPI_Fint *fh, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); - c_ierr = MPI_File_sync(c_fh); + c_ierr = PMPI_File_sync(c_fh); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c index 5503602edf..c10a616ce0 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_begin_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_BEGIN, #define ompi_file_write_all_begin_f pompi_file_write_all_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_all_begin PMPI_File_write_all_begin -#endif void ompi_file_write_all_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_write_all_begin(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_write_all_begin(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c index c393a194f3..2fd4213eb7 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_END, #define ompi_file_write_all_end_f pompi_file_write_all_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_all_end PMPI_File_write_all_end -#endif void ompi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_all_end(c_fh, buf, c_status); + c_ierr = PMPI_File_write_all_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_write_all_f.c b/ompi/mpi/fortran/mpif-h/file_write_all_f.c index ac97737b4d..b7f7d33453 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_all_f.c @@ -69,21 +69,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL, #define ompi_file_write_all_f pompi_file_write_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_all PMPI_File_write_all -#endif void ompi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_all(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_write_all(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c index ccc208c109..3f5df5f600 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_begin_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_BEGIN, #define ompi_file_write_at_all_begin_f pompi_file_write_at_all_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_at_all_begin PMPI_File_write_at_all_begin -#endif void ompi_file_write_at_all_begin_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_write_at_all_begin(c_fh, + c_ierr = PMPI_File_write_at_all_begin(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c index 418d608496..9375947157 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_END, #define ompi_file_write_at_all_end_f pompi_file_write_at_all_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_at_all_end PMPI_File_write_at_all_end -#endif void ompi_file_write_at_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_at_all_end(c_fh, buf, c_status); + c_ierr = PMPI_File_write_at_all_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c index e808352795..fb5104a94b 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_all_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL, #define ompi_file_write_at_all_f pompi_file_write_at_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_at_all PMPI_File_write_at_all -#endif void ompi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, @@ -79,13 +76,13 @@ void ompi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_at_all(c_fh, + c_ierr = PMPI_File_write_at_all(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_write_at_f.c b/ompi/mpi/fortran/mpif-h/file_write_at_f.c index 79c7013158..1610fb3ad1 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_at_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_at_f.c @@ -68,22 +68,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT, #define ompi_file_write_at_f pompi_file_write_at_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_at PMPI_File_write_at -#endif void ompi_file_write_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_at(c_fh, + c_ierr = PMPI_File_write_at(c_fh, (MPI_Offset) *offset, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), diff --git a/ompi/mpi/fortran/mpif-h/file_write_f.c b/ompi/mpi/fortran/mpif-h/file_write_f.c index 14d61abc94..aa888b407b 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_f.c @@ -69,21 +69,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE, #define ompi_file_write_f pompi_file_write_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write PMPI_File_write -#endif void ompi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_write(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c index 52dbe6677f..3884201de7 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_begin_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_BEGIN, #define ompi_file_write_ordered_begin_f pompi_file_write_ordered_begin_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_ordered_begin PMPI_File_write_ordered_begin -#endif void ompi_file_write_ordered_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_File_write_ordered_begin(c_fh, OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_File_write_ordered_begin(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c index 83e760080c..1f46dd0104 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_end_f.c @@ -69,20 +69,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_END, #define ompi_file_write_ordered_end_f pompi_file_write_ordered_end_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_ordered_end PMPI_File_write_ordered_end -#endif void ompi_file_write_ordered_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); + MPI_File c_fh = PMPI_File_f2c(*fh); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_ordered_end(c_fh, buf, c_status); + c_ierr = PMPI_File_write_ordered_end(c_fh, buf, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) diff --git a/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c b/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c index 7d8977dc47..af30e853be 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_ordered_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED, #define ompi_file_write_ordered_f pompi_file_write_ordered_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_ordered PMPI_File_write_ordered -#endif void ompi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_ordered(c_fh, + c_ierr = PMPI_File_write_ordered(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, diff --git a/ompi/mpi/fortran/mpif-h/file_write_shared_f.c b/ompi/mpi/fortran/mpif-h/file_write_shared_f.c index 6a28e91b0b..5f3b2bf5a4 100644 --- a/ompi/mpi/fortran/mpif-h/file_write_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/file_write_shared_f.c @@ -69,22 +69,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_SHARED, #define ompi_file_write_shared_f pompi_file_write_shared_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_File_write_shared PMPI_File_write_shared -#endif void ompi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_File c_fh = MPI_File_f2c(*fh); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_File c_fh = PMPI_File_f2c(*fh); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_File_write_shared(c_fh, + c_ierr = PMPI_File_write_shared(c_fh, OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, diff --git a/ompi/mpi/fortran/mpif-h/finalize_f.c b/ompi/mpi/fortran/mpif-h/finalize_f.c index bc361c25f1..c142e4f606 100644 --- a/ompi/mpi/fortran/mpif-h/finalize_f.c +++ b/ompi/mpi/fortran/mpif-h/finalize_f.c @@ -66,12 +66,9 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZE, #define ompi_finalize_f pompi_finalize_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Finalize PMPI_Finalize -#endif void ompi_finalize_f(MPI_Fint *ierr) { - int c_ierr = MPI_Finalize(); + int c_ierr = PMPI_Finalize(); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/finalized_f.c b/ompi/mpi/fortran/mpif-h/finalized_f.c index beb9073ff3..3aca2701a7 100644 --- a/ompi/mpi/fortran/mpif-h/finalized_f.c +++ b/ompi/mpi/fortran/mpif-h/finalized_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZED, #define ompi_finalized_f pompi_finalized_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Finalized PMPI_Finalized -#endif void ompi_finalized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Finalized(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); + c_ierr = PMPI_Finalized(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/free_mem_f.c b/ompi/mpi/fortran/mpif-h/free_mem_f.c index f9c763c0f6..3967cfab0a 100644 --- a/ompi/mpi/fortran/mpif-h/free_mem_f.c +++ b/ompi/mpi/fortran/mpif-h/free_mem_f.c @@ -66,12 +66,9 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FREE_MEM, #define ompi_free_mem_f pompi_free_mem_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Free_mem PMPI_Free_mem -#endif void ompi_free_mem_f(char *base, MPI_Fint *ierr) { - int c_ierr = MPI_Free_mem(base); + int c_ierr = PMPI_Free_mem(base); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/gather_f.c b/ompi/mpi/fortran/mpif-h/gather_f.c index 482e31c773..723b759f30 100644 --- a/ompi/mpi/fortran/mpif-h/gather_f.c +++ b/ompi/mpi/fortran/mpif-h/gather_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHER, #define ompi_gather_f pompi_gather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Gather PMPI_Gather -#endif void ompi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -79,15 +76,15 @@ void ompi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Comm c_comm; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Gather(sendbuf, OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Gather(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_FINT_2_INT(*recvcount), c_recvtype, diff --git a/ompi/mpi/fortran/mpif-h/gatherv_f.c b/ompi/mpi/fortran/mpif-h/gatherv_f.c index ed73e80e64..d7bbfcfa7e 100644 --- a/ompi/mpi/fortran/mpif-h/gatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/gatherv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHERV, #define ompi_gatherv_f pompi_gatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Gatherv PMPI_Gatherv -#endif void ompi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -82,11 +79,11 @@ void ompi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -94,7 +91,7 @@ void ompi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Gatherv(sendbuf, OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Gatherv(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_ARRAY_NAME_CONVERT(recvcounts), OMPI_ARRAY_NAME_CONVERT(displs), diff --git a/ompi/mpi/fortran/mpif-h/get_accumulate_f.c b/ompi/mpi/fortran/mpif-h/get_accumulate_f.c index f377c9bcf3..b70032f369 100644 --- a/ompi/mpi/fortran/mpif-h/get_accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/get_accumulate_f.c @@ -71,9 +71,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ACCUMULATE, #define ompi_get_accumulate_f pompi_get_accumulate_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_accumulate PMPI_Get_accumulate -#endif void ompi_get_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, char *result_addr, @@ -83,13 +80,13 @@ void ompi_get_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_result_datatype = MPI_Type_f2c(*result_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Op c_op = MPI_Op_f2c(*op); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_result_datatype = PMPI_Type_f2c(*result_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Op c_op = PMPI_Op_f2c(*op); - c_ierr = MPI_Get_accumulate(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Get_accumulate(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_F2C_BOTTOM(result_addr), diff --git a/ompi/mpi/fortran/mpif-h/get_address_f.c b/ompi/mpi/fortran/mpif-h/get_address_f.c index 52b8ca4769..3cd17e7799 100644 --- a/ompi/mpi/fortran/mpif-h/get_address_f.c +++ b/ompi/mpi/fortran/mpif-h/get_address_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ADDRESS, #define ompi_get_address_f pompi_get_address_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_address PMPI_Get_address -#endif void ompi_get_address_f(char *location, MPI_Aint *address, MPI_Fint *ierr) { int c_ierr; MPI_Aint c_address; - c_ierr = MPI_Get_address(location, &c_address); + c_ierr = PMPI_Get_address(location, &c_address); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/get_count_f.c b/ompi/mpi/fortran/mpif-h/get_count_f.c index 3c4c7f3f82..9fdff89773 100644 --- a/ompi/mpi/fortran/mpif-h/get_count_f.c +++ b/ompi/mpi/fortran/mpif-h/get_count_f.c @@ -67,14 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_COUNT, #define ompi_get_count_f pompi_get_count_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_count PMPI_Get_count -#endif void ompi_get_count_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Status c_status; OMPI_SINGLE_NAME_DECL(count); @@ -82,10 +79,10 @@ void ompi_get_count_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI *count = OMPI_INT_2_FINT(0); c_ierr = MPI_SUCCESS; } else { - c_ierr = MPI_Status_f2c(status, &c_status); + c_ierr = PMPI_Status_f2c(status, &c_status); if (MPI_SUCCESS == c_ierr) { - c_ierr = MPI_Get_count(&c_status, c_type, + c_ierr = PMPI_Get_count(&c_status, c_type, OMPI_SINGLE_NAME_CONVERT(count)); OMPI_SINGLE_INT_2_FINT(count); } diff --git a/ompi/mpi/fortran/mpif-h/get_elements_f.c b/ompi/mpi/fortran/mpif-h/get_elements_f.c index 83d6f39493..5f5ecb5e47 100644 --- a/ompi/mpi/fortran/mpif-h/get_elements_f.c +++ b/ompi/mpi/fortran/mpif-h/get_elements_f.c @@ -67,14 +67,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ELEMENTS, #define ompi_get_elements_f pompi_get_elements_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_elements PMPI_Get_elements -#endif void ompi_get_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Status c_status; OMPI_SINGLE_NAME_DECL(count); @@ -82,10 +79,10 @@ void ompi_get_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, *count = OMPI_INT_2_FINT(0); c_ierr = MPI_SUCCESS; } else { - c_ierr = MPI_Status_f2c(status, &c_status); + c_ierr = PMPI_Status_f2c(status, &c_status); if (MPI_SUCCESS == c_ierr) { - c_ierr = MPI_Get_elements(&c_status, c_type, + c_ierr = PMPI_Get_elements(&c_status, c_type, OMPI_SINGLE_NAME_CONVERT(count)); OMPI_SINGLE_INT_2_FINT(count); } diff --git a/ompi/mpi/fortran/mpif-h/get_elements_x_f.c b/ompi/mpi/fortran/mpif-h/get_elements_x_f.c index c82af9184f..2db600a963 100644 --- a/ompi/mpi/fortran/mpif-h/get_elements_x_f.c +++ b/ompi/mpi/fortran/mpif-h/get_elements_x_f.c @@ -69,14 +69,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ELEMENTS_X, #define ompi_get_elements_x_f pompi_get_elements_x_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_elements_x PMPI_Get_elements_x -#endif void ompi_get_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Count *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Status c_status; OMPI_SINGLE_NAME_DECL(count); @@ -84,10 +81,10 @@ void ompi_get_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Count *coun *count = OMPI_INT_2_FINT(0); c_ierr = MPI_SUCCESS; } else { - c_ierr = MPI_Status_f2c(status, &c_status); + c_ierr = PMPI_Status_f2c(status, &c_status); if (MPI_SUCCESS == c_ierr) { - c_ierr = MPI_Get_elements_x(&c_status, c_type, count); + c_ierr = PMPI_Get_elements_x(&c_status, c_type, count); } } if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/get_f.c b/ompi/mpi/fortran/mpif-h/get_f.c index d7712c96ab..ec318720fe 100644 --- a/ompi/mpi/fortran/mpif-h/get_f.c +++ b/ompi/mpi/fortran/mpif-h/get_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET, #define ompi_get_f pompi_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get PMPI_Get -#endif void ompi_get_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -78,11 +75,11 @@ void ompi_get_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Get(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Get(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), diff --git a/ompi/mpi/fortran/mpif-h/get_library_version_f.c b/ompi/mpi/fortran/mpif-h/get_library_version_f.c index 7e7d624b4d..a42ce70a7a 100644 --- a/ompi/mpi/fortran/mpif-h/get_library_version_f.c +++ b/ompi/mpi/fortran/mpif-h/get_library_version_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_LIBRARY_VERSION, #define ompi_get_library_version_f pompi_get_library_version_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_library_version PMPI_Get_library_version -#endif void ompi_get_library_version_f(char *version, MPI_Fint *resultlen, MPI_Fint *ierr, MPI_Fint version_len) @@ -77,7 +74,7 @@ void ompi_get_library_version_f(char *version, MPI_Fint *resultlen, int c_ierr, c_resultlen; char c_version[MPI_MAX_LIBRARY_VERSION_STRING]; - c_ierr = MPI_Get_library_version(c_version, &c_resultlen); + c_ierr = PMPI_Get_library_version(c_version, &c_resultlen); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/get_processor_name_f.c b/ompi/mpi/fortran/mpif-h/get_processor_name_f.c index 80f062ea62..1b5b1e7611 100644 --- a/ompi/mpi/fortran/mpif-h/get_processor_name_f.c +++ b/ompi/mpi/fortran/mpif-h/get_processor_name_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_PROCESSOR_NAME, #define ompi_get_processor_name_f pompi_get_processor_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_processor_name PMPI_Get_processor_name -#endif static const char FUNC_NAME[] = "MPI_GET_PROCESSOR_NAME"; @@ -87,8 +84,8 @@ void ompi_get_processor_name_f(char *name, MPI_Fint *resultlen, MPI_Fint *ierr, char c_name[MPI_MAX_PROCESSOR_NAME]; OMPI_SINGLE_NAME_DECL(resultlen); - ierr_c = MPI_Get_processor_name(c_name, - OMPI_SINGLE_NAME_CONVERT(resultlen)); + ierr_c = PMPI_Get_processor_name(c_name, + OMPI_SINGLE_NAME_CONVERT(resultlen)); if (MPI_SUCCESS == ierr_c) { OMPI_SINGLE_INT_2_FINT(resultlen); diff --git a/ompi/mpi/fortran/mpif-h/get_version_f.c b/ompi/mpi/fortran/mpif-h/get_version_f.c index 83ecb4e00b..60bdc6e846 100644 --- a/ompi/mpi/fortran/mpif-h/get_version_f.c +++ b/ompi/mpi/fortran/mpif-h/get_version_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_VERSION, #define ompi_get_version_f pompi_get_version_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Get_version PMPI_Get_version -#endif void ompi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr) { @@ -76,7 +73,7 @@ void ompi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr) OMPI_SINGLE_NAME_DECL(version); OMPI_SINGLE_NAME_DECL(subversion); - c_ierr = MPI_Get_version(OMPI_SINGLE_NAME_CONVERT(version), + c_ierr = PMPI_Get_version(OMPI_SINGLE_NAME_CONVERT(version), OMPI_SINGLE_NAME_CONVERT(subversion)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/graph_create_f.c b/ompi/mpi/fortran/mpif-h/graph_create_f.c index 7478f2f4db..397931dfa1 100644 --- a/ompi/mpi/fortran/mpif-h/graph_create_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_CREATE, #define ompi_graph_create_f pompi_graph_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graph_create PMPI_Graph_create -#endif void ompi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *indx, MPI_Fint *edges, @@ -80,14 +77,14 @@ void ompi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes, OMPI_ARRAY_NAME_DECL(indx); OMPI_ARRAY_NAME_DECL(edges); - c_comm_old = MPI_Comm_f2c(*comm_old); + c_comm_old = PMPI_Comm_f2c(*comm_old); OMPI_ARRAY_FINT_2_INT(indx, *nnodes); /* Number of edges is equal to the last entry in the index array */ OMPI_ARRAY_FINT_2_INT(edges, indx[*nnodes - 1]); - c_ierr = MPI_Graph_create(c_comm_old, + c_ierr = PMPI_Graph_create(c_comm_old, OMPI_FINT_2_INT(*nnodes), OMPI_ARRAY_NAME_CONVERT(indx), OMPI_ARRAY_NAME_CONVERT(edges), @@ -96,7 +93,7 @@ void ompi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (OMPI_SUCCESS == c_ierr) { - *comm_graph = MPI_Comm_c2f(c_comm_graph); + *comm_graph = PMPI_Comm_c2f(c_comm_graph); } OMPI_ARRAY_FINT_2_INT_CLEANUP(indx); diff --git a/ompi/mpi/fortran/mpif-h/graph_get_f.c b/ompi/mpi/fortran/mpif-h/graph_get_f.c index c38c228fbe..895d29c115 100644 --- a/ompi/mpi/fortran/mpif-h/graph_get_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_get_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_GET, #define ompi_graph_get_f pompi_graph_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graph_get PMPI_Graph_get -#endif void ompi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex, MPI_Fint *maxedges, MPI_Fint *indx, @@ -79,11 +76,11 @@ void ompi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex, OMPI_ARRAY_NAME_DECL(indx); OMPI_ARRAY_NAME_DECL(edges); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); OMPI_ARRAY_FINT_2_INT_ALLOC(indx, *maxindex); OMPI_ARRAY_FINT_2_INT_ALLOC(edges, *maxedges); - c_ierr = MPI_Graph_get(c_comm, + c_ierr = PMPI_Graph_get(c_comm, OMPI_FINT_2_INT(*maxindex), OMPI_FINT_2_INT(*maxedges), OMPI_ARRAY_NAME_CONVERT(indx), diff --git a/ompi/mpi/fortran/mpif-h/graph_map_f.c b/ompi/mpi/fortran/mpif-h/graph_map_f.c index a7c1394cb6..34a563b9d2 100644 --- a/ompi/mpi/fortran/mpif-h/graph_map_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_map_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_MAP, #define ompi_graph_map_f pompi_graph_map_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graph_map PMPI_Graph_map -#endif void ompi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *indx, MPI_Fint *edges, MPI_Fint *nrank, MPI_Fint *ierr) @@ -79,13 +76,13 @@ void ompi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *indx, OMPI_ARRAY_NAME_DECL(edges); OMPI_SINGLE_NAME_DECL(nrank); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); /* Number of edges is equal to the last entry in the index array */ OMPI_ARRAY_FINT_2_INT(edges, indx[*nnodes - 1]); OMPI_ARRAY_FINT_2_INT(indx, *nnodes); - c_ierr = MPI_Graph_map(c_comm, OMPI_FINT_2_INT(*nnodes), + c_ierr = PMPI_Graph_map(c_comm, OMPI_FINT_2_INT(*nnodes), OMPI_ARRAY_NAME_CONVERT(indx), OMPI_ARRAY_NAME_CONVERT(edges), OMPI_SINGLE_NAME_CONVERT(nrank)); diff --git a/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c b/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c index 14bd9f3f4c..f8faaef4a6 100644 --- a/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_neighbors_count_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS_COUNT, #define ompi_graph_neighbors_count_f pompi_graph_neighbors_count_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graph_neighbors_count PMPI_Graph_neighbors_count -#endif void ompi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *nneighbors, MPI_Fint *ierr) @@ -77,9 +74,9 @@ void ompi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Comm c_comm; OMPI_SINGLE_NAME_DECL(nneighbors); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Graph_neighbors_count(c_comm, + c_ierr = PMPI_Graph_neighbors_count(c_comm, OMPI_FINT_2_INT(*rank), OMPI_SINGLE_NAME_CONVERT(nneighbors)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c b/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c index 606543beac..9105d61207 100644 --- a/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c +++ b/ompi/mpi/fortran/mpif-h/graph_neighbors_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS, #define ompi_graph_neighbors_f pompi_graph_neighbors_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graph_neighbors PMPI_Graph_neighbors -#endif void ompi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxneighbors, MPI_Fint *neighbors, @@ -80,11 +77,11 @@ void ompi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Comm c_comm; OMPI_ARRAY_NAME_DECL(neighbors); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); OMPI_ARRAY_FINT_2_INT_ALLOC(neighbors, *maxneighbors); - c_ierr = MPI_Graph_neighbors(c_comm, + c_ierr = PMPI_Graph_neighbors(c_comm, OMPI_FINT_2_INT(*rank), OMPI_FINT_2_INT(*maxneighbors), OMPI_ARRAY_NAME_CONVERT(neighbors) diff --git a/ompi/mpi/fortran/mpif-h/graphdims_get_f.c b/ompi/mpi/fortran/mpif-h/graphdims_get_f.c index d885789b04..92f5beae7b 100644 --- a/ompi/mpi/fortran/mpif-h/graphdims_get_f.c +++ b/ompi/mpi/fortran/mpif-h/graphdims_get_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPHDIMS_GET, #define ompi_graphdims_get_f pompi_graphdims_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Graphdims_get PMPI_Graphdims_get -#endif void ompi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *nedges, MPI_Fint *ierr) @@ -78,9 +75,9 @@ void ompi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes, OMPI_SINGLE_NAME_DECL(nnodes); OMPI_SINGLE_NAME_DECL(nedges); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Graphdims_get(c_comm, + c_ierr = PMPI_Graphdims_get(c_comm, OMPI_SINGLE_NAME_CONVERT(nnodes), OMPI_SINGLE_NAME_CONVERT(nedges) ); diff --git a/ompi/mpi/fortran/mpif-h/grequest_complete_f.c b/ompi/mpi/fortran/mpif-h/grequest_complete_f.c index cf76b4ee7c..54dbfd92f2 100644 --- a/ompi/mpi/fortran/mpif-h/grequest_complete_f.c +++ b/ompi/mpi/fortran/mpif-h/grequest_complete_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_COMPLETE, #define ompi_grequest_complete_f pompi_grequest_complete_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Grequest_complete PMPI_Grequest_complete -#endif void ompi_grequest_complete_f(MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c(*request); + MPI_Request c_req = PMPI_Request_f2c(*request); - c_ierr = MPI_Grequest_complete(c_req); + c_ierr = PMPI_Grequest_complete(c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/grequest_start_f.c b/ompi/mpi/fortran/mpif-h/grequest_start_f.c index b3941df41b..803b0ef1e0 100644 --- a/ompi/mpi/fortran/mpif-h/grequest_start_f.c +++ b/ompi/mpi/fortran/mpif-h/grequest_start_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_START, #define ompi_grequest_start_f pompi_grequest_start_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Grequest_start PMPI_Grequest_start -#endif void ompi_grequest_start_f(MPI_F_Grequest_query_function* query_fn, MPI_F_Grequest_free_function* free_fn, @@ -78,7 +75,7 @@ void ompi_grequest_start_f(MPI_F_Grequest_query_function* query_fn, { int c_ierr; MPI_Request c_req; - c_ierr = MPI_Grequest_start( + c_ierr = PMPI_Grequest_start( (MPI_Grequest_query_function *) query_fn, (MPI_Grequest_free_function *) free_fn, (MPI_Grequest_cancel_function *) cancel_fn, @@ -91,6 +88,6 @@ void ompi_grequest_start_f(MPI_F_Grequest_query_function* query_fn, ompi_grequest_t *g = (ompi_grequest_t*) c_req; g->greq_funcs_are_c = false; - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/group_compare_f.c b/ompi/mpi/fortran/mpif-h/group_compare_f.c index d5c74e3b96..285003dffe 100644 --- a/ompi/mpi/fortran/mpif-h/group_compare_f.c +++ b/ompi/mpi/fortran/mpif-h/group_compare_f.c @@ -71,9 +71,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_COMPARE, #define ompi_group_compare_f pompi_group_compare_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_compare PMPI_Group_compare -#endif void ompi_group_compare_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *result, MPI_Fint *ierr) @@ -83,10 +80,10 @@ void ompi_group_compare_f(MPI_Fint *group1, MPI_Fint *group2, OMPI_SINGLE_NAME_DECL(result); /* make the fortran to c representation conversion */ - c_group1 = MPI_Group_f2c(*group1); - c_group2 = MPI_Group_f2c(*group2); + c_group1 = PMPI_Group_f2c(*group1); + c_group2 = PMPI_Group_f2c(*group2); - c_ierr = MPI_Group_compare(c_group1, c_group2, + c_ierr = PMPI_Group_compare(c_group1, c_group2, OMPI_SINGLE_NAME_CONVERT(result) ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/group_difference_f.c b/ompi/mpi/fortran/mpif-h/group_difference_f.c index 20459788cd..ab66909080 100644 --- a/ompi/mpi/fortran/mpif-h/group_difference_f.c +++ b/ompi/mpi/fortran/mpif-h/group_difference_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_DIFFERENCE, #define ompi_group_difference_f pompi_group_difference_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_difference PMPI_Group_difference -#endif void ompi_group_difference_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -77,10 +74,10 @@ void ompi_group_difference_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgr ompi_group_t *c_group1, *c_group2, *c_newgroup; /* Make the fortran to c representation conversion */ - c_group1 = MPI_Group_f2c(*group1); - c_group2 = MPI_Group_f2c(*group2); + c_group1 = PMPI_Group_f2c(*group1); + c_group2 = PMPI_Group_f2c(*group2); - c_ierr = MPI_Group_difference(c_group1, c_group2, &c_newgroup); + c_ierr = PMPI_Group_difference(c_group1, c_group2, &c_newgroup); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* translate the results from c to fortran */ diff --git a/ompi/mpi/fortran/mpif-h/group_excl_f.c b/ompi/mpi/fortran/mpif-h/group_excl_f.c index fd68ee7d94..4835f77de7 100644 --- a/ompi/mpi/fortran/mpif-h/group_excl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_excl_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_EXCL, #define ompi_group_excl_f pompi_group_excl_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_excl PMPI_Group_excl -#endif void ompi_group_excl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint *ranks, MPI_Fint *newgroup, @@ -80,10 +77,10 @@ void ompi_group_excl_f(MPI_Fint *group, MPI_Fint *n, OMPI_ARRAY_NAME_DECL(ranks); /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); OMPI_ARRAY_FINT_2_INT(ranks, *n); - c_ierr = MPI_Group_excl(c_group, + c_ierr = PMPI_Group_excl(c_group, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(ranks), &c_newgroup); diff --git a/ompi/mpi/fortran/mpif-h/group_free_f.c b/ompi/mpi/fortran/mpif-h/group_free_f.c index 814e0b8778..157b55be15 100644 --- a/ompi/mpi/fortran/mpif-h/group_free_f.c +++ b/ompi/mpi/fortran/mpif-h/group_free_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_FREE, #define ompi_group_free_f pompi_group_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_free PMPI_Group_free -#endif void ompi_group_free_f(MPI_Fint *group, MPI_Fint *ierr) { @@ -78,8 +75,8 @@ void ompi_group_free_f(MPI_Fint *group, MPI_Fint *ierr) /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); - c_ierr = MPI_Group_free( &c_group ); + c_group = PMPI_Group_f2c(*group); + c_ierr = PMPI_Group_free( &c_group ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* This value comes from the MPI_GROUP_NULL value in mpif.h. Do not diff --git a/ompi/mpi/fortran/mpif-h/group_incl_f.c b/ompi/mpi/fortran/mpif-h/group_incl_f.c index f0042d6a36..6741c6558f 100644 --- a/ompi/mpi/fortran/mpif-h/group_incl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_incl_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INCL, #define ompi_group_incl_f pompi_group_incl_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_incl PMPI_Group_incl -#endif void ompi_group_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint *ranks, MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -79,10 +76,10 @@ void ompi_group_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint *ranks, MPI_Fint * OMPI_ARRAY_NAME_DECL(ranks); /* make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); OMPI_ARRAY_FINT_2_INT(ranks, *n); - c_ierr = MPI_Group_incl(c_group, + c_ierr = PMPI_Group_incl(c_group, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(ranks), &c_newgroup); diff --git a/ompi/mpi/fortran/mpif-h/group_intersection_f.c b/ompi/mpi/fortran/mpif-h/group_intersection_f.c index a0b1c80e78..3f54892967 100644 --- a/ompi/mpi/fortran/mpif-h/group_intersection_f.c +++ b/ompi/mpi/fortran/mpif-h/group_intersection_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INTERSECTION, #define ompi_group_intersection_f pompi_group_intersection_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_intersection PMPI_Group_intersection -#endif void ompi_group_intersection_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -77,10 +74,10 @@ void ompi_group_intersection_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *new ompi_group_t *c_group1, *c_group2, *c_newgroup; /* Make the fortran to c representation conversion */ - c_group1 = MPI_Group_f2c(*group1); - c_group2 = MPI_Group_f2c(*group2); + c_group1 = PMPI_Group_f2c(*group1); + c_group2 = PMPI_Group_f2c(*group2); - c_ierr = MPI_Group_intersection(c_group1, c_group2, &c_newgroup); + c_ierr = PMPI_Group_intersection(c_group1, c_group2, &c_newgroup); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* translate the results from c to fortran */ diff --git a/ompi/mpi/fortran/mpif-h/group_range_excl_f.c b/ompi/mpi/fortran/mpif-h/group_range_excl_f.c index f286d3d1ce..d5d07f7ead 100644 --- a/ompi/mpi/fortran/mpif-h/group_range_excl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_range_excl_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_EXCL, #define ompi_group_range_excl_f pompi_group_range_excl_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_range_excl PMPI_Group_range_excl -#endif void ompi_group_range_excl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -78,10 +75,10 @@ void ompi_group_range_excl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], OMPI_2_DIM_ARRAY_NAME_DECL(ranges, 3); /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); OMPI_2_DIM_ARRAY_FINT_2_INT(ranges, *n, 3); - c_ierr = MPI_Group_range_excl(c_group, + c_ierr = PMPI_Group_range_excl(c_group, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(ranges), &c_newgroup); diff --git a/ompi/mpi/fortran/mpif-h/group_range_incl_f.c b/ompi/mpi/fortran/mpif-h/group_range_incl_f.c index a5a6da7b0e..a17d43847f 100644 --- a/ompi/mpi/fortran/mpif-h/group_range_incl_f.c +++ b/ompi/mpi/fortran/mpif-h/group_range_incl_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_INCL, #define ompi_group_range_incl_f pompi_group_range_incl_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_range_incl PMPI_Group_range_incl -#endif void ompi_group_range_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -78,10 +75,10 @@ void ompi_group_range_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], OMPI_2_DIM_ARRAY_NAME_DECL(ranges, 3); /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); OMPI_2_DIM_ARRAY_FINT_2_INT(ranges, *n, 3); - c_ierr = MPI_Group_range_incl(c_group, + c_ierr = PMPI_Group_range_incl(c_group, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(ranges), &c_newgroup); diff --git a/ompi/mpi/fortran/mpif-h/group_rank_f.c b/ompi/mpi/fortran/mpif-h/group_rank_f.c index 2c32571a21..874b3ba40f 100644 --- a/ompi/mpi/fortran/mpif-h/group_rank_f.c +++ b/ompi/mpi/fortran/mpif-h/group_rank_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANK, #define ompi_group_rank_f pompi_group_rank_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_rank PMPI_Group_rank -#endif void ompi_group_rank_f(MPI_Fint *group, MPI_Fint *rank, MPI_Fint *ierr) { @@ -78,9 +75,9 @@ void ompi_group_rank_f(MPI_Fint *group, MPI_Fint *rank, MPI_Fint *ierr) OMPI_SINGLE_NAME_DECL(rank); /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); - c_ierr = MPI_Group_rank(c_group, OMPI_SINGLE_NAME_CONVERT(rank)); + c_ierr = PMPI_Group_rank(c_group, OMPI_SINGLE_NAME_CONVERT(rank)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/group_size_f.c b/ompi/mpi/fortran/mpif-h/group_size_f.c index 52d22459ed..e6c327913b 100644 --- a/ompi/mpi/fortran/mpif-h/group_size_f.c +++ b/ompi/mpi/fortran/mpif-h/group_size_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_SIZE, #define ompi_group_size_f pompi_group_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_size PMPI_Group_size -#endif void ompi_group_size_f(MPI_Fint *group, MPI_Fint *size, MPI_Fint *ierr) { @@ -78,9 +75,9 @@ void ompi_group_size_f(MPI_Fint *group, MPI_Fint *size, MPI_Fint *ierr) OMPI_SINGLE_NAME_DECL(size); /* Make the fortran to c representation conversion */ - c_group = MPI_Group_f2c(*group); + c_group = PMPI_Group_f2c(*group); - c_ierr = MPI_Group_size(c_group, OMPI_SINGLE_NAME_CONVERT(size)); + c_ierr = PMPI_Group_size(c_group, OMPI_SINGLE_NAME_CONVERT(size)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c b/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c index 63a6cf417f..a167637516 100644 --- a/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c +++ b/ompi/mpi/fortran/mpif-h/group_translate_ranks_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_TRANSLATE_RANKS, #define ompi_group_translate_ranks_f pompi_group_translate_ranks_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_translate_ranks PMPI_Group_translate_ranks -#endif void ompi_group_translate_ranks_f(MPI_Fint *group1, MPI_Fint *n, MPI_Fint *ranks1, MPI_Fint *group2, @@ -81,13 +78,13 @@ void ompi_group_translate_ranks_f(MPI_Fint *group1, MPI_Fint *n, OMPI_ARRAY_NAME_DECL(ranks2); /* Make the fortran to c representation conversion */ - c_group1 = MPI_Group_f2c(*group1); - c_group2 = MPI_Group_f2c(*group2); + c_group1 = PMPI_Group_f2c(*group1); + c_group2 = PMPI_Group_f2c(*group2); OMPI_ARRAY_FINT_2_INT(ranks1, *n); OMPI_ARRAY_FINT_2_INT_ALLOC(ranks2, *n); - c_ierr = MPI_Group_translate_ranks(c_group1, + c_ierr = PMPI_Group_translate_ranks(c_group1, OMPI_FINT_2_INT(*n), OMPI_ARRAY_NAME_CONVERT(ranks1), c_group2, diff --git a/ompi/mpi/fortran/mpif-h/group_union_f.c b/ompi/mpi/fortran/mpif-h/group_union_f.c index 313fe128d0..dda07eb680 100644 --- a/ompi/mpi/fortran/mpif-h/group_union_f.c +++ b/ompi/mpi/fortran/mpif-h/group_union_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_UNION, #define ompi_group_union_f pompi_group_union_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Group_union PMPI_Group_union -#endif void ompi_group_union_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr) { @@ -77,10 +74,10 @@ void ompi_group_union_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, ompi_group_t *c_group1, *c_group2, *c_newgroup; /* Make the fortran to c representation conversion */ - c_group1 = MPI_Group_f2c(*group1); - c_group2 = MPI_Group_f2c(*group2); + c_group1 = PMPI_Group_f2c(*group1); + c_group2 = PMPI_Group_f2c(*group2); - c_ierr = MPI_Group_union(c_group1, c_group2, &c_newgroup); + c_ierr = PMPI_Group_union(c_group1, c_group2, &c_newgroup); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* translate the results from c to fortran */ diff --git a/ompi/mpi/fortran/mpif-h/iallgather_f.c b/ompi/mpi/fortran/mpif-h/iallgather_f.c index 911285e31e..90d578459c 100644 --- a/ompi/mpi/fortran/mpif-h/iallgather_f.c +++ b/ompi/mpi/fortran/mpif-h/iallgather_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLGATHER, #define ompi_iallgather_f pompi_iallgather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iallgather PMPI_Iallgather -#endif void ompi_iallgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -80,22 +77,22 @@ void ompi_iallgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Request c_req; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Iallgather(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_FINT_2_INT(*recvcount), - c_recvtype, c_comm, &c_req); + ierr_c = PMPI_Iallgather(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_FINT_2_INT(*recvcount), + c_recvtype, c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c index 9aa39718c7..4a67cc069d 100644 --- a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLGATHERV, #define ompi_iallgatherv_f pompi_iallgatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iallgatherv PMPI_Iallgatherv -#endif void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -83,11 +80,11 @@ void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -95,16 +92,16 @@ void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Iallgatherv(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_ARRAY_NAME_CONVERT(recvcounts), - OMPI_ARRAY_NAME_CONVERT(displs), - c_recvtype, c_comm, &c_request); + ierr_c = PMPI_Iallgatherv(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_ARRAY_NAME_CONVERT(recvcounts), + OMPI_ARRAY_NAME_CONVERT(displs), + c_recvtype, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(displs); diff --git a/ompi/mpi/fortran/mpif-h/iallreduce_f.c b/ompi/mpi/fortran/mpif-h/iallreduce_f.c index 3bd46e473c..c62cfd2248 100644 --- a/ompi/mpi/fortran/mpif-h/iallreduce_f.c +++ b/ompi/mpi/fortran/mpif-h/iallreduce_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLREDUCE, #define ompi_iallreduce_f pompi_iallreduce_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iallreduce PMPI_Iallreduce -#endif void ompi_iallreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -81,17 +78,17 @@ void ompi_iallreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Request c_request; MPI_Op c_op; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Iallreduce(sendbuf, recvbuf, - OMPI_FINT_2_INT(*count), - c_type, c_op, c_comm, &c_request); + ierr_c = PMPI_Iallreduce(sendbuf, recvbuf, + OMPI_FINT_2_INT(*count), + c_type, c_op, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/ialltoall_f.c b/ompi/mpi/fortran/mpif-h/ialltoall_f.c index 8bb90c3749..ea8a01ab87 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoall_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALL, #define ompi_ialltoall_f pompi_ialltoall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ialltoall PMPI_Ialltoall -#endif void ompi_ialltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -80,15 +77,15 @@ void ompi_ialltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Request c_req; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ialltoall(sendbuf, + c_ierr = PMPI_Ialltoall(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, @@ -96,5 +93,5 @@ void ompi_ialltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, c_recvtype, c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c index d2bb5e025f..41bd98f335 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALLV, #define ompi_ialltoallv_f pompi_ialltoallv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ialltoallv PMPI_Ialltoallv -#endif void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, @@ -85,11 +82,11 @@ void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(sdispls, size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); @@ -99,7 +96,7 @@ void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ialltoallv(sendbuf, + c_ierr = PMPI_Ialltoallv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtype, @@ -108,7 +105,7 @@ void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, OMPI_ARRAY_NAME_CONVERT(rdispls), c_recvtype, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls); diff --git a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c index eecd801f1f..575cc3e7ca 100644 --- a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IALLTOALLW, #define ompi_ialltoallw_f pompi_ialltoallw_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ialltoallw PMPI_Ialltoallw -#endif void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtypes, @@ -86,8 +83,8 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - MPI_Comm_size(c_comm, &size); + c_comm = PMPI_Comm_f2c(*comm); + PMPI_Comm_size(c_comm, &size); c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); @@ -98,8 +95,8 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_FINT_2_INT(rdispls, size); while (size > 0) { - c_sendtypes[size - 1] = MPI_Type_f2c(sendtypes[size - 1]); - c_recvtypes[size - 1] = MPI_Type_f2c(recvtypes[size - 1]); + c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]); + c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]); --size; } @@ -107,7 +104,7 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ialltoallw(sendbuf, + c_ierr = PMPI_Ialltoallw(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtypes, @@ -116,7 +113,7 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_CONVERT(rdispls), c_recvtypes, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls); diff --git a/ompi/mpi/fortran/mpif-h/ibarrier_f.c b/ompi/mpi/fortran/mpif-h/ibarrier_f.c index f5b2b9a4ae..e9372d56d7 100644 --- a/ompi/mpi/fortran/mpif-h/ibarrier_f.c +++ b/ompi/mpi/fortran/mpif-h/ibarrier_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBARRIER, #define ompi_ibarrier_f pompi_ibarrier_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ibarrier PMPI_Ibarrier -#endif void ompi_ibarrier_f(MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { @@ -76,10 +73,10 @@ void ompi_ibarrier_f(MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) MPI_Comm c_comm; MPI_Request c_req; - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - ierr_c = MPI_Ibarrier(c_comm, &c_req); + ierr_c = PMPI_Ibarrier(c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/ibcast_f.c b/ompi/mpi/fortran/mpif-h/ibcast_f.c index cf1976f5a2..ac3b4279ef 100644 --- a/ompi/mpi/fortran/mpif-h/ibcast_f.c +++ b/ompi/mpi/fortran/mpif-h/ibcast_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBCAST, #define ompi_ibcast_f pompi_ibcast_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ibcast PMPI_Ibcast -#endif void ompi_ibcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, @@ -80,15 +77,15 @@ void ompi_ibcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, MPI_Request c_req; MPI_Datatype c_type; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Ibcast(OMPI_F2C_BOTTOM(buffer), + c_ierr = PMPI_Ibcast(OMPI_F2C_BOTTOM(buffer), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*root), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/ibsend_f.c b/ompi/mpi/fortran/mpif-h/ibsend_f.c index 4f4fe35833..c0599c4624 100644 --- a/ompi/mpi/fortran/mpif-h/ibsend_f.c +++ b/ompi/mpi/fortran/mpif-h/ibsend_f.c @@ -67,28 +67,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBSEND, #define ompi_ibsend_f pompi_ibsend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ibsend PMPI_Ibsend -#endif void ompi_ibsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Ibsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Ibsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/iexscan_f.c b/ompi/mpi/fortran/mpif-h/iexscan_f.c index 6b65fb88f1..7c1cb38ed1 100644 --- a/ompi/mpi/fortran/mpif-h/iexscan_f.c +++ b/ompi/mpi/fortran/mpif-h/iexscan_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IEXSCAN, #define ompi_iexscan_f pompi_iexscan_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iexscan PMPI_Iexscan -#endif void ompi_iexscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -81,17 +78,17 @@ void ompi_iexscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Request c_request; MPI_Op c_op; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); /* MPI_IN_PLACE is not supported */ sendbuf = (char *) OMPI_F2C_BOTTOM (sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM (recvbuf); - c_ierr = MPI_Iexscan(sendbuf, recvbuf, + c_ierr = PMPI_Iexscan(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/igather_f.c b/ompi/mpi/fortran/mpif-h/igather_f.c index 5b816fc350..01d36afbc5 100644 --- a/ompi/mpi/fortran/mpif-h/igather_f.c +++ b/ompi/mpi/fortran/mpif-h/igather_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IGATHER, #define ompi_igather_f pompi_igather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Igather PMPI_Igather -#endif void ompi_igather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -81,20 +78,20 @@ void ompi_igather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Datatype c_sendtype, c_recvtype; MPI_Request c_request; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Igather(sendbuf, OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Igather(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_FINT_2_INT(*recvcount), c_recvtype, OMPI_FINT_2_INT(*root), c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/igatherv_f.c b/ompi/mpi/fortran/mpif-h/igatherv_f.c index b1055b78f7..027590205b 100644 --- a/ompi/mpi/fortran/mpif-h/igatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/igatherv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IGATHERV, #define ompi_igatherv_f pompi_igatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Igatherv PMPI_Igatherv -#endif void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -83,11 +80,11 @@ void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -95,7 +92,7 @@ void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Igatherv(sendbuf, OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Igatherv(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_ARRAY_NAME_CONVERT(recvcounts), OMPI_ARRAY_NAME_CONVERT(displs), @@ -103,5 +100,5 @@ void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, OMPI_FINT_2_INT(*root), c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/improbe_f.c b/ompi/mpi/fortran/mpif-h/improbe_f.c index e4a5f6e88b..94218d2c28 100644 --- a/ompi/mpi/fortran/mpif-h/improbe_f.c +++ b/ompi/mpi/fortran/mpif-h/improbe_f.c @@ -73,9 +73,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IMPROBE, #define ompi_improbe_f pompi_improbe_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Improbe PMPI_Improbe -#endif void ompi_improbe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *message, @@ -87,21 +84,21 @@ void ompi_improbe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, int c_ierr; OMPI_LOGICAL_NAME_DECL(flag); - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = OMPI_INT_2_FINT(MPI_Improbe(OMPI_FINT_2_INT(*source), - OMPI_FINT_2_INT(*tag), - c_comm, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), - &c_message, c_status)); + c_ierr = OMPI_INT_2_FINT(PMPI_Improbe(OMPI_FINT_2_INT(*source), + OMPI_FINT_2_INT(*tag), + c_comm, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), + &c_message, c_status)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { OMPI_SINGLE_INT_2_LOGICAL(flag); if (OMPI_FORTRAN_VALUE_TRUE == *flag) { OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) - *message = MPI_Message_c2f(c_message); + *message = PMPI_Message_c2f(c_message); } } } diff --git a/ompi/mpi/fortran/mpif-h/imrecv_f.c b/ompi/mpi/fortran/mpif-h/imrecv_f.c index e57a98871e..e0e9c45753 100644 --- a/ompi/mpi/fortran/mpif-h/imrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/imrecv_f.c @@ -70,27 +70,24 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IMRECV, #define ompi_imrecv_f pompi_imrecv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Imrecv PMPI_Imrecv -#endif void ompi_imrecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *message, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Message c_message; - c_message = MPI_Message_f2c(*message); + c_message = PMPI_Message_f2c(*message); - c_ierr = OMPI_INT_2_FINT(MPI_Imrecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), - c_type, &c_message, &c_req)); + c_ierr = OMPI_INT_2_FINT(PMPI_Imrecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_type, &c_message, &c_req)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); /* message is an INOUT, and may be updated by the recv */ - *message = MPI_Message_c2f(c_message); + *message = PMPI_Message_c2f(c_message); } } diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c index d5ba525982..aa08f5abfd 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLGATHER, #define ompi_ineighbor_allgather_f pompi_ineighbor_allgather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ineighbor_allgather PMPI_Ineighbor_allgather -#endif void ompi_ineighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -83,22 +80,22 @@ void ompi_ineighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se MPI_Request c_req; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Ineighbor_allgather(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_FINT_2_INT(*recvcount), - c_recvtype, c_comm, &c_req); + ierr_c = PMPI_Ineighbor_allgather(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_FINT_2_INT(*recvcount), + c_recvtype, c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c index 216b6cf7cf..ede2a1ce40 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLGATHERV, #define ompi_ineighbor_allgatherv_f pompi_ineighbor_allgatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ineighbor_allgatherv PMPI_Ineighbor_allgatherv -#endif void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -86,11 +83,11 @@ void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *s OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -98,16 +95,16 @@ void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *s sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Ineighbor_allgatherv(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_ARRAY_NAME_CONVERT(recvcounts), - OMPI_ARRAY_NAME_CONVERT(displs), - c_recvtype, c_comm, &c_request); + ierr_c = PMPI_Ineighbor_allgatherv(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_ARRAY_NAME_CONVERT(recvcounts), + OMPI_ARRAY_NAME_CONVERT(displs), + c_recvtype, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); - if (MPI_SUCCESS == ierr_c) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(displs); diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c index 23bad9b465..4e9a2cb315 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALL, #define ompi_ineighbor_alltoall_f pompi_ineighbor_alltoall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ineighbor_alltoall PMPI_Ineighbor_alltoall -#endif void ompi_ineighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -83,15 +80,15 @@ void ompi_ineighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sen MPI_Request c_req; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ineighbor_alltoall(sendbuf, + c_ierr = PMPI_Ineighbor_alltoall(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, @@ -99,5 +96,5 @@ void ompi_ineighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sen c_recvtype, c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_req); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c index dbd85cc2e7..546eb876a3 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALLV, #define ompi_ineighbor_alltoallv_f pompi_ineighbor_alltoallv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ineighbor_alltoallv PMPI_Ineighbor_alltoallv -#endif void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, @@ -88,11 +85,11 @@ void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *s OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(sdispls, size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); @@ -102,7 +99,7 @@ void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *s sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ineighbor_alltoallv(sendbuf, + c_ierr = PMPI_Ineighbor_alltoallv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtype, @@ -111,7 +108,7 @@ void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *s OMPI_ARRAY_NAME_CONVERT(rdispls), c_recvtype, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls); diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c index f03689d17e..3d13d92b2c 100644 --- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INEIGHBOR_ALLTOALLW, #define ompi_ineighbor_alltoallw_f pompi_ineighbor_alltoallw_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ineighbor_alltoallw PMPI_Ineighbor_alltoallw -#endif void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Aint *sdispls, MPI_Fint *sendtypes, @@ -87,8 +84,8 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(sendcounts); OMPI_ARRAY_NAME_DECL(recvcounts); - c_comm = MPI_Comm_f2c(*comm); - MPI_Comm_size(c_comm, &size); + c_comm = PMPI_Comm_f2c(*comm); + PMPI_Comm_size(c_comm, &size); c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); @@ -97,8 +94,8 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_FINT_2_INT(recvcounts, size); while (size > 0) { - c_sendtypes[size - 1] = MPI_Type_f2c(sendtypes[size - 1]); - c_recvtypes[size - 1] = MPI_Type_f2c(recvtypes[size - 1]); + c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]); + c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]); --size; } @@ -106,7 +103,7 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ineighbor_alltoallw(sendbuf, + c_ierr = PMPI_Ineighbor_alltoallw(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), sdispls, c_sendtypes, @@ -115,7 +112,7 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, rdispls, c_recvtypes, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts); diff --git a/ompi/mpi/fortran/mpif-h/info_create_f.c b/ompi/mpi/fortran/mpif-h/info_create_f.c index d0357c7acb..0602c844d4 100644 --- a/ompi/mpi/fortran/mpif-h/info_create_f.c +++ b/ompi/mpi/fortran/mpif-h/info_create_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_CREATE, #define ompi_info_create_f pompi_info_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_create PMPI_Info_create -#endif void ompi_info_create_f(MPI_Fint *info, MPI_Fint *ierr) { int c_ierr; MPI_Info c_info; - c_ierr = MPI_Info_create(&c_info); + c_ierr = PMPI_Info_create(&c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *info = MPI_Info_c2f(c_info); + *info = PMPI_Info_c2f(c_info); } } diff --git a/ompi/mpi/fortran/mpif-h/info_delete_f.c b/ompi/mpi/fortran/mpif-h/info_delete_f.c index ed0e6a26ad..d126c18205 100644 --- a/ompi/mpi/fortran/mpif-h/info_delete_f.c +++ b/ompi/mpi/fortran/mpif-h/info_delete_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DELETE, #define ompi_info_delete_f pompi_info_delete_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_delete PMPI_Info_delete -#endif static const char FUNC_NAME[] = "MPI_INFO_DELETE"; @@ -91,9 +88,9 @@ void ompi_info_delete_f(MPI_Fint *info, char *key, MPI_Fint *ierr, int key_len) if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); return; } - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_delete(c_info, c_key); + c_ierr = PMPI_Info_delete(c_info, c_key); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free(c_key); diff --git a/ompi/mpi/fortran/mpif-h/info_dup_f.c b/ompi/mpi/fortran/mpif-h/info_dup_f.c index 48ee41ea96..8e2e19d366 100644 --- a/ompi/mpi/fortran/mpif-h/info_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/info_dup_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DUP, #define ompi_info_dup_f pompi_info_dup_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_dup PMPI_Info_dup -#endif void ompi_info_dup_f(MPI_Fint *info, MPI_Fint *newinfo, MPI_Fint *ierr) { int c_ierr; MPI_Info c_info, c_new_info; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_dup(c_info, &c_new_info); + c_ierr = PMPI_Info_dup(c_info, &c_new_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newinfo = MPI_Info_c2f(c_new_info); + *newinfo = PMPI_Info_c2f(c_new_info); } } diff --git a/ompi/mpi/fortran/mpif-h/info_free_f.c b/ompi/mpi/fortran/mpif-h/info_free_f.c index bf5104527e..dae8fae3b0 100644 --- a/ompi/mpi/fortran/mpif-h/info_free_f.c +++ b/ompi/mpi/fortran/mpif-h/info_free_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_FREE, #define ompi_info_free_f pompi_info_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_free PMPI_Info_free -#endif void ompi_info_free_f(MPI_Fint *info, MPI_Fint *ierr) { int c_ierr; MPI_Info c_info; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_free(&c_info); + c_ierr = PMPI_Info_free(&c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *info = MPI_Info_c2f(c_info); + *info = PMPI_Info_c2f(c_info); } } diff --git a/ompi/mpi/fortran/mpif-h/info_get_f.c b/ompi/mpi/fortran/mpif-h/info_get_f.c index f9232e66dd..52ab2dc4c7 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET, #define ompi_info_get_f pompi_info_get_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_get PMPI_Info_get -#endif static const char FUNC_NAME[] = "MPI_INFO_GET"; @@ -94,9 +91,9 @@ void ompi_info_get_f(MPI_Fint *info, char *key, MPI_Fint *valuelen, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); return; } - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_get(c_info, c_key, + c_ierr = PMPI_Info_get(c_info, c_key, OMPI_FINT_2_INT(*valuelen), c_value, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); diff --git a/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c b/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c index 378daf565f..1052064e39 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_nkeys_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NKEYS, #define ompi_info_get_nkeys_f pompi_info_get_nkeys_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_get_nkeys PMPI_Info_get_nkeys -#endif void ompi_info_get_nkeys_f(MPI_Fint *info, MPI_Fint *nkeys, MPI_Fint *ierr) { @@ -76,9 +73,9 @@ void ompi_info_get_nkeys_f(MPI_Fint *info, MPI_Fint *nkeys, MPI_Fint *ierr) MPI_Info c_info; OMPI_SINGLE_NAME_DECL(nkeys); - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_get_nkeys(c_info, OMPI_SINGLE_NAME_CONVERT(nkeys)); + c_ierr = PMPI_Info_get_nkeys(c_info, OMPI_SINGLE_NAME_CONVERT(nkeys)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c b/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c index 6f5e3151c1..2603ff08bb 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NTHKEY, #define ompi_info_get_nthkey_f pompi_info_get_nthkey_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_get_nthkey PMPI_Info_get_nthkey -#endif static const char FUNC_NAME[] = "MPI_INFO_GET_NTHKEY"; @@ -87,9 +84,9 @@ void ompi_info_get_nthkey_f(MPI_Fint *info, MPI_Fint *n, char *key, MPI_Info c_info; char c_key[MPI_MAX_INFO_KEY + 1]; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_get_nthkey(c_info, + c_ierr = PMPI_Info_get_nthkey(c_info, OMPI_FINT_2_INT(*n), c_key); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c b/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c index 856daa47a8..64448cb754 100644 --- a/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c +++ b/ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_VALUELEN, #define ompi_info_get_valuelen_f pompi_info_get_valuelen_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_get_valuelen PMPI_Info_get_valuelen -#endif static const char FUNC_NAME[] = "MPI_INFO_GET_VALUELEN"; @@ -95,8 +92,8 @@ void ompi_info_get_valuelen_f(MPI_Fint *info, char *key, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); return; } - c_info = MPI_Info_f2c(*info); - c_ierr = MPI_Info_get_valuelen(c_info, c_key, + c_info = PMPI_Info_f2c(*info); + c_ierr = PMPI_Info_get_valuelen(c_info, c_key, OMPI_SINGLE_NAME_CONVERT(valuelen), OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/info_set_f.c b/ompi/mpi/fortran/mpif-h/info_set_f.c index c96441c701..ca827bae8a 100644 --- a/ompi/mpi/fortran/mpif-h/info_set_f.c +++ b/ompi/mpi/fortran/mpif-h/info_set_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_SET, #define ompi_info_set_f pompi_info_set_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Info_set PMPI_Info_set -#endif static const char FUNC_NAME[] = "MPI_INFO_SET"; @@ -97,9 +94,9 @@ void ompi_info_set_f(MPI_Fint *info, char *key, char *value, MPI_Fint *ierr, } return; } - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Info_set(c_info, c_key, c_value); + c_ierr = PMPI_Info_set(c_info, c_key, c_value); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free(c_key); diff --git a/ompi/mpi/fortran/mpif-h/init_f.c b/ompi/mpi/fortran/mpif-h/init_f.c index d963a6bed7..e333dc471a 100644 --- a/ompi/mpi/fortran/mpif-h/init_f.c +++ b/ompi/mpi/fortran/mpif-h/init_f.c @@ -75,9 +75,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT, #define ompi_init_f pompi_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Init PMPI_Init -#endif void ompi_init_f( MPI_Fint *ierr ) { @@ -85,6 +82,6 @@ void ompi_init_f( MPI_Fint *ierr ) int argc = 0; char **argv = NULL; - c_ierr = MPI_Init( &argc, &argv ); + c_ierr = PMPI_Init( &argc, &argv ); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/init_thread_f.c b/ompi/mpi/fortran/mpif-h/init_thread_f.c index 59214e0b5a..f5024d3f69 100644 --- a/ompi/mpi/fortran/mpif-h/init_thread_f.c +++ b/ompi/mpi/fortran/mpif-h/init_thread_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT_THREAD, #define ompi_init_thread_f pompi_init_thread_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Init_thread PMPI_Init_thread -#endif void ompi_init_thread_f( MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr ) { @@ -77,7 +74,7 @@ void ompi_init_thread_f( MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr char** argv = NULL; OMPI_SINGLE_NAME_DECL(provided); - c_ierr = MPI_Init_thread(&argc, &argv, + c_ierr = PMPI_Init_thread(&argc, &argv, OMPI_FINT_2_INT(*required), OMPI_SINGLE_NAME_CONVERT(provided)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/initialized_f.c b/ompi/mpi/fortran/mpif-h/initialized_f.c index 3201fe0d40..fa8bf50f02 100644 --- a/ompi/mpi/fortran/mpif-h/initialized_f.c +++ b/ompi/mpi/fortran/mpif-h/initialized_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INITIALIZED, #define ompi_initialized_f pompi_initialized_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Initialized PMPI_Initialized -#endif void ompi_initialized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Initialized(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); + c_ierr = PMPI_Initialized(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/intercomm_create_f.c b/ompi/mpi/fortran/mpif-h/intercomm_create_f.c index 424a8e2fcc..3bf01f74b9 100644 --- a/ompi/mpi/fortran/mpif-h/intercomm_create_f.c +++ b/ompi/mpi/fortran/mpif-h/intercomm_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_CREATE, #define ompi_intercomm_create_f pompi_intercomm_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Intercomm_create PMPI_Intercomm_create -#endif void ompi_intercomm_create_f(MPI_Fint *local_comm, MPI_Fint *local_leader, MPI_Fint *bridge_comm, @@ -78,10 +75,10 @@ void ompi_intercomm_create_f(MPI_Fint *local_comm, MPI_Fint *local_leader, { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_local_comm = MPI_Comm_f2c (*local_comm ); - MPI_Comm c_bridge_comm = MPI_Comm_f2c (*bridge_comm); + MPI_Comm c_local_comm = PMPI_Comm_f2c (*local_comm ); + MPI_Comm c_bridge_comm = PMPI_Comm_f2c (*bridge_comm); - c_ierr = MPI_Intercomm_create(c_local_comm, + c_ierr = PMPI_Intercomm_create(c_local_comm, OMPI_FINT_2_INT(*local_leader), c_bridge_comm, OMPI_FINT_2_INT(*remote_leader), @@ -90,6 +87,6 @@ void ompi_intercomm_create_f(MPI_Fint *local_comm, MPI_Fint *local_leader, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newintercomm = MPI_Comm_c2f (c_newcomm); + *newintercomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c index 1d1d633ff2..7980f71c70 100644 --- a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c +++ b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c @@ -66,23 +66,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE, #define ompi_intercomm_merge_f pompi_intercomm_merge_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Intercomm_merge PMPI_Intercomm_merge -#endif - void ompi_intercomm_merge_f(MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintracomm, MPI_Fint *ierr) { int c_ierr; MPI_Comm c_newcomm; - MPI_Comm c_intercomm = MPI_Comm_f2c(*intercomm); + MPI_Comm c_intercomm = PMPI_Comm_f2c(*intercomm); - c_ierr = MPI_Intercomm_merge (c_intercomm, OMPI_LOGICAL_2_INT(*high), + c_ierr = PMPI_Intercomm_merge(c_intercomm, OMPI_LOGICAL_2_INT(*high), &c_newcomm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newintracomm = MPI_Comm_c2f (c_newcomm); + *newintracomm = PMPI_Comm_c2f (c_newcomm); } } diff --git a/ompi/mpi/fortran/mpif-h/iprobe_f.c b/ompi/mpi/fortran/mpif-h/iprobe_f.c index 1c034def69..a74dc330e3 100644 --- a/ompi/mpi/fortran/mpif-h/iprobe_f.c +++ b/ompi/mpi/fortran/mpif-h/iprobe_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IPROBE, #define ompi_iprobe_f pompi_iprobe_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iprobe PMPI_Iprobe -#endif void ompi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) @@ -82,11 +79,11 @@ void ompi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) OMPI_LOGICAL_NAME_DECL(flag); - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_Iprobe(OMPI_FINT_2_INT(*source), + c_ierr = PMPI_Iprobe(OMPI_FINT_2_INT(*source), OMPI_FINT_2_INT(*tag), c_comm, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), c_status); diff --git a/ompi/mpi/fortran/mpif-h/irecv_f.c b/ompi/mpi/fortran/mpif-h/irecv_f.c index d78dc1beb4..e1e5e2e421 100644 --- a/ompi/mpi/fortran/mpif-h/irecv_f.c +++ b/ompi/mpi/fortran/mpif-h/irecv_f.c @@ -67,27 +67,24 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRECV, #define ompi_irecv_f pompi_irecv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Irecv PMPI_Irecv -#endif void ompi_irecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Irecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Irecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*source), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/ireduce_f.c b/ompi/mpi/fortran/mpif-h/ireduce_f.c index 34336606bd..40289ad9d5 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE, #define ompi_ireduce_f pompi_ireduce_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ireduce PMPI_Ireduce -#endif void ompi_ireduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, @@ -82,19 +79,19 @@ void ompi_ireduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Op c_op; MPI_Comm c_comm; - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); - c_comm = MPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ireduce(sendbuf, recvbuf, + c_ierr = PMPI_Ireduce(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, OMPI_FINT_2_INT(*root), c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c b/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c index 793a7be3ff..3880cd1e19 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_scatter_block_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE_SCATTER_BLOCK, #define ompi_ireduce_scatter_block_f pompi_ireduce_scatter_block_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ireduce_scatter_block PMPI_Ireduce_scatter_block -#endif void ompi_ireduce_scatter_block_f(char *sendbuf, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *datatype, @@ -83,19 +80,19 @@ void ompi_ireduce_scatter_block_f(char *sendbuf, char *recvbuf, MPI_Op c_op; int size; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ireduce_scatter_block(sendbuf, recvbuf, + c_ierr = PMPI_Ireduce_scatter_block(sendbuf, recvbuf, OMPI_FINT_2_INT(*recvcount), c_type, c_op, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c b/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c index cb772bbb9f..22504e3e61 100644 --- a/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IREDUCE_SCATTER, #define ompi_ireduce_scatter_f pompi_ireduce_scatter_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ireduce_scatter PMPI_Ireduce_scatter -#endif void ompi_ireduce_scatter_f(char *sendbuf, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *datatype, @@ -84,20 +81,20 @@ void ompi_ireduce_scatter_f(char *sendbuf, char *recvbuf, int size; OMPI_ARRAY_NAME_DECL(recvcounts); - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Ireduce_scatter(sendbuf, recvbuf, + c_ierr = PMPI_Ireduce_scatter(sendbuf, recvbuf, OMPI_ARRAY_NAME_CONVERT(recvcounts), c_type, c_op, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/irsend_f.c b/ompi/mpi/fortran/mpif-h/irsend_f.c index b67fdfb0cd..4f82d6f2f8 100644 --- a/ompi/mpi/fortran/mpif-h/irsend_f.c +++ b/ompi/mpi/fortran/mpif-h/irsend_f.c @@ -67,26 +67,23 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRSEND, #define ompi_irsend_f pompi_irsend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Irsend PMPI_Irsend -#endif void ompi_irsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Irsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Irsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/is_thread_main_f.c b/ompi/mpi/fortran/mpif-h/is_thread_main_f.c index 1c27ba9b2e..1e597d6d1f 100644 --- a/ompi/mpi/fortran/mpif-h/is_thread_main_f.c +++ b/ompi/mpi/fortran/mpif-h/is_thread_main_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IS_THREAD_MAIN, #define ompi_is_thread_main_f pompi_is_thread_main_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Is_thread_main PMPI_Is_thread_main -#endif void ompi_is_thread_main_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Is_thread_main(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); + c_ierr = PMPI_Is_thread_main(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/iscan_f.c b/ompi/mpi/fortran/mpif-h/iscan_f.c index a292708d1f..14bdc48fce 100644 --- a/ompi/mpi/fortran/mpif-h/iscan_f.c +++ b/ompi/mpi/fortran/mpif-h/iscan_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCAN, #define ompi_iscan_f pompi_iscan_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iscan PMPI_Iscan -#endif void ompi_iscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -81,18 +78,18 @@ void ompi_iscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Request c_request; MPI_Op c_op; - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); - c_comm = MPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Iscan(sendbuf, recvbuf, + c_ierr = PMPI_Iscan(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/iscatter_f.c b/ompi/mpi/fortran/mpif-h/iscatter_f.c index 7b44a5a604..b0b76d2ecd 100644 --- a/ompi/mpi/fortran/mpif-h/iscatter_f.c +++ b/ompi/mpi/fortran/mpif-h/iscatter_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCATTER, #define ompi_iscatter_f pompi_iscatter_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iscatter PMPI_Iscatter -#endif void ompi_iscatter_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, @@ -80,20 +77,20 @@ void ompi_iscatter_f(char *sendbuf, MPI_Fint *sendcount, int c_ierr; MPI_Datatype c_sendtype, c_recvtype; MPI_Request c_request; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Iscatter(sendbuf,OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Iscatter(sendbuf,OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_FINT_2_INT(*recvcount), c_recvtype, OMPI_FINT_2_INT(*root), c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); } diff --git a/ompi/mpi/fortran/mpif-h/iscatterv_f.c b/ompi/mpi/fortran/mpif-h/iscatterv_f.c index 7fc30f45f4..7c9df792a0 100644 --- a/ompi/mpi/fortran/mpif-h/iscatterv_f.c +++ b/ompi/mpi/fortran/mpif-h/iscatterv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISCATTERV, #define ompi_iscatterv_f pompi_iscatterv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Iscatterv PMPI_Iscatterv -#endif void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *displs, MPI_Fint *sendtype, @@ -84,11 +81,11 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(sendcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -96,7 +93,7 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Iscatterv(sendbuf, + c_ierr = PMPI_Iscatterv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(displs), c_sendtype, recvbuf, @@ -104,7 +101,7 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts, c_recvtype, OMPI_FINT_2_INT(*root), c_comm, &c_request); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - if (MPI_SUCCESS == c_ierr) *request = MPI_Request_c2f(c_request); + if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request); OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts); OMPI_ARRAY_FINT_2_INT_CLEANUP(displs); diff --git a/ompi/mpi/fortran/mpif-h/isend_f.c b/ompi/mpi/fortran/mpif-h/isend_f.c index 3c01fe3d56..410a986136 100644 --- a/ompi/mpi/fortran/mpif-h/isend_f.c +++ b/ompi/mpi/fortran/mpif-h/isend_f.c @@ -67,26 +67,23 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISEND, #define ompi_isend_f pompi_isend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Isend PMPI_Isend -#endif void ompi_isend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Isend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Isend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/issend_f.c b/ompi/mpi/fortran/mpif-h/issend_f.c index 7dfe9b85d8..4a1585d92b 100644 --- a/ompi/mpi/fortran/mpif-h/issend_f.c +++ b/ompi/mpi/fortran/mpif-h/issend_f.c @@ -67,26 +67,23 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISSEND, #define ompi_issend_f pompi_issend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Issend PMPI_Issend -#endif void ompi_issend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Issend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Issend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/keyval_create_f.c b/ompi/mpi/fortran/mpif-h/keyval_create_f.c index dc9da8c37f..78d54eaf33 100644 --- a/ompi/mpi/fortran/mpif-h/keyval_create_f.c +++ b/ompi/mpi/fortran/mpif-h/keyval_create_f.c @@ -67,10 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_CREATE, #define ompi_keyval_create_f pompi_keyval_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Keyval_create PMPI_Keyval_create -#endif - static const char FUNC_NAME[] = "MPI_keyval_create_f"; void ompi_keyval_create_f(ompi_mpi1_fortran_copy_attr_function* copy_attr_fn, diff --git a/ompi/mpi/fortran/mpif-h/keyval_free_f.c b/ompi/mpi/fortran/mpif-h/keyval_free_f.c index 128c9133ed..215d5ff46b 100644 --- a/ompi/mpi/fortran/mpif-h/keyval_free_f.c +++ b/ompi/mpi/fortran/mpif-h/keyval_free_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_FREE, #define ompi_keyval_free_f pompi_keyval_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Keyval_free PMPI_Keyval_free -#endif void ompi_keyval_free_f(MPI_Fint *keyval, MPI_Fint *ierr) { @@ -77,7 +74,7 @@ void ompi_keyval_free_f(MPI_Fint *keyval, MPI_Fint *ierr) OMPI_SINGLE_FINT_2_INT(keyval); - c_ierr = MPI_Keyval_free(OMPI_SINGLE_NAME_CONVERT(keyval)); + c_ierr = PMPI_Keyval_free(OMPI_SINGLE_NAME_CONVERT(keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/lookup_name_f.c b/ompi/mpi/fortran/mpif-h/lookup_name_f.c index ec56cee4f6..775de10036 100644 --- a/ompi/mpi/fortran/mpif-h/lookup_name_f.c +++ b/ompi/mpi/fortran/mpif-h/lookup_name_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_LOOKUP_NAME, #define ompi_lookup_name_f pompi_lookup_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Lookup_name PMPI_Lookup_name -#endif void ompi_lookup_name_f(char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, int service_name_len, int port_name_len) @@ -79,7 +76,7 @@ void ompi_lookup_name_f(char *service_name, MPI_Fint *info, char *c_service_name; char *c_port_name; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); ompi_fortran_string_f2c(service_name, service_name_len, &c_service_name); c_port_name = (char *) malloc (port_name_len+1); @@ -89,7 +86,7 @@ void ompi_lookup_name_f(char *service_name, MPI_Fint *info, return; } - c_ierr = MPI_Lookup_name(c_service_name, c_info, c_port_name); + c_ierr = PMPI_Lookup_name(c_service_name, c_info, c_port_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if ( MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/mprobe_f.c b/ompi/mpi/fortran/mpif-h/mprobe_f.c index a08e01b20e..7c069e1e97 100644 --- a/ompi/mpi/fortran/mpif-h/mprobe_f.c +++ b/ompi/mpi/fortran/mpif-h/mprobe_f.c @@ -74,9 +74,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_MPROBE, #define ompi_mprobe_f pompi_mprobe_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Mprobe PMPI_Mprobe -#endif void ompi_mprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *message, MPI_Fint *status, MPI_Fint *ierr) @@ -86,18 +83,18 @@ void ompi_mprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) int c_ierr; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = OMPI_INT_2_FINT(MPI_Mprobe(OMPI_FINT_2_INT(*source), - OMPI_FINT_2_INT(*tag), - c_comm, &c_message, - c_status)); + c_ierr = OMPI_INT_2_FINT(PMPI_Mprobe(OMPI_FINT_2_INT(*source), + OMPI_FINT_2_INT(*tag), + c_comm, &c_message, + c_status)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) - *message = MPI_Message_c2f(c_message); + *message = PMPI_Message_c2f(c_message); } } diff --git a/ompi/mpi/fortran/mpif-h/mrecv_f.c b/ompi/mpi/fortran/mpif-h/mrecv_f.c index 97a025f7ff..1b2c5b467d 100644 --- a/ompi/mpi/fortran/mpif-h/mrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/mrecv_f.c @@ -73,29 +73,26 @@ OMPI_GENERATE_F77_BINDINGS (MPI_MRECV, #define ompi_mrecv_f pompi_mrecv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Mrecv PMPI_Mrecv -#endif void ompi_mrecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *message, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) - MPI_Message c_message = MPI_Message_f2c(*message); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Message c_message = PMPI_Message_f2c(*message); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) /* Call the C function */ - c_ierr = OMPI_INT_2_FINT(MPI_Mrecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), - c_type, &c_message, - c_status)); + c_ierr = OMPI_INT_2_FINT(PMPI_Mrecv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_type, &c_message, + c_status)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr) /* message is an INOUT, and may be updated by the recv */ - *message = MPI_Message_c2f(c_message); + *message = PMPI_Message_c2f(c_message); } } diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c index c4b0df3d7e..14af46f52d 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLGATHER, #define ompi_neighbor_allgather_f pompi_neighbor_allgather_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Neighbor_allgather PMPI_Neighbor_allgather -#endif void ompi_neighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -82,20 +79,20 @@ void ompi_neighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sen MPI_Comm c_comm; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Neighbor_allgather(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_FINT_2_INT(*recvcount), - c_recvtype, c_comm); + ierr_c = PMPI_Neighbor_allgather(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_FINT_2_INT(*recvcount), + c_recvtype, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); } diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c index 66c5ad5ffb..bfe1cb0ec8 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLGATHERV, #define ompi_neighbor_allgatherv_f pompi_neighbor_allgatherv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Neighbor_allgatherv PMPI_Neighbor_allgatherv -#endif void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, @@ -84,11 +81,11 @@ void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -96,13 +93,13 @@ void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - ierr_c = MPI_Neighbor_allgatherv(sendbuf, - OMPI_FINT_2_INT(*sendcount), - c_sendtype, - recvbuf, - OMPI_ARRAY_NAME_CONVERT(recvcounts), - OMPI_ARRAY_NAME_CONVERT(displs), - c_recvtype, c_comm); + ierr_c = PMPI_Neighbor_allgatherv(sendbuf, + OMPI_FINT_2_INT(*sendcount), + c_sendtype, + recvbuf, + OMPI_ARRAY_NAME_CONVERT(recvcounts), + OMPI_ARRAY_NAME_CONVERT(displs), + c_recvtype, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c index c44130b44f..48befb3bb9 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALL, #define ompi_neighbor_alltoall_f pompi_neighbor_alltoall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Neighbor_alltoall PMPI_Neighbor_alltoall -#endif void ompi_neighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, @@ -82,15 +79,15 @@ void ompi_neighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *send MPI_Comm c_comm; MPI_Datatype c_sendtype, c_recvtype; - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Neighbor_alltoall(sendbuf, + c_ierr = PMPI_Neighbor_alltoall(sendbuf, OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c index 0f6b598357..1763f1d5a0 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALLV, #define ompi_neighbor_alltoallv_f pompi_neighbor_alltoallv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Neighbor_alltoallv PMPI_Neighbor_alltoallv -#endif void ompi_neighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, @@ -87,11 +84,11 @@ void ompi_neighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sd OMPI_ARRAY_NAME_DECL(recvcounts); OMPI_ARRAY_NAME_DECL(rdispls); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(sdispls, size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); @@ -101,7 +98,7 @@ void ompi_neighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sd sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Neighbor_alltoallv(sendbuf, + c_ierr = PMPI_Neighbor_alltoallv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(sdispls), c_sendtype, diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c index 8a5a650d1a..d7d3aa5fcd 100644 --- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c +++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_NEIGHBOR_ALLTOALLW, #define ompi_neighbor_alltoallw_f pompi_neighbor_alltoallw_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Neighbor_alltoallw PMPI_Neighbor_alltoallw -#endif void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Aint *sdispls, MPI_Fint *sendtypes, @@ -86,8 +83,8 @@ void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(sendcounts); OMPI_ARRAY_NAME_DECL(recvcounts); - c_comm = MPI_Comm_f2c(*comm); - MPI_Comm_size(c_comm, &size); + c_comm = PMPI_Comm_f2c(*comm); + PMPI_Comm_size(c_comm, &size); c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype)); @@ -96,8 +93,8 @@ void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_FINT_2_INT(recvcounts, size); while (size > 0) { - c_sendtypes[size - 1] = MPI_Type_f2c(sendtypes[size - 1]); - c_recvtypes[size - 1] = MPI_Type_f2c(recvtypes[size - 1]); + c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]); + c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]); --size; } @@ -105,7 +102,7 @@ void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts, sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Neighbor_alltoallw(sendbuf, + c_ierr = PMPI_Neighbor_alltoallw(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), sdispls, c_sendtypes, diff --git a/ompi/mpi/fortran/mpif-h/op_commutative_f.c b/ompi/mpi/fortran/mpif-h/op_commutative_f.c index e17a7be809..fb7b754e87 100644 --- a/ompi/mpi/fortran/mpif-h/op_commutative_f.c +++ b/ompi/mpi/fortran/mpif-h/op_commutative_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_COMMUTATIVE, #define ompi_op_commutative_f pompi_op_commutative_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Op_commutative PMPI_Op_commutative -#endif void ompi_op_commutative_f(MPI_Fint *op, MPI_Fint *commute, MPI_Fint *ierr) { @@ -76,9 +73,9 @@ void ompi_op_commutative_f(MPI_Fint *op, MPI_Fint *commute, MPI_Fint *ierr) MPI_Op c_op; OMPI_SINGLE_NAME_DECL(commute); - c_op = MPI_Op_f2c(*op); + c_op = PMPI_Op_f2c(*op); - c_ierr = MPI_Op_commutative(c_op, OMPI_SINGLE_NAME_CONVERT(commute)); + c_ierr = PMPI_Op_commutative(c_op, OMPI_SINGLE_NAME_CONVERT(commute)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/op_create_f.c b/ompi/mpi/fortran/mpif-h/op_create_f.c index 52db0b4265..86741e4e82 100644 --- a/ompi/mpi/fortran/mpif-h/op_create_f.c +++ b/ompi/mpi/fortran/mpif-h/op_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_CREATE, #define ompi_op_create_f pompi_op_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Op_create PMPI_Op_create -#endif void ompi_op_create_f(ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *commute, MPI_Fint *op, MPI_Fint *ierr) @@ -79,13 +76,13 @@ void ompi_op_create_f(ompi_op_fortran_handler_fn_t* function, ompi_fortran_logic /* See the note in src/mpi/fortran/mpif-h/prototypes_mpi.h about the use of (void*) for function pointers in this function */ - c_ierr = MPI_Op_create((MPI_User_function *) function, + c_ierr = PMPI_Op_create((MPI_User_function *) function, OMPI_LOGICAL_2_INT(*commute), &c_op); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { c_op->o_flags |= OMPI_OP_FLAGS_FORTRAN_FUNC; - *op = MPI_Op_c2f(c_op); + *op = PMPI_Op_c2f(c_op); } } diff --git a/ompi/mpi/fortran/mpif-h/op_free_f.c b/ompi/mpi/fortran/mpif-h/op_free_f.c index 09daddde2c..fc975067ae 100644 --- a/ompi/mpi/fortran/mpif-h/op_free_f.c +++ b/ompi/mpi/fortran/mpif-h/op_free_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_FREE, #define ompi_op_free_f pompi_op_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Op_free PMPI_Op_free -#endif void ompi_op_free_f(MPI_Fint *op, MPI_Fint *ierr) { int c_ierr; MPI_Op c_op; - c_op = MPI_Op_f2c(*op); + c_op = PMPI_Op_f2c(*op); - c_ierr = MPI_Op_free(&c_op); + c_ierr = PMPI_Op_free(&c_op); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *op = MPI_Op_c2f(c_op); + *op = PMPI_Op_c2f(c_op); } } diff --git a/ompi/mpi/fortran/mpif-h/open_port_f.c b/ompi/mpi/fortran/mpif-h/open_port_f.c index 44b21b325f..d695461e68 100644 --- a/ompi/mpi/fortran/mpif-h/open_port_f.c +++ b/ompi/mpi/fortran/mpif-h/open_port_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OPEN_PORT, #define ompi_open_port_f pompi_open_port_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Open_port PMPI_Open_port -#endif void ompi_open_port_f(MPI_Fint *info, char *port_name, MPI_Fint *ierr, int port_name_len) { @@ -77,9 +74,9 @@ void ompi_open_port_f(MPI_Fint *info, char *port_name, MPI_Fint *ierr, int port_ MPI_Info c_info; char c_port_name[MPI_MAX_PORT_NAME]; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Open_port(c_info, c_port_name); + c_ierr = PMPI_Open_port(c_info, c_port_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if ( MPI_SUCCESS == c_ierr ) { diff --git a/ompi/mpi/fortran/mpif-h/pack_external_f.c b/ompi/mpi/fortran/mpif-h/pack_external_f.c index f685afc54d..9fba2c9035 100644 --- a/ompi/mpi/fortran/mpif-h/pack_external_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_external_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL, #define ompi_pack_external_f pompi_pack_external_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Pack_external PMPI_Pack_external -#endif void ompi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, @@ -81,7 +78,7 @@ void ompi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, { int ret, c_ierr; char *c_datarep; - MPI_Datatype type = MPI_Type_f2c(*datatype); + MPI_Datatype type = PMPI_Type_f2c(*datatype); /* Convert the fortran string */ @@ -93,7 +90,7 @@ void ompi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, return; } - c_ierr = MPI_Pack_external(c_datarep, OMPI_F2C_BOTTOM(inbuf), + c_ierr = PMPI_Pack_external(c_datarep, OMPI_F2C_BOTTOM(inbuf), OMPI_FINT_2_INT(*incount), type, outbuf, *outsize, diff --git a/ompi/mpi/fortran/mpif-h/pack_external_size_f.c b/ompi/mpi/fortran/mpif-h/pack_external_size_f.c index ae8903021f..65c6d00e51 100644 --- a/ompi/mpi/fortran/mpif-h/pack_external_size_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_external_size_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL_SIZE, #define ompi_pack_external_size_f pompi_pack_external_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Pack_external_size PMPI_Pack_external_size -#endif void ompi_pack_external_size_f(char *datarep, MPI_Fint *incount, MPI_Fint *datatype, MPI_Aint *size, @@ -80,7 +77,7 @@ void ompi_pack_external_size_f(char *datarep, MPI_Fint *incount, { int ret, c_ierr; char *c_datarep; - MPI_Datatype type = MPI_Type_f2c(*datatype); + MPI_Datatype type = PMPI_Type_f2c(*datatype); /* Convert the fortran string */ @@ -92,7 +89,7 @@ void ompi_pack_external_size_f(char *datarep, MPI_Fint *incount, return; } - c_ierr = MPI_Pack_external_size(c_datarep, + c_ierr = PMPI_Pack_external_size(c_datarep, OMPI_FINT_2_INT(*incount), type, size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/pack_f.c b/ompi/mpi/fortran/mpif-h/pack_f.c index aeab74b099..092d8ff1a6 100644 --- a/ompi/mpi/fortran/mpif-h/pack_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK, #define ompi_pack_f pompi_pack_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Pack PMPI_Pack -#endif void ompi_pack_f(char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Fint *outsize, MPI_Fint *position, @@ -80,11 +77,11 @@ void ompi_pack_f(char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, MPI_Datatype c_type; OMPI_SINGLE_NAME_DECL(position); - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); OMPI_SINGLE_FINT_2_INT(position); - c_ierr = MPI_Pack(OMPI_F2C_BOTTOM(inbuf), OMPI_FINT_2_INT(*incount), + c_ierr = PMPI_Pack(OMPI_F2C_BOTTOM(inbuf), OMPI_FINT_2_INT(*incount), c_type, outbuf, OMPI_FINT_2_INT(*outsize), OMPI_SINGLE_NAME_CONVERT(position), diff --git a/ompi/mpi/fortran/mpif-h/pack_size_f.c b/ompi/mpi/fortran/mpif-h/pack_size_f.c index e108eb01e0..c9f30dbe36 100644 --- a/ompi/mpi/fortran/mpif-h/pack_size_f.c +++ b/ompi/mpi/fortran/mpif-h/pack_size_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_SIZE, #define ompi_pack_size_f pompi_pack_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Pack_size PMPI_Pack_size -#endif void ompi_pack_size_f(MPI_Fint *incount, MPI_Fint *datatype, MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr) @@ -78,10 +75,10 @@ void ompi_pack_size_f(MPI_Fint *incount, MPI_Fint *datatype, MPI_Datatype c_type; OMPI_SINGLE_NAME_DECL(size); - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Pack_size(OMPI_FINT_2_INT(*incount), + c_ierr = PMPI_Pack_size(OMPI_FINT_2_INT(*incount), c_type, c_comm, OMPI_SINGLE_NAME_CONVERT(size)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/pcontrol_f.c b/ompi/mpi/fortran/mpif-h/pcontrol_f.c index ebca92460c..59621b2dcc 100644 --- a/ompi/mpi/fortran/mpif-h/pcontrol_f.c +++ b/ompi/mpi/fortran/mpif-h/pcontrol_f.c @@ -66,11 +66,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PCONTROL, #define ompi_pcontrol_f pompi_pcontrol_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Pcontrol PMPI_Pcontrol -#endif void ompi_pcontrol_f(MPI_Fint *level) { - MPI_Pcontrol(OMPI_FINT_2_INT(*level)); + PMPI_Pcontrol(OMPI_FINT_2_INT(*level)); } diff --git a/ompi/mpi/fortran/mpif-h/probe_f.c b/ompi/mpi/fortran/mpif-h/probe_f.c index 927d61ff69..fc9da39191 100644 --- a/ompi/mpi/fortran/mpif-h/probe_f.c +++ b/ompi/mpi/fortran/mpif-h/probe_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PROBE, #define ompi_probe_f pompi_probe_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Probe PMPI_Probe -#endif void ompi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr) { @@ -80,11 +77,11 @@ void ompi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *sta MPI_Comm c_comm; OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) - c_ierr = MPI_Probe(OMPI_FINT_2_INT(*source), + c_ierr = PMPI_Probe(OMPI_FINT_2_INT(*source), OMPI_FINT_2_INT(*tag), c_comm, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/publish_name_f.c b/ompi/mpi/fortran/mpif-h/publish_name_f.c index 703fb57468..77eb63804b 100644 --- a/ompi/mpi/fortran/mpif-h/publish_name_f.c +++ b/ompi/mpi/fortran/mpif-h/publish_name_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUBLISH_NAME, #define ompi_publish_name_f pompi_publish_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Publish_name PMPI_Publish_name -#endif void ompi_publish_name_f(char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, int service_name_len, int port_name_len) @@ -79,11 +76,11 @@ void ompi_publish_name_f(char *service_name, MPI_Fint *info, char *c_service_name; char *c_port_name; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); ompi_fortran_string_f2c(service_name, service_name_len, &c_service_name); ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name); - c_ierr = MPI_Publish_name(c_service_name, c_info, c_port_name); + c_ierr = PMPI_Publish_name(c_service_name, c_info, c_port_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free ( c_service_name); diff --git a/ompi/mpi/fortran/mpif-h/put_f.c b/ompi/mpi/fortran/mpif-h/put_f.c index 898876ec7c..df252013e7 100644 --- a/ompi/mpi/fortran/mpif-h/put_f.c +++ b/ompi/mpi/fortran/mpif-h/put_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUT, #define ompi_put_f pompi_put_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Put PMPI_Put -#endif void ompi_put_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -78,11 +75,11 @@ void ompi_put_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Put(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Put(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), diff --git a/ompi/mpi/fortran/mpif-h/query_thread_f.c b/ompi/mpi/fortran/mpif-h/query_thread_f.c index 8bde78c1bd..5cd0113dca 100644 --- a/ompi/mpi/fortran/mpif-h/query_thread_f.c +++ b/ompi/mpi/fortran/mpif-h/query_thread_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_QUERY_THREAD, #define ompi_query_thread_f pompi_query_thread_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Query_thread PMPI_Query_thread -#endif void ompi_query_thread_f(MPI_Fint *provided, MPI_Fint *ierr) { int c_ierr; OMPI_SINGLE_NAME_DECL(provided); - c_ierr = MPI_Query_thread(OMPI_SINGLE_NAME_CONVERT(provided)); + c_ierr = PMPI_Query_thread(OMPI_SINGLE_NAME_CONVERT(provided)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/raccumulate_f.c b/ompi/mpi/fortran/mpif-h/raccumulate_f.c index f2b26eda7f..bb2d0f3866 100644 --- a/ompi/mpi/fortran/mpif-h/raccumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/raccumulate_f.c @@ -71,9 +71,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RACCUMULATE, #define ompi_raccumulate_f pompi_raccumulate_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Raccumulate PMPI_Raccumulate -#endif void ompi_raccumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -83,24 +80,24 @@ void ompi_raccumulate_f(char *origin_addr, MPI_Fint *origin_count, { int ierr_c; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Op c_op = MPI_Op_f2c(*op); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Op c_op = PMPI_Op_f2c(*op); MPI_Request c_req; - ierr_c = MPI_Raccumulate(OMPI_F2C_BOTTOM(origin_addr), - OMPI_FINT_2_INT(*origin_count), - c_origin_datatype, - OMPI_FINT_2_INT(*target_rank), - *target_disp, - OMPI_FINT_2_INT(*target_count), - c_target_datatype, c_op, c_win, - &c_req); + ierr_c = PMPI_Raccumulate(OMPI_F2C_BOTTOM(origin_addr), + OMPI_FINT_2_INT(*origin_count), + c_origin_datatype, + OMPI_FINT_2_INT(*target_rank), + *target_disp, + OMPI_FINT_2_INT(*target_count), + c_target_datatype, c_op, c_win, + &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c); if (MPI_SUCCESS != ierr_c) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/recv_f.c b/ompi/mpi/fortran/mpif-h/recv_f.c index b7ee171eda..63c48a4221 100644 --- a/ompi/mpi/fortran/mpif-h/recv_f.c +++ b/ompi/mpi/fortran/mpif-h/recv_f.c @@ -70,23 +70,20 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV, #define ompi_recv_f pompi_recv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Recv PMPI_Recv -#endif void ompi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr) { OMPI_FORTRAN_STATUS_DECLARATION(c_status,c_status2) - MPI_Comm c_comm = MPI_Comm_f2c(*comm); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); int c_ierr; OMPI_FORTRAN_STATUS_SET_POINTER(c_status,c_status2,status) /* Call the C function */ - c_ierr = MPI_Recv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Recv(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*source), OMPI_FINT_2_INT(*tag), c_comm, c_status); diff --git a/ompi/mpi/fortran/mpif-h/recv_init_f.c b/ompi/mpi/fortran/mpif-h/recv_init_f.c index 593f29df4e..d65df72c94 100644 --- a/ompi/mpi/fortran/mpif-h/recv_init_f.c +++ b/ompi/mpi/fortran/mpif-h/recv_init_f.c @@ -67,28 +67,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV_INIT, #define ompi_recv_init_f pompi_recv_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Recv_init PMPI_Recv_init -#endif void ompi_recv_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Recv_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Recv_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*source), OMPI_INT_2_FINT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/reduce_f.c b/ompi/mpi/fortran/mpif-h/reduce_f.c index d8235bce6e..dcf037a628 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE, #define ompi_reduce_f pompi_reduce_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Reduce PMPI_Reduce -#endif void ompi_reduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, @@ -80,15 +77,15 @@ void ompi_reduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Op c_op; MPI_Comm c_comm; - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); - c_comm = MPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Reduce(sendbuf, recvbuf, + c_ierr = PMPI_Reduce(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, OMPI_FINT_2_INT(*root), diff --git a/ompi/mpi/fortran/mpif-h/reduce_local_f.c b/ompi/mpi/fortran/mpif-h/reduce_local_f.c index 0003d7c4c5..9dfe8ca7f7 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_local_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_local_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_LOCAL, #define ompi_reduce_local_f pompi_reduce_local_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Reduce_local PMPI_Reduce_local -#endif void ompi_reduce_local_f(char *inbuf, char *inoutbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *ierr) @@ -78,13 +75,13 @@ void ompi_reduce_local_f(char *inbuf, char *inoutbuf, MPI_Fint *count, MPI_Datatype c_type; MPI_Op c_op; - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); inbuf = (char *) OMPI_F2C_BOTTOM(inbuf); inoutbuf = (char *) OMPI_F2C_BOTTOM(inoutbuf); - c_ierr = MPI_Reduce_local(inbuf, inoutbuf, + c_ierr = PMPI_Reduce_local(inbuf, inoutbuf, OMPI_FINT_2_INT(*count), c_type, c_op); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c b/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c index 8479219ae1..29405da15f 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_scatter_block_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_SCATTER_BLOCK, #define ompi_reduce_scatter_block_f pompi_reduce_scatter_block_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Reduce_scatter_block PMPI_Reduce_scatter_block -#endif void ompi_reduce_scatter_block_f(char *sendbuf, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *datatype, @@ -81,17 +78,17 @@ void ompi_reduce_scatter_block_f(char *sendbuf, char *recvbuf, MPI_Op c_op; int size; - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Reduce_scatter_block(sendbuf, recvbuf, + c_ierr = PMPI_Reduce_scatter_block(sendbuf, recvbuf, OMPI_FINT_2_INT(*recvcount), c_type, c_op, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c b/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c index e3ff3c23ed..a442ad96cd 100644 --- a/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/reduce_scatter_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_SCATTER, #define ompi_reduce_scatter_f pompi_reduce_scatter_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Reduce_scatter PMPI_Reduce_scatter -#endif void ompi_reduce_scatter_f(char *sendbuf, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *datatype, @@ -82,18 +79,18 @@ void ompi_reduce_scatter_f(char *sendbuf, char *recvbuf, int size; OMPI_ARRAY_NAME_DECL(recvcounts); - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(recvcounts, size); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Reduce_scatter(sendbuf, recvbuf, + c_ierr = PMPI_Reduce_scatter(sendbuf, recvbuf, OMPI_ARRAY_NAME_CONVERT(recvcounts), c_type, c_op, c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/register_datarep_f.c b/ompi/mpi/fortran/mpif-h/register_datarep_f.c index 3f9fe7dda8..7b5350f275 100644 --- a/ompi/mpi/fortran/mpif-h/register_datarep_f.c +++ b/ompi/mpi/fortran/mpif-h/register_datarep_f.c @@ -74,10 +74,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REGISTER_DATAREP, #define ompi_register_datarep_f pompi_register_datarep_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Register_datarep PMPI_Register_datarep -#endif - static const char FUNC_NAME[] = "MPI_REGISTER_DATAREP"; /* Intercept functions used below (see below for explanations in @@ -170,9 +166,9 @@ void ompi_register_datarep_f(char *datarep, /* Convert the Fortran function callbacks to C equivalents. Use local intercepts if they're not MPI_CONVERSION_FN_NULL so that - we can just call the C MPI API MPI_Register_datarep(). If they + we can just call the C MPI API PMPI_Register_datarep(). If they *are* MPI_CONVERSION_FN_NULL, then just pass that to - MPI_Register_datarep so that it becomes a no-op (i.e., no + PMPI_Register_datarep so that it becomes a no-op (i.e., no callback is ever triggered). */ if (OMPI_IS_FORTRAN_CONVERSION_FN_NULL(read_fn_f77)) { /* Can't use the MPI_CONVERSION_FN_NULL macro here because it @@ -198,7 +194,7 @@ void ompi_register_datarep_f(char *datarep, /* Now that the intercept data has been setup, call the C function with the setup intercept routines and the intercept-specific data/extra state. */ - c_ierr = MPI_Register_datarep(c_datarep, + c_ierr = PMPI_Register_datarep(c_datarep, read_fn_c, write_fn_c, extent_intercept_fn, intercept); @@ -214,7 +210,7 @@ static int read_intercept_fn(void *userbuf, MPI_Datatype type_c, int count_c, void *extra_state) { MPI_Fint ierr, count_f77 = OMPI_FINT_2_INT(count_c); - MPI_Fint type_f77 = MPI_Type_c2f(type_c); + MPI_Fint type_f77 = PMPI_Type_c2f(type_c); intercept_extra_state_t *intercept_data = (intercept_extra_state_t*) extra_state; @@ -232,7 +228,7 @@ static int write_intercept_fn(void *userbuf, MPI_Datatype type_c, int count_c, void *extra_state) { MPI_Fint ierr, count_f77 = OMPI_FINT_2_INT(count_c); - MPI_Fint type_f77 = MPI_Type_c2f(type_c); + MPI_Fint type_f77 = PMPI_Type_c2f(type_c); intercept_extra_state_t *intercept_data = (intercept_extra_state_t*) extra_state; @@ -248,7 +244,7 @@ static int write_intercept_fn(void *userbuf, MPI_Datatype type_c, int count_c, static int extent_intercept_fn(MPI_Datatype type_c, MPI_Aint *file_extent_f77, void *extra_state) { - MPI_Fint ierr, type_f77 = MPI_Type_c2f(type_c); + MPI_Fint ierr, type_f77 = PMPI_Type_c2f(type_c); intercept_extra_state_t *intercept_data = (intercept_extra_state_t*) extra_state; diff --git a/ompi/mpi/fortran/mpif-h/request_free_f.c b/ompi/mpi/fortran/mpif-h/request_free_f.c index 028b6c5256..37173ffe38 100644 --- a/ompi/mpi/fortran/mpif-h/request_free_f.c +++ b/ompi/mpi/fortran/mpif-h/request_free_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_FREE, #define ompi_request_free_f pompi_request_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Request_free PMPI_Request_free -#endif void ompi_request_free_f(MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c( *request ); - c_ierr = MPI_Request_free(&c_req); + MPI_Request c_req = PMPI_Request_f2c( *request ); + c_ierr = PMPI_Request_free(&c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/request_get_status_f.c b/ompi/mpi/fortran/mpif-h/request_get_status_f.c index 82ddb3c5c8..5ab122edb9 100644 --- a/ompi/mpi/fortran/mpif-h/request_get_status_f.c +++ b/ompi/mpi/fortran/mpif-h/request_get_status_f.c @@ -67,16 +67,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_GET_STATUS, #define ompi_request_get_status_f pompi_request_get_status_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Request_get_status PMPI_Request_get_status -#endif void ompi_request_get_status_f(MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; MPI_Status c_status; - MPI_Request c_req = MPI_Request_f2c( *request ); + MPI_Request c_req = PMPI_Request_f2c( *request ); OMPI_LOGICAL_NAME_DECL(flag); /* This seems silly, but someone will do it */ @@ -85,11 +82,11 @@ void ompi_request_get_status_f(MPI_Fint *request, ompi_fortran_logical_t *flag, *flag = OMPI_INT_2_LOGICAL(0); c_ierr = MPI_SUCCESS; } else { - c_ierr = MPI_Request_get_status(c_req, + c_ierr = PMPI_Request_get_status(c_req, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), &c_status); OMPI_SINGLE_INT_2_LOGICAL(flag); - MPI_Status_c2f( &c_status, status ); + PMPI_Status_c2f( &c_status, status ); } if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c b/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c index 2a88848569..01fd5fdb99 100644 --- a/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c @@ -72,9 +72,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RGET_ACCUMULATE, #define ompi_rget_accumulate_f pompi_rget_accumulate_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Rget_accumulate PMPI_Rget_accumulate -#endif void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, char *result_addr, @@ -85,14 +82,14 @@ void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_result_datatype = MPI_Type_f2c(*result_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Op c_op = MPI_Op_f2c(*op); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_result_datatype = PMPI_Type_f2c(*result_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Op c_op = PMPI_Op_f2c(*op); MPI_Request c_req; - c_ierr = MPI_Rget_accumulate(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Rget_accumulate(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_F2C_BOTTOM(result_addr), @@ -105,6 +102,6 @@ void ompi_rget_accumulate_f(char *origin_addr, MPI_Fint *origin_count, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS != c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/rget_f.c b/ompi/mpi/fortran/mpif-h/rget_f.c index e338f948fe..fb2372c256 100644 --- a/ompi/mpi/fortran/mpif-h/rget_f.c +++ b/ompi/mpi/fortran/mpif-h/rget_f.c @@ -71,9 +71,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RGET, #define ompi_rget_f pompi_rget_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Rget PMPI_Rget -#endif void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -82,12 +79,12 @@ void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); MPI_Request c_req; - c_ierr = MPI_Rget(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Rget(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), @@ -97,6 +94,6 @@ void ompi_rget_f(char *origin_addr, MPI_Fint *origin_count, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS != c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/rput_f.c b/ompi/mpi/fortran/mpif-h/rput_f.c index 2593770511..7aa8a804da 100644 --- a/ompi/mpi/fortran/mpif-h/rput_f.c +++ b/ompi/mpi/fortran/mpif-h/rput_f.c @@ -71,9 +71,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RPUT, #define ompi_rput_f pompi_rput_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Rput PMPI_Rput -#endif void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, @@ -82,12 +79,12 @@ void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); - MPI_Datatype c_target_datatype = MPI_Type_f2c(*target_datatype); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Datatype c_origin_datatype = PMPI_Type_f2c(*origin_datatype); + MPI_Datatype c_target_datatype = PMPI_Type_f2c(*target_datatype); + MPI_Win c_win = PMPI_Win_f2c(*win); MPI_Request c_req; - c_ierr = MPI_Rput(OMPI_F2C_BOTTOM(origin_addr), + c_ierr = PMPI_Rput(OMPI_F2C_BOTTOM(origin_addr), OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), @@ -97,6 +94,6 @@ void ompi_rput_f(char *origin_addr, MPI_Fint *origin_count, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS != c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/rsend_f.c b/ompi/mpi/fortran/mpif-h/rsend_f.c index a8a2536d75..dfbe39759d 100644 --- a/ompi/mpi/fortran/mpif-h/rsend_f.c +++ b/ompi/mpi/fortran/mpif-h/rsend_f.c @@ -67,20 +67,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND, #define ompi_rsend_f pompi_rsend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Rsend PMPI_Rsend -#endif void ompi_rsend_f(char *ibuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Rsend(OMPI_F2C_BOTTOM(ibuf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Rsend(OMPI_F2C_BOTTOM(ibuf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/rsend_init_f.c b/ompi/mpi/fortran/mpif-h/rsend_init_f.c index 8f396b0dd8..96b3477d7a 100644 --- a/ompi/mpi/fortran/mpif-h/rsend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/rsend_init_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND_INIT, #define ompi_rsend_init_f pompi_rsend_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Rsend_init PMPI_Rsend_init -#endif void ompi_rsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, @@ -77,19 +74,19 @@ void ompi_rsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Rsend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Rsend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/scan_f.c b/ompi/mpi/fortran/mpif-h/scan_f.c index 65c1057b15..8c690f2ca6 100644 --- a/ompi/mpi/fortran/mpif-h/scan_f.c +++ b/ompi/mpi/fortran/mpif-h/scan_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCAN, #define ompi_scan_f pompi_scan_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Scan PMPI_Scan -#endif void ompi_scan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, @@ -80,15 +77,15 @@ void ompi_scan_f(char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Datatype c_type; MPI_Op c_op; - c_type = MPI_Type_f2c(*datatype); - c_op = MPI_Op_f2c(*op); - c_comm = MPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); + c_op = PMPI_Op_f2c(*op); + c_comm = PMPI_Comm_f2c(*comm); sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Scan(sendbuf, recvbuf, + c_ierr = PMPI_Scan(sendbuf, recvbuf, OMPI_FINT_2_INT(*count), c_type, c_op, c_comm); diff --git a/ompi/mpi/fortran/mpif-h/scatter_f.c b/ompi/mpi/fortran/mpif-h/scatter_f.c index 6bcb297001..7530b8856a 100644 --- a/ompi/mpi/fortran/mpif-h/scatter_f.c +++ b/ompi/mpi/fortran/mpif-h/scatter_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTER, #define ompi_scatter_f pompi_scatter_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Scatter PMPI_Scatter -#endif void ompi_scatter_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, @@ -78,16 +75,16 @@ void ompi_scatter_f(char *sendbuf, MPI_Fint *sendcount, { int c_ierr; MPI_Datatype c_sendtype, c_recvtype; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf); recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Scatter(sendbuf,OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Scatter(sendbuf,OMPI_FINT_2_INT(*sendcount), c_sendtype, recvbuf, OMPI_FINT_2_INT(*recvcount), c_recvtype, diff --git a/ompi/mpi/fortran/mpif-h/scatterv_f.c b/ompi/mpi/fortran/mpif-h/scatterv_f.c index 228593e35d..33da1af5ea 100644 --- a/ompi/mpi/fortran/mpif-h/scatterv_f.c +++ b/ompi/mpi/fortran/mpif-h/scatterv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTERV, #define ompi_scatterv_f pompi_scatterv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Scatterv PMPI_Scatterv -#endif void ompi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *displs, MPI_Fint *sendtype, @@ -83,11 +80,11 @@ void ompi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts, OMPI_ARRAY_NAME_DECL(sendcounts); OMPI_ARRAY_NAME_DECL(displs); - c_comm = MPI_Comm_f2c(*comm); - c_sendtype = MPI_Type_f2c(*sendtype); - c_recvtype = MPI_Type_f2c(*recvtype); + c_comm = PMPI_Comm_f2c(*comm); + c_sendtype = PMPI_Type_f2c(*sendtype); + c_recvtype = PMPI_Type_f2c(*recvtype); - MPI_Comm_size(c_comm, &size); + PMPI_Comm_size(c_comm, &size); OMPI_ARRAY_FINT_2_INT(sendcounts, size); OMPI_ARRAY_FINT_2_INT(displs, size); @@ -95,7 +92,7 @@ void ompi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts, recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf); recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf); - c_ierr = MPI_Scatterv(sendbuf, + c_ierr = PMPI_Scatterv(sendbuf, OMPI_ARRAY_NAME_CONVERT(sendcounts), OMPI_ARRAY_NAME_CONVERT(displs), c_sendtype, recvbuf, diff --git a/ompi/mpi/fortran/mpif-h/send_f.c b/ompi/mpi/fortran/mpif-h/send_f.c index 8e83a27b37..66e29919c2 100644 --- a/ompi/mpi/fortran/mpif-h/send_f.c +++ b/ompi/mpi/fortran/mpif-h/send_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND, #define ompi_send_f pompi_send_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Send PMPI_Send -#endif void ompi_send_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; - MPI_Comm c_comm = MPI_Comm_f2c(*comm); - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Comm c_comm = PMPI_Comm_f2c(*comm); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Send(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Send(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm); diff --git a/ompi/mpi/fortran/mpif-h/send_init_f.c b/ompi/mpi/fortran/mpif-h/send_init_f.c index 1262da58ed..787077376d 100644 --- a/ompi/mpi/fortran/mpif-h/send_init_f.c +++ b/ompi/mpi/fortran/mpif-h/send_init_f.c @@ -67,28 +67,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND_INIT, #define ompi_send_init_f pompi_send_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Send_init PMPI_Send_init -#endif void ompi_send_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Send_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Send_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/sendrecv_f.c b/ompi/mpi/fortran/mpif-h/sendrecv_f.c index f63ee46d61..83ada4d1ed 100644 --- a/ompi/mpi/fortran/mpif-h/sendrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/sendrecv_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV, #define ompi_sendrecv_f pompi_sendrecv_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Sendrecv PMPI_Sendrecv -#endif void ompi_sendrecv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *dest, MPI_Fint *sendtag, char *recvbuf, @@ -79,13 +76,13 @@ void ompi_sendrecv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, { int c_ierr; MPI_Comm c_comm; - MPI_Datatype c_sendtype = MPI_Type_f2c(*sendtype); - MPI_Datatype c_recvtype = MPI_Type_f2c(*recvtype); + MPI_Datatype c_sendtype = PMPI_Type_f2c(*sendtype); + MPI_Datatype c_recvtype = PMPI_Type_f2c(*recvtype); MPI_Status c_status; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Sendrecv(OMPI_F2C_BOTTOM(sendbuf), OMPI_FINT_2_INT(*sendcount), + c_ierr = PMPI_Sendrecv(OMPI_F2C_BOTTOM(sendbuf), OMPI_FINT_2_INT(*sendcount), c_sendtype, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*sendtag), @@ -97,6 +94,6 @@ void ompi_sendrecv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, if (MPI_SUCCESS == c_ierr && !OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } diff --git a/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c b/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c index 2f438fefa0..226a25e4f9 100644 --- a/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c +++ b/ompi/mpi/fortran/mpif-h/sendrecv_replace_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV_REPLACE, #define ompi_sendrecv_replace_f pompi_sendrecv_replace_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Sendrecv_replace PMPI_Sendrecv_replace -#endif void ompi_sendrecv_replace_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *sendtag, @@ -77,13 +74,13 @@ void ompi_sendrecv_replace_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Comm c_comm; MPI_Status c_status; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Sendrecv_replace(OMPI_F2C_BOTTOM(buf), + c_ierr = PMPI_Sendrecv_replace(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), @@ -95,6 +92,6 @@ void ompi_sendrecv_replace_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, if (MPI_SUCCESS == c_ierr && !OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } diff --git a/ompi/mpi/fortran/mpif-h/ssend_f.c b/ompi/mpi/fortran/mpif-h/ssend_f.c index 90ab16eda7..e9d34c2349 100644 --- a/ompi/mpi/fortran/mpif-h/ssend_f.c +++ b/ompi/mpi/fortran/mpif-h/ssend_f.c @@ -67,21 +67,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND, #define ompi_ssend_f pompi_ssend_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ssend PMPI_Ssend -#endif void ompi_ssend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Ssend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Ssend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/ssend_init_f.c b/ompi/mpi/fortran/mpif-h/ssend_init_f.c index 6108357384..da61f5f92e 100644 --- a/ompi/mpi/fortran/mpif-h/ssend_init_f.c +++ b/ompi/mpi/fortran/mpif-h/ssend_init_f.c @@ -67,28 +67,25 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND_INIT, #define ompi_ssend_init_f pompi_ssend_init_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Ssend_init PMPI_Ssend_init -#endif void ompi_ssend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Request c_req; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c (*comm); + c_comm = PMPI_Comm_f2c (*comm); - c_ierr = MPI_Ssend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Ssend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count), c_type, OMPI_FINT_2_INT(*dest), OMPI_FINT_2_INT(*tag), c_comm, &c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } diff --git a/ompi/mpi/fortran/mpif-h/start_f.c b/ompi/mpi/fortran/mpif-h/start_f.c index cde2e601be..85d72759ac 100644 --- a/ompi/mpi/fortran/mpif-h/start_f.c +++ b/ompi/mpi/fortran/mpif-h/start_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_START, #define ompi_start_f pompi_start_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Start PMPI_Start -#endif void ompi_start_f(MPI_Fint *request, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c(*request); + MPI_Request c_req = PMPI_Request_f2c(*request); MPI_Request tmp_req = c_req; - c_ierr = MPI_Start(&c_req); + c_ierr = PMPI_Start(&c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { @@ -86,7 +83,7 @@ void ompi_start_f(MPI_Fint *request, MPI_Fint *ierr) So commit new descriptor. */ if ( tmp_req != c_req ) { - *request = MPI_Request_c2f(c_req); + *request = PMPI_Request_c2f(c_req); } } } diff --git a/ompi/mpi/fortran/mpif-h/startall_f.c b/ompi/mpi/fortran/mpif-h/startall_f.c index 76d86a47b4..e453ee639d 100644 --- a/ompi/mpi/fortran/mpif-h/startall_f.c +++ b/ompi/mpi/fortran/mpif-h/startall_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STARTALL, #define ompi_startall_f pompi_startall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Startall PMPI_Startall -#endif static const char FUNC_NAME[] = "MPI_STARTALL"; @@ -91,14 +88,14 @@ void ompi_startall_f(MPI_Fint *count, MPI_Fint *array_of_requests, } for(i = 0; i < *count; i++ ) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } - c_ierr = MPI_Startall(OMPI_FINT_2_INT(*count), c_req); + c_ierr = PMPI_Startall(OMPI_FINT_2_INT(*count), c_req); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); for( i = 0; i < *count; i++ ) { - array_of_requests[i] = MPI_Request_c2f(c_req[i]); + array_of_requests[i] = PMPI_Request_c2f(c_req[i]); } free(c_req); } diff --git a/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c b/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c index 48d1cc3ed8..c03ca86fdb 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_cancelled_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_CANCELLED, #define ompi_status_set_cancelled_f pompi_status_set_cancelled_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Status_set_cancelled PMPI_Status_set_cancelled -#endif void ompi_status_set_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { @@ -81,12 +78,12 @@ void ompi_status_set_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, if (OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { c_ierr = MPI_SUCCESS; } else { - MPI_Status_f2c( status, &c_status ); + PMPI_Status_f2c( status, &c_status ); - c_ierr = MPI_Status_set_cancelled(&c_status, + c_ierr = PMPI_Status_set_cancelled(&c_status, OMPI_LOGICAL_2_INT(*flag)); if (MPI_SUCCESS == c_ierr) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/status_set_elements_f.c b/ompi/mpi/fortran/mpif-h/status_set_elements_f.c index cd14b57c96..b6c039c45b 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_elements_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_elements_f.c @@ -67,15 +67,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS, #define ompi_status_set_elements_f pompi_status_set_elements_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Status_set_elements PMPI_Status_set_elements -#endif void ompi_status_set_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Status c_status; /* This seems silly, but someone will do it */ @@ -83,15 +80,15 @@ void ompi_status_set_elements_f(MPI_Fint *status, MPI_Fint *datatype, if (OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { c_ierr = MPI_SUCCESS; } else { - MPI_Status_f2c( status, &c_status ); + PMPI_Status_f2c( status, &c_status ); - c_ierr = MPI_Status_set_elements(&c_status, c_type, + c_ierr = PMPI_Status_set_elements(&c_status, c_type, OMPI_FINT_2_INT(*count)); /* If datatype is really being set, then that needs to be converted.... */ if (MPI_SUCCESS == c_ierr) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c b/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c index 4dbd7de602..f3cd96ce31 100644 --- a/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c +++ b/ompi/mpi/fortran/mpif-h/status_set_elements_x_f.c @@ -69,15 +69,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS_X, #define ompi_status_set_elements_x_f pompi_status_set_elements_x_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Status_set_elements_x PMPI_Status_set_elements_x -#endif void ompi_status_set_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Count *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); MPI_Status c_status; /* This seems silly, but someone will do it */ @@ -85,14 +82,14 @@ void ompi_status_set_elements_x_f(MPI_Fint *status, MPI_Fint *datatype, if (OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { c_ierr = MPI_SUCCESS; } else { - MPI_Status_f2c( status, &c_status ); + PMPI_Status_f2c( status, &c_status ); - c_ierr = MPI_Status_set_elements_x(&c_status, c_type, *count); + c_ierr = PMPI_Status_set_elements_x(&c_status, c_type, *count); /* If datatype is really being set, then that needs to be converted.... */ if (MPI_SUCCESS == c_ierr) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/test_cancelled_f.c b/ompi/mpi/fortran/mpif-h/test_cancelled_f.c index 5fa654b019..5467e84cee 100644 --- a/ompi/mpi/fortran/mpif-h/test_cancelled_f.c +++ b/ompi/mpi/fortran/mpif-h/test_cancelled_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST_CANCELLED, #define ompi_test_cancelled_f pompi_test_cancelled_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Test_cancelled PMPI_Test_cancelled -#endif void ompi_test_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { @@ -83,10 +80,10 @@ void ompi_test_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_F *flag = OMPI_INT_2_LOGICAL(0); c_ierr = MPI_SUCCESS; } else { - c_ierr = MPI_Status_f2c( status, &c_status ); + c_ierr = PMPI_Status_f2c( status, &c_status ); if (MPI_SUCCESS == c_ierr) { - c_ierr = MPI_Test_cancelled(&c_status, + c_ierr = PMPI_Test_cancelled(&c_status, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); OMPI_SINGLE_INT_2_LOGICAL(flag); diff --git a/ompi/mpi/fortran/mpif-h/test_f.c b/ompi/mpi/fortran/mpif-h/test_f.c index 179a4153e3..a764263d9b 100644 --- a/ompi/mpi/fortran/mpif-h/test_f.c +++ b/ompi/mpi/fortran/mpif-h/test_f.c @@ -67,19 +67,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST, #define ompi_test_f pompi_test_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Test PMPI_Test -#endif void ompi_test_f(MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c(*request); + MPI_Request c_req = PMPI_Request_f2c(*request); MPI_Status c_status; OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Test(&c_req, + c_ierr = PMPI_Test(&c_req, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), &c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); @@ -92,7 +89,7 @@ void ompi_test_f(MPI_Fint *request, ompi_fortran_logical_t *flag, if (MPI_SUCCESS == c_ierr && *flag) { *request = OMPI_INT_2_FINT(c_req->req_f_to_c_index); if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } } diff --git a/ompi/mpi/fortran/mpif-h/testall_f.c b/ompi/mpi/fortran/mpif-h/testall_f.c index 5d7d8717f7..b60d0124cf 100644 --- a/ompi/mpi/fortran/mpif-h/testall_f.c +++ b/ompi/mpi/fortran/mpif-h/testall_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTALL, #define ompi_testall_f pompi_testall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Testall PMPI_Testall -#endif static const char FUNC_NAME[] = "MPI_TESTALL"; @@ -101,10 +98,10 @@ void ompi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_l } c_status = (MPI_Status*) (c_req + OMPI_FINT_2_INT(*count)); for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } - c_ierr = MPI_Testall(OMPI_FINT_2_INT(*count), c_req, + c_ierr = PMPI_Testall(OMPI_FINT_2_INT(*count), c_req, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); @@ -118,7 +115,7 @@ void ompi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_l array_of_requests[i] = c_req[i]->req_f_to_c_index; if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) && !OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) { - MPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); + PMPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); } } } diff --git a/ompi/mpi/fortran/mpif-h/testany_f.c b/ompi/mpi/fortran/mpif-h/testany_f.c index 9a5835c6ea..bc88e26437 100644 --- a/ompi/mpi/fortran/mpif-h/testany_f.c +++ b/ompi/mpi/fortran/mpif-h/testany_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTANY, #define ompi_testany_f pompi_testany_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Testany PMPI_Testany -#endif static const char FUNC_NAME[] = "MPI_TESTANY"; @@ -89,7 +86,7 @@ void ompi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *indx if (OPAL_UNLIKELY(0 == OMPI_FINT_2_INT(*count))) { *flag = OMPI_FORTRAN_VALUE_TRUE; *indx = OMPI_INT_2_FINT(MPI_UNDEFINED); - MPI_Status_c2f(&ompi_status_empty, status); + PMPI_Status_c2f(&ompi_status_empty, status); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS); return; } @@ -104,10 +101,10 @@ void ompi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *indx } for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } - c_ierr = MPI_Testany(OMPI_FINT_2_INT(*count), c_req, + c_ierr = PMPI_Testany(OMPI_FINT_2_INT(*count), c_req, OMPI_SINGLE_NAME_CONVERT(indx), OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag), &c_status); @@ -128,7 +125,7 @@ void ompi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *indx ++(*indx); } if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } free(c_req); diff --git a/ompi/mpi/fortran/mpif-h/testsome_f.c b/ompi/mpi/fortran/mpif-h/testsome_f.c index c2948d7b90..3dbe997396 100644 --- a/ompi/mpi/fortran/mpif-h/testsome_f.c +++ b/ompi/mpi/fortran/mpif-h/testsome_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTSOME, #define ompi_testsome_f pompi_testsome_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Testsome PMPI_Testsome -#endif static const char FUNC_NAME[] = "MPI_TESTSOME"; @@ -106,11 +103,11 @@ void ompi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, c_status = (MPI_Status*) (c_req + OMPI_FINT_2_INT(*incount)); for (i = 0; i < OMPI_FINT_2_INT(*incount); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } OMPI_ARRAY_FINT_2_INT_ALLOC(array_of_indices, OMPI_FINT_2_INT(*incount)); - c_ierr = MPI_Testsome(OMPI_FINT_2_INT(*incount), c_req, + c_ierr = PMPI_Testsome(OMPI_FINT_2_INT(*incount), c_req, OMPI_SINGLE_NAME_CONVERT(outcount), OMPI_ARRAY_NAME_CONVERT(array_of_indices), c_status); @@ -130,7 +127,7 @@ void ompi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses)) { for (i = 0; i < OMPI_FINT_2_INT(*outcount); ++i) { if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) { - MPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); + PMPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); } } } diff --git a/ompi/mpi/fortran/mpif-h/topo_test_f.c b/ompi/mpi/fortran/mpif-h/topo_test_f.c index e07e5daa01..abf574ada8 100644 --- a/ompi/mpi/fortran/mpif-h/topo_test_f.c +++ b/ompi/mpi/fortran/mpif-h/topo_test_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TOPO_TEST, #define ompi_topo_test_f pompi_topo_test_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Topo_test PMPI_Topo_test -#endif void ompi_topo_test_f(MPI_Fint *comm, MPI_Fint *topo_type, MPI_Fint *ierr) { @@ -77,9 +74,9 @@ void ompi_topo_test_f(MPI_Fint *comm, MPI_Fint *topo_type, MPI_Fint *ierr) MPI_Comm c_comm; OMPI_SINGLE_NAME_DECL(topo_type); - c_comm = MPI_Comm_f2c(*comm); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Topo_test(c_comm, OMPI_SINGLE_NAME_CONVERT(topo_type)); + c_ierr = PMPI_Topo_test(c_comm, OMPI_SINGLE_NAME_CONVERT(topo_type)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_commit_f.c b/ompi/mpi/fortran/mpif-h/type_commit_f.c index c1b472fa38..5a8ef140db 100644 --- a/ompi/mpi/fortran/mpif-h/type_commit_f.c +++ b/ompi/mpi/fortran/mpif-h/type_commit_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_COMMIT, #define ompi_type_commit_f pompi_type_commit_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_commit PMPI_Type_commit -#endif void ompi_type_commit_f(MPI_Fint *type, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); - c_ierr = MPI_Type_commit(&c_type); + c_ierr = PMPI_Type_commit(&c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *type = MPI_Type_c2f(c_type); + *type = PMPI_Type_c2f(c_type); } } diff --git a/ompi/mpi/fortran/mpif-h/type_contiguous_f.c b/ompi/mpi/fortran/mpif-h/type_contiguous_f.c index b92e7a2b74..1f9feefd12 100644 --- a/ompi/mpi/fortran/mpif-h/type_contiguous_f.c +++ b/ompi/mpi/fortran/mpif-h/type_contiguous_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CONTIGUOUS, #define ompi_type_contiguous_f pompi_type_contiguous_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_contiguous PMPI_Type_contiguous -#endif void ompi_type_contiguous_f(MPI_Fint *count, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; - c_ierr = MPI_Type_contiguous(OMPI_FINT_2_INT(*count), c_old, &c_new); + c_ierr = PMPI_Type_contiguous(OMPI_FINT_2_INT(*count), c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_darray_f.c b/ompi/mpi/fortran/mpif-h/type_create_darray_f.c index 94c5ce537b..e727bf52f9 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_darray_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_darray_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_DARRAY, #define ompi_type_create_darray_f pompi_type_create_darray_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_darray PMPI_Type_create_darray -#endif void ompi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank, MPI_Fint *ndims, MPI_Fint *gsize_array, @@ -78,7 +75,7 @@ void ompi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; OMPI_ARRAY_NAME_DECL(gsize_array); OMPI_ARRAY_NAME_DECL(distrib_array); @@ -90,7 +87,7 @@ void ompi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank, OMPI_ARRAY_FINT_2_INT(darg_array, *ndims); OMPI_ARRAY_FINT_2_INT(psize_array, *ndims); - c_ierr = MPI_Type_create_darray(OMPI_FINT_2_INT(*size), + c_ierr = PMPI_Type_create_darray(OMPI_FINT_2_INT(*size), OMPI_FINT_2_INT(*rank), OMPI_FINT_2_INT(*ndims), OMPI_ARRAY_NAME_CONVERT(gsize_array), @@ -106,6 +103,6 @@ void ompi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank, OMPI_ARRAY_FINT_2_INT_CLEANUP(psize_array); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c index ad03c9f02c..f972667eee 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c @@ -66,22 +66,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_COMPLEX, #define ompi_type_create_f90_complex_f pompi_type_create_f90_complex_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_f90_complex PMPI_Type_create_f90_complex -#endif void ompi_type_create_f90_complex_f(MPI_Fint *p, MPI_Fint *r, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_newtype = MPI_Type_f2c(*newtype); + MPI_Datatype c_newtype = PMPI_Type_f2c(*newtype); - c_ierr = MPI_Type_create_f90_complex(OMPI_FINT_2_INT(*p), + c_ierr = PMPI_Type_create_f90_complex(OMPI_FINT_2_INT(*p), OMPI_FINT_2_INT(*r), &c_newtype); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f (c_newtype); + *newtype = PMPI_Type_c2f (c_newtype); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c index aa81676299..a9d3d41b41 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_INTEGER, #define ompi_type_create_f90_integer_f pompi_type_create_f90_integer_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_f90_integer PMPI_Type_create_f90_integer -#endif void ompi_type_create_f90_integer_f(MPI_Fint *r, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_new = MPI_Type_f2c(*newtype); + MPI_Datatype c_new = PMPI_Type_f2c(*newtype); - c_ierr = MPI_Type_create_f90_integer(OMPI_FINT_2_INT(*r), &c_new); + c_ierr = PMPI_Type_create_f90_integer(OMPI_FINT_2_INT(*r), &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c index 8825ec30b5..26320d0a88 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c @@ -66,22 +66,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_REAL, #define ompi_type_create_f90_real_f pompi_type_create_f90_real_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_f90_real PMPI_Type_create_f90_real -#endif void ompi_type_create_f90_real_f(MPI_Fint *p, MPI_Fint *r, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_new = MPI_Type_f2c(*newtype); + MPI_Datatype c_new = PMPI_Type_f2c(*newtype); - c_ierr = MPI_Type_create_f90_real(OMPI_FINT_2_INT(*p), + c_ierr = PMPI_Type_create_f90_real(OMPI_FINT_2_INT(*p), OMPI_FINT_2_INT(*r), &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c index f3b1a05dc4..9443f1fa47 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hindexed_block_f.c @@ -59,9 +59,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED_BLOCK, #define ompi_type_create_hindexed_block_f pompi_type_create_hindexed_block_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_hindexed_block PMPI_Type_create_hindexed_block -#endif void ompi_type_create_hindexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Aint *array_of_displacements, @@ -69,17 +66,17 @@ void ompi_type_create_hindexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; - c_ierr = MPI_Type_create_hindexed_block(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_create_hindexed_block(OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*blocklength), array_of_displacements, c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c index 9ee9802f5f..cb0ed5ca1d 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED, #define ompi_type_create_hindexed_f pompi_type_create_hindexed_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_hindexed PMPI_Type_create_hindexed -#endif void ompi_type_create_hindexed_f(MPI_Fint *count, @@ -78,20 +75,20 @@ void ompi_type_create_hindexed_f(MPI_Fint *count, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); - MPI_Datatype c_new = MPI_Type_f2c(*newtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); + MPI_Datatype c_new = PMPI_Type_f2c(*newtype); OMPI_ARRAY_NAME_DECL(array_of_blocklengths); OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count); - c_ierr = MPI_Type_create_hindexed(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_create_hindexed(OMPI_FINT_2_INT(*count), OMPI_ARRAY_NAME_CONVERT(array_of_blocklengths), array_of_displacements, c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_blocklengths); diff --git a/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c b/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c index 53206d1eee..dddb8afc6d 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_hvector_f.c @@ -66,25 +66,21 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HVECTOR, #define ompi_type_create_hvector_f pompi_type_create_hvector_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_hvector PMPI_Type_create_hvector -#endif - void ompi_type_create_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Aint *stride, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; - c_ierr = MPI_Type_hvector(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_hvector(OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*blocklength), *stride, c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c b/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c index 0dcedd3ba3..02d926e48b 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_indexed_block_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_INDEXED_BLOCK, #define ompi_type_create_indexed_block_f pompi_type_create_indexed_block_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_indexed_block PMPI_Type_create_indexed_block -#endif void ompi_type_create_indexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *array_of_displacements, @@ -76,20 +73,20 @@ void ompi_type_create_indexed_block_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; OMPI_ARRAY_NAME_DECL(array_of_displacements); OMPI_ARRAY_FINT_2_INT(array_of_displacements, *count); - c_ierr = MPI_Type_create_indexed_block(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_create_indexed_block(OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*blocklength), OMPI_ARRAY_NAME_CONVERT(array_of_displacements), c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_displacements); diff --git a/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c index bb0e910e16..fd18b10a63 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_keyval_f.c @@ -67,10 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_KEYVAL, #define ompi_type_create_keyval_f pompi_type_create_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_keyval PMPI_Type_create_keyval -#endif - static char FUNC_NAME[] = "MPI_Type_create_keyval_f"; void ompi_type_create_keyval_f(ompi_mpi2_fortran_copy_attr_function* type_copy_attr_fn, diff --git a/ompi/mpi/fortran/mpif-h/type_create_resized_f.c b/ompi/mpi/fortran/mpif-h/type_create_resized_f.c index f184287475..a36c6db44a 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_resized_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_resized_f.c @@ -66,22 +66,19 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_RESIZED, #define ompi_type_create_resized_f pompi_type_create_resized_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_resized PMPI_Type_create_resized -#endif void ompi_type_create_resized_f(MPI_Fint *oldtype, MPI_Aint *lb, MPI_Aint *extent, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; - c_ierr = MPI_Type_create_resized(c_old, *lb, *extent, &c_new); + c_ierr = PMPI_Type_create_resized(c_old, *lb, *extent, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_create_struct_f.c b/ompi/mpi/fortran/mpif-h/type_create_struct_f.c index b51d1d1945..0d05e903d3 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_struct_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_struct_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_STRUCT, #define ompi_type_create_struct_f pompi_type_create_struct_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_struct PMPI_Type_create_struct -#endif static const char FUNC_NAME[] = "MPI_TYPE_CREATE_STRUCT"; @@ -95,12 +92,12 @@ void ompi_type_create_struct_f(MPI_Fint *count, } for (i = 0; i < *count; i++) { - c_type_old_array[i] = MPI_Type_f2c(array_of_types[i]); + c_type_old_array[i] = PMPI_Type_f2c(array_of_types[i]); } OMPI_ARRAY_FINT_2_INT(array_of_block_lengths, *count); - c_ierr = MPI_Type_create_struct(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_create_struct(OMPI_FINT_2_INT(*count), OMPI_ARRAY_NAME_CONVERT(array_of_block_lengths), array_of_displacements, c_type_old_array, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); @@ -108,7 +105,7 @@ void ompi_type_create_struct_f(MPI_Fint *count, OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_block_lengths); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } free(c_type_old_array); diff --git a/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c b/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c index a44c00ba5e..9e82fa84d8 100644 --- a/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c +++ b/ompi/mpi/fortran/mpif-h/type_create_subarray_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_SUBARRAY, #define ompi_type_create_subarray_f pompi_type_create_subarray_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_create_subarray PMPI_Type_create_subarray -#endif void ompi_type_create_subarray_f(MPI_Fint *ndims, MPI_Fint *size_array, MPI_Fint *subsize_array, @@ -83,13 +80,13 @@ void ompi_type_create_subarray_f(MPI_Fint *ndims, MPI_Fint *size_array, OMPI_ARRAY_NAME_DECL(subsize_array); OMPI_ARRAY_NAME_DECL(start_array); - c_old = MPI_Type_f2c(*oldtype); + c_old = PMPI_Type_f2c(*oldtype); OMPI_ARRAY_FINT_2_INT(size_array, *ndims); OMPI_ARRAY_FINT_2_INT(subsize_array, *ndims); OMPI_ARRAY_FINT_2_INT(start_array, *ndims); - c_ierr = MPI_Type_create_subarray(OMPI_FINT_2_INT(*ndims), + c_ierr = PMPI_Type_create_subarray(OMPI_FINT_2_INT(*ndims), OMPI_ARRAY_NAME_CONVERT(size_array), OMPI_ARRAY_NAME_CONVERT(subsize_array), OMPI_ARRAY_NAME_CONVERT(start_array), @@ -97,7 +94,7 @@ void ompi_type_create_subarray_f(MPI_Fint *ndims, MPI_Fint *size_array, if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } OMPI_ARRAY_FINT_2_INT_CLEANUP(size_array); diff --git a/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c index f407eeb5b1..b86c915875 100644 --- a/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_delete_attr_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DELETE_ATTR, #define ompi_type_delete_attr_f pompi_type_delete_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_delete_attr PMPI_Type_delete_attr -#endif void ompi_type_delete_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); - c_ierr = MPI_Type_delete_attr(c_type, OMPI_FINT_2_INT(*type_keyval)); + c_ierr = PMPI_Type_delete_attr(c_type, OMPI_FINT_2_INT(*type_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_dup_f.c b/ompi/mpi/fortran/mpif-h/type_dup_f.c index 17c4a53387..90d77078a3 100644 --- a/ompi/mpi/fortran/mpif-h/type_dup_f.c +++ b/ompi/mpi/fortran/mpif-h/type_dup_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DUP, #define ompi_type_dup_f pompi_type_dup_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_dup PMPI_Type_dup -#endif void ompi_type_dup_f(MPI_Fint *type, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); MPI_Datatype c_new; - c_ierr = MPI_Type_dup(c_type, &c_new); + c_ierr = PMPI_Type_dup(c_type, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_extent_f.c b/ompi/mpi/fortran/mpif-h/type_extent_f.c index a3fd383342..60871513d2 100644 --- a/ompi/mpi/fortran/mpif-h/type_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_extent_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_EXTENT, #define ompi_type_extent_f pompi_type_extent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_extent PMPI_Type_extent -#endif void ompi_type_extent_f(MPI_Fint *type, MPI_Fint *extent, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); MPI_Aint c_extent; - c_ierr = MPI_Type_extent(c_type, &c_extent); + c_ierr = PMPI_Type_extent(c_type, &c_extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_free_f.c b/ompi/mpi/fortran/mpif-h/type_free_f.c index f5a2f512c7..89ca6cf426 100644 --- a/ompi/mpi/fortran/mpif-h/type_free_f.c +++ b/ompi/mpi/fortran/mpif-h/type_free_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE, #define ompi_type_free_f pompi_type_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_free PMPI_Type_free -#endif void ompi_type_free_f(MPI_Fint *type, MPI_Fint *ierr) { int c_ierr; MPI_Datatype c_type; - c_type = MPI_Type_f2c(*type); + c_type = PMPI_Type_f2c(*type); - c_ierr = MPI_Type_free(&c_type); + c_ierr = PMPI_Type_free(&c_type); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *type = MPI_Type_c2f(c_type); + *type = PMPI_Type_c2f(c_type); } } diff --git a/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c index 2c43dc7d9e..5aa9a408ef 100644 --- a/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/type_free_keyval_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE_KEYVAL, #define ompi_type_free_keyval_f pompi_type_free_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_free_keyval PMPI_Type_free_keyval -#endif void ompi_type_free_keyval_f(MPI_Fint *type_keyval, MPI_Fint *ierr) { @@ -77,7 +74,7 @@ void ompi_type_free_keyval_f(MPI_Fint *type_keyval, MPI_Fint *ierr) OMPI_SINGLE_FINT_2_INT(type_keyval); - c_ierr = MPI_Type_free_keyval(OMPI_SINGLE_NAME_CONVERT(type_keyval)); + c_ierr = PMPI_Type_free_keyval(OMPI_SINGLE_NAME_CONVERT(type_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_get_attr_f.c b/ompi/mpi/fortran/mpif-h/type_get_attr_f.c index f155d93527..5a13f7ee09 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_attr_f.c @@ -68,16 +68,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ATTR, #define ompi_type_get_attr_f pompi_type_get_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_attr PMPI_Type_get_attr -#endif - void ompi_type_get_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); OMPI_LOGICAL_NAME_DECL(flag); /* This stuff is very confusing. Be sure to see the comment at diff --git a/ompi/mpi/fortran/mpif-h/type_get_contents_f.c b/ompi/mpi/fortran/mpif-h/type_get_contents_f.c index a3c2e82f36..29aa065e65 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_contents_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_contents_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_CONTENTS, #define ompi_type_get_contents_f pompi_type_get_contents_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_contents PMPI_Type_get_contents -#endif static const char FUNC_NAME[] = "MPI_TYPE_GET_CONTENTS"; @@ -83,7 +80,7 @@ void ompi_type_get_contents_f(MPI_Fint *mtype, MPI_Fint *max_integers, { MPI_Aint *c_address_array = NULL; MPI_Datatype *c_datatype_array = NULL; - MPI_Datatype c_mtype = MPI_Type_f2c(*mtype); + MPI_Datatype c_mtype = PMPI_Type_f2c(*mtype); int i, c_ierr; OMPI_ARRAY_NAME_DECL(array_of_integers); @@ -113,7 +110,7 @@ void ompi_type_get_contents_f(MPI_Fint *mtype, MPI_Fint *max_integers, OMPI_ARRAY_FINT_2_INT(array_of_integers, *max_integers); - c_ierr = MPI_Type_get_contents(c_mtype, + c_ierr = PMPI_Type_get_contents(c_mtype, OMPI_FINT_2_INT(*max_integers), OMPI_FINT_2_INT(*max_addresses), OMPI_FINT_2_INT(*max_datatypes), @@ -126,7 +123,7 @@ void ompi_type_get_contents_f(MPI_Fint *mtype, MPI_Fint *max_integers, array_of_addresses[i] = c_address_array[i]; } for (i = 0; i < *max_datatypes; i++) { - array_of_datatypes[i] = MPI_Type_c2f(c_datatype_array[i]); + array_of_datatypes[i] = PMPI_Type_c2f(c_datatype_array[i]); } } free(c_address_array); diff --git a/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c b/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c index e546352039..feda3d2457 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_envelope_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ENVELOPE, #define ompi_type_get_envelope_f pompi_type_get_envelope_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_envelope PMPI_Type_get_envelope -#endif void ompi_type_get_envelope_f(MPI_Fint *type, MPI_Fint *num_integers, MPI_Fint *num_addresses, @@ -76,13 +73,13 @@ void ompi_type_get_envelope_f(MPI_Fint *type, MPI_Fint *num_integers, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); OMPI_SINGLE_NAME_DECL(num_integers); OMPI_SINGLE_NAME_DECL(num_addresses); OMPI_SINGLE_NAME_DECL(num_datatypes); OMPI_SINGLE_NAME_DECL(combiner); - c_ierr = MPI_Type_get_envelope(c_type, + c_ierr = PMPI_Type_get_envelope(c_type, OMPI_SINGLE_NAME_CONVERT(num_integers), OMPI_SINGLE_NAME_CONVERT(num_addresses), OMPI_SINGLE_NAME_CONVERT(num_datatypes), diff --git a/ompi/mpi/fortran/mpif-h/type_get_extent_f.c b/ompi/mpi/fortran/mpif-h/type_get_extent_f.c index e3e2bd581b..9c50e734fb 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_extent_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_EXTENT, #define ompi_type_get_extent_f pompi_type_get_extent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_extent PMPI_Type_get_extent -#endif void ompi_type_get_extent_f(MPI_Fint *type, MPI_Aint *lb, MPI_Aint *extent, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); - c_ierr = MPI_Type_get_extent(c_type, lb, extent); + c_ierr = PMPI_Type_get_extent(c_type, lb, extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c b/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c index 6e68f8ea3c..c76e1f4fd5 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_extent_x_f.c @@ -68,16 +68,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_EXTENT_X, #define ompi_type_get_extent_x_f pompi_type_get_extent_x_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_extent_x PMPI_Type_get_extent_x -#endif void ompi_type_get_extent_x_f(MPI_Fint *type, MPI_Count *lb, MPI_Count *extent, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); - c_ierr = MPI_Type_get_extent_x(c_type, lb, extent); + c_ierr = PMPI_Type_get_extent_x(c_type, lb, extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_get_name_f.c b/ompi/mpi/fortran/mpif-h/type_get_name_f.c index 74f68a172b..b211c0f97a 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_name_f.c @@ -68,17 +68,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_NAME, #define ompi_type_get_name_f pompi_type_get_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_name PMPI_Type_get_name -#endif void ompi_type_get_name_f(MPI_Fint *type, char *type_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len) { int c_ierr, c_len; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); char c_name[MPI_MAX_OBJECT_NAME]; - c_ierr = MPI_Type_get_name(c_type, c_name, &c_len); + c_ierr = PMPI_Type_get_name(c_type, c_name, &c_len); if (MPI_SUCCESS == c_ierr) { ompi_fortran_string_c2f(c_name, type_name, name_len); *resultlen = OMPI_INT_2_FINT(c_len); diff --git a/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c b/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c index 33e088f142..9e75641e87 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_true_extent_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_TRUE_EXTENT, #define ompi_type_get_true_extent_f pompi_type_get_true_extent_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_true_extent PMPI_Type_get_true_extent -#endif void ompi_type_get_true_extent_f(MPI_Fint *datatype, MPI_Aint *true_lb, MPI_Aint *true_extent, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Type_get_true_extent(c_type, true_lb, true_extent); + c_ierr = PMPI_Type_get_true_extent(c_type, true_lb, true_extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c b/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c index 936c12bc88..d91ba030f2 100644 --- a/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_get_true_extent_x_f.c @@ -68,15 +68,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_TRUE_EXTENT_X, #define ompi_type_get_true_extent_x_f pompi_type_get_true_extent_x_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_get_true_extent_x PMPI_Type_get_true_extent_x -#endif void ompi_type_get_true_extent_x_f(MPI_Fint *datatype, MPI_Count *true_lb, MPI_Count *true_extent, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*datatype); + MPI_Datatype c_type = PMPI_Type_f2c(*datatype); - c_ierr = MPI_Type_get_true_extent_x(c_type, true_lb, true_extent); + c_ierr = PMPI_Type_get_true_extent_x(c_type, true_lb, true_extent); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_hindexed_f.c index 440a94b43f..664a7a5196 100644 --- a/ompi/mpi/fortran/mpif-h/type_hindexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_hindexed_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HINDEXED, #define ompi_type_hindexed_f pompi_type_hindexed_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_hindexed PMPI_Type_hindexed -#endif static const char FUNC_NAME[] = "MPI_TYPE_HINDEXED"; @@ -79,7 +76,7 @@ void ompi_type_hindexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, MPI_Fint *array_of_displacements, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr) { - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; MPI_Aint *c_disp_array; int i, c_ierr; @@ -98,7 +95,7 @@ void ompi_type_hindexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count); - c_ierr = MPI_Type_hindexed(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_hindexed(OMPI_FINT_2_INT(*count), OMPI_ARRAY_NAME_CONVERT(array_of_blocklengths), c_disp_array, c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); @@ -107,6 +104,6 @@ void ompi_type_hindexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_blocklengths); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_hvector_f.c b/ompi/mpi/fortran/mpif-h/type_hvector_f.c index 52ad580ef8..851eae7b4a 100644 --- a/ompi/mpi/fortran/mpif-h/type_hvector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_hvector_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HVECTOR, #define ompi_type_hvector_f pompi_type_hvector_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_hvector PMPI_Type_hvector -#endif void ompi_type_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *stride, MPI_Fint *oldtype, @@ -77,15 +74,15 @@ void ompi_type_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, int c_ierr; MPI_Datatype c_oldtype, c_newtype; - c_oldtype = MPI_Type_f2c(*oldtype); + c_oldtype = PMPI_Type_f2c(*oldtype); - c_ierr = MPI_Type_hvector(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_hvector(OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*blocklength), (MPI_Aint)*stride, c_oldtype, &c_newtype); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_newtype); + *newtype = PMPI_Type_c2f(c_newtype); } } diff --git a/ompi/mpi/fortran/mpif-h/type_indexed_f.c b/ompi/mpi/fortran/mpif-h/type_indexed_f.c index 19c669678b..1958d151fe 100644 --- a/ompi/mpi/fortran/mpif-h/type_indexed_f.c +++ b/ompi/mpi/fortran/mpif-h/type_indexed_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_INDEXED, #define ompi_type_indexed_f pompi_type_indexed_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_indexed PMPI_Type_indexed -#endif void ompi_type_indexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, MPI_Fint *array_of_displacements, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_old = MPI_Type_f2c(*oldtype); + MPI_Datatype c_old = PMPI_Type_f2c(*oldtype); MPI_Datatype c_new; OMPI_ARRAY_NAME_DECL(array_of_blocklengths); OMPI_ARRAY_NAME_DECL(array_of_displacements); @@ -83,7 +80,7 @@ void ompi_type_indexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count); OMPI_ARRAY_FINT_2_INT(array_of_displacements, *count); - c_ierr = MPI_Type_indexed(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_indexed(OMPI_FINT_2_INT(*count), OMPI_ARRAY_NAME_CONVERT(array_of_blocklengths), OMPI_ARRAY_NAME_CONVERT(array_of_displacements), c_old, &c_new); @@ -93,6 +90,6 @@ void ompi_type_indexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, OMPI_ARRAY_FINT_2_INT_CLEANUP(array_of_displacements); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_lb_f.c b/ompi/mpi/fortran/mpif-h/type_lb_f.c index 5ddc05a9eb..5dc4fff66c 100644 --- a/ompi/mpi/fortran/mpif-h/type_lb_f.c +++ b/ompi/mpi/fortran/mpif-h/type_lb_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_LB, #define ompi_type_lb_f pompi_type_lb_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_lb PMPI_Type_lb -#endif void ompi_type_lb_f(MPI_Fint *type, MPI_Fint *lb, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); MPI_Aint c_lb; - c_ierr = MPI_Type_lb(c_type, &c_lb); + c_ierr = PMPI_Type_lb(c_type, &c_lb); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_match_size_f.c b/ompi/mpi/fortran/mpif-h/type_match_size_f.c index 7af1c9a762..f708d11c0a 100644 --- a/ompi/mpi/fortran/mpif-h/type_match_size_f.c +++ b/ompi/mpi/fortran/mpif-h/type_match_size_f.c @@ -73,10 +73,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_MATCH_SIZE, #define ompi_type_match_size_f pompi_type_match_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_match_size PMPI_Type_match_size -#endif - static const char FUNC_NAME[] = "MPI_Type_match_size_f"; /* We cannot use the C function as from Fortran we should check for Fortran types. The only @@ -105,7 +101,7 @@ void ompi_type_match_size_f(MPI_Fint *typeclass, MPI_Fint *size, MPI_Fint *type, default: c_type = &ompi_mpi_datatype_null.dt; } - *type = MPI_Type_c2f( c_type ); + *type = PMPI_Type_c2f( c_type ); if ( c_type != &ompi_mpi_datatype_null.dt ) { c_ierr = MPI_SUCCESS; } else { diff --git a/ompi/mpi/fortran/mpif-h/type_set_attr_f.c b/ompi/mpi/fortran/mpif-h/type_set_attr_f.c index 5f196fb93a..a4a398a5fc 100644 --- a/ompi/mpi/fortran/mpif-h/type_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/type_set_attr_f.c @@ -68,14 +68,10 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_ATTR, #define ompi_type_set_attr_f pompi_type_set_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_set_attr PMPI_Type_set_attr -#endif - void ompi_type_set_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); /* This stuff is very confusing. Be sure to see the comment at the top of src/attributes/attributes.c. */ diff --git a/ompi/mpi/fortran/mpif-h/type_set_name_f.c b/ompi/mpi/fortran/mpif-h/type_set_name_f.c index cae4810fcf..5beea4c7ed 100644 --- a/ompi/mpi/fortran/mpif-h/type_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/type_set_name_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_NAME, #define ompi_type_set_name_f pompi_type_set_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_set_name PMPI_Type_set_name -#endif void ompi_type_set_name_f(MPI_Fint *type, char *type_name, MPI_Fint *ierr, int name_len) @@ -81,7 +78,7 @@ void ompi_type_set_name_f(MPI_Fint *type, char *type_name, MPI_Fint *ierr, char *c_name; MPI_Datatype c_type; - c_type = MPI_Type_f2c(*type); + c_type = PMPI_Type_f2c(*type); /* Convert the fortran string */ @@ -95,7 +92,7 @@ void ompi_type_set_name_f(MPI_Fint *type, char *type_name, MPI_Fint *ierr, /* Call the C function */ - c_ierr = MPI_Type_set_name(c_type, c_name); + c_ierr = PMPI_Type_set_name(c_type, c_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* Free the C name */ diff --git a/ompi/mpi/fortran/mpif-h/type_size_f.c b/ompi/mpi/fortran/mpif-h/type_size_f.c index 2cee767f3f..cb2dcdd7a9 100644 --- a/ompi/mpi/fortran/mpif-h/type_size_f.c +++ b/ompi/mpi/fortran/mpif-h/type_size_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SIZE, #define ompi_type_size_f pompi_type_size_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_size PMPI_Type_size -#endif void ompi_type_size_f(MPI_Fint *type, MPI_Fint *size, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Type_size(c_type, OMPI_SINGLE_NAME_CONVERT(size)); + c_ierr = PMPI_Type_size(c_type, OMPI_SINGLE_NAME_CONVERT(size)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_size_x_f.c b/ompi/mpi/fortran/mpif-h/type_size_x_f.c index ac707b48e1..05c531feee 100644 --- a/ompi/mpi/fortran/mpif-h/type_size_x_f.c +++ b/ompi/mpi/fortran/mpif-h/type_size_x_f.c @@ -68,16 +68,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SIZE_X, #define ompi_type_size_x_f pompi_type_size_x_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_size_x PMPI_Type_size_x -#endif void ompi_type_size_x_f(MPI_Fint *type, MPI_Count *size, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_type = MPI_Type_f2c(*type); + MPI_Datatype c_type = PMPI_Type_f2c(*type); OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Type_size_x(c_type, size); + c_ierr = PMPI_Type_size_x(c_type, size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/type_struct_f.c b/ompi/mpi/fortran/mpif-h/type_struct_f.c index 8405db23fb..3c4c594a5a 100644 --- a/ompi/mpi/fortran/mpif-h/type_struct_f.c +++ b/ompi/mpi/fortran/mpif-h/type_struct_f.c @@ -68,9 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_STRUCT, #define ompi_type_struct_f pompi_type_struct_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_struct PMPI_Type_struct -#endif static const char FUNC_NAME[] = "MPI_TYPE_STRUCT"; @@ -98,12 +95,12 @@ void ompi_type_struct_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, for (i = 0; i < *count; i++) { c_disp_array[i] = (MPI_Aint) array_of_displacements[i]; - c_type_old_array[i] = MPI_Type_f2c(array_of_types[i]); + c_type_old_array[i] = PMPI_Type_f2c(array_of_types[i]); } OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count); - c_ierr = MPI_Type_struct(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_struct(OMPI_FINT_2_INT(*count), OMPI_ARRAY_NAME_CONVERT(array_of_blocklengths), c_disp_array, c_type_old_array, &c_new); @@ -113,6 +110,6 @@ void ompi_type_struct_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, free(c_type_old_array); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/type_ub_f.c b/ompi/mpi/fortran/mpif-h/type_ub_f.c index e1525069d4..a308b713cb 100644 --- a/ompi/mpi/fortran/mpif-h/type_ub_f.c +++ b/ompi/mpi/fortran/mpif-h/type_ub_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_UB, #define ompi_type_ub_f pompi_type_ub_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_ub PMPI_Type_ub -#endif void ompi_type_ub_f(MPI_Fint *mtype, MPI_Fint *ub, MPI_Fint *ierr) { int c_ierr; - MPI_Datatype c_mtype = MPI_Type_f2c(*mtype); + MPI_Datatype c_mtype = PMPI_Type_f2c(*mtype); MPI_Aint c_ub; - c_ierr = MPI_Type_ub(c_mtype, &c_ub); + c_ierr = PMPI_Type_ub(c_mtype, &c_ub); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/type_vector_f.c b/ompi/mpi/fortran/mpif-h/type_vector_f.c index 0654b07a16..97ea66d01c 100644 --- a/ompi/mpi/fortran/mpif-h/type_vector_f.c +++ b/ompi/mpi/fortran/mpif-h/type_vector_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_VECTOR, #define ompi_type_vector_f pompi_type_vector_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Type_vector PMPI_Type_vector -#endif void ompi_type_vector_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *stride, MPI_Fint *oldtype, @@ -78,15 +75,15 @@ void ompi_type_vector_f(MPI_Fint *count, MPI_Fint *blocklength, MPI_Datatype c_old; MPI_Datatype c_new; - c_old = MPI_Type_f2c(*oldtype); + c_old = PMPI_Type_f2c(*oldtype); - c_ierr = MPI_Type_vector(OMPI_FINT_2_INT(*count), + c_ierr = PMPI_Type_vector(OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*blocklength), OMPI_FINT_2_INT(*stride), c_old, &c_new); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *newtype = MPI_Type_c2f(c_new); + *newtype = PMPI_Type_c2f(c_new); } } diff --git a/ompi/mpi/fortran/mpif-h/unpack_external_f.c b/ompi/mpi/fortran/mpif-h/unpack_external_f.c index 9deb7bc4f4..5e4cdb6513 100644 --- a/ompi/mpi/fortran/mpif-h/unpack_external_f.c +++ b/ompi/mpi/fortran/mpif-h/unpack_external_f.c @@ -70,9 +70,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK_EXTERNAL, #define ompi_unpack_external_f pompi_unpack_external_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Unpack_external PMPI_Unpack_external -#endif void ompi_unpack_external_f (char *datarep, char *inbuf, MPI_Aint *insize, MPI_Aint *position, char *outbuf, @@ -83,7 +80,7 @@ void ompi_unpack_external_f (char *datarep, char *inbuf, MPI_Aint *insize, char *c_datarep; MPI_Datatype c_type; - c_type = MPI_Type_f2c(*datatype); + c_type = PMPI_Type_f2c(*datatype); /* Convert the fortran string */ @@ -95,7 +92,7 @@ void ompi_unpack_external_f (char *datarep, char *inbuf, MPI_Aint *insize, return; } - c_ierr = MPI_Unpack_external(c_datarep, inbuf, + c_ierr = PMPI_Unpack_external(c_datarep, inbuf, *insize, position, OMPI_F2C_BOTTOM(outbuf), diff --git a/ompi/mpi/fortran/mpif-h/unpack_f.c b/ompi/mpi/fortran/mpif-h/unpack_f.c index 05961fb9d1..22365a41b3 100644 --- a/ompi/mpi/fortran/mpif-h/unpack_f.c +++ b/ompi/mpi/fortran/mpif-h/unpack_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK, #define ompi_unpack_f pompi_unpack_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Unpack PMPI_Unpack -#endif void ompi_unpack_f(char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, @@ -80,11 +77,11 @@ void ompi_unpack_f(char *inbuf, MPI_Fint *insize, MPI_Fint *position, MPI_Datatype c_type; OMPI_SINGLE_NAME_DECL(position); - c_comm = MPI_Comm_f2c(*comm); - c_type = MPI_Type_f2c(*datatype); + c_comm = PMPI_Comm_f2c(*comm); + c_type = PMPI_Type_f2c(*datatype); OMPI_SINGLE_FINT_2_INT(position); - c_ierr = MPI_Unpack(inbuf, OMPI_FINT_2_INT(*insize), + c_ierr = PMPI_Unpack(inbuf, OMPI_FINT_2_INT(*insize), OMPI_SINGLE_NAME_CONVERT(position), OMPI_F2C_BOTTOM(outbuf), OMPI_FINT_2_INT(*outcount), c_type, c_comm); diff --git a/ompi/mpi/fortran/mpif-h/unpublish_name_f.c b/ompi/mpi/fortran/mpif-h/unpublish_name_f.c index 7b6bdbf4e4..c314d4725c 100644 --- a/ompi/mpi/fortran/mpif-h/unpublish_name_f.c +++ b/ompi/mpi/fortran/mpif-h/unpublish_name_f.c @@ -67,9 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPUBLISH_NAME, #define ompi_unpublish_name_f pompi_unpublish_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Unpublish_name PMPI_Unpublish_name -#endif void ompi_unpublish_name_f(char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, @@ -80,11 +77,11 @@ void ompi_unpublish_name_f(char *service_name, MPI_Fint *info, char *c_service_name; char *c_port_name; - c_info = MPI_Info_f2c(*info); + c_info = PMPI_Info_f2c(*info); ompi_fortran_string_f2c(service_name, service_name_len, &c_service_name); ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name); - c_ierr = MPI_Unpublish_name(c_service_name, c_info, c_port_name); + c_ierr = PMPI_Unpublish_name(c_service_name, c_info, c_port_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); free ( c_service_name); diff --git a/ompi/mpi/fortran/mpif-h/wait_f.c b/ompi/mpi/fortran/mpif-h/wait_f.c index a72aaf3ab8..340b6ffec7 100644 --- a/ompi/mpi/fortran/mpif-h/wait_f.c +++ b/ompi/mpi/fortran/mpif-h/wait_f.c @@ -67,23 +67,20 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAIT, #define ompi_wait_f pompi_wait_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Wait PMPI_Wait -#endif void ompi_wait_f(MPI_Fint *request, MPI_Fint *status, MPI_Fint *ierr) { int c_ierr; - MPI_Request c_req = MPI_Request_f2c(*request); + MPI_Request c_req = PMPI_Request_f2c(*request); MPI_Status c_status; - c_ierr = MPI_Wait(&c_req, &c_status); + c_ierr = PMPI_Wait(&c_req, &c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { *request = OMPI_INT_2_FINT(c_req->req_f_to_c_index); if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } } diff --git a/ompi/mpi/fortran/mpif-h/waitall_f.c b/ompi/mpi/fortran/mpif-h/waitall_f.c index 1069732208..bde8fcfc15 100644 --- a/ompi/mpi/fortran/mpif-h/waitall_f.c +++ b/ompi/mpi/fortran/mpif-h/waitall_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITALL, #define ompi_waitall_f pompi_waitall_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Waitall PMPI_Waitall -#endif static const char FUNC_NAME[] = "MPI_WAITALL"; @@ -102,10 +99,10 @@ void ompi_waitall_f(MPI_Fint *count, MPI_Fint *array_of_requests, c_status = (MPI_Status*) (c_req + OMPI_FINT_2_INT(*count)); for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } - c_ierr = MPI_Waitall(OMPI_FINT_2_INT(*count), c_req, c_status); + c_ierr = PMPI_Waitall(OMPI_FINT_2_INT(*count), c_req, c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { @@ -113,7 +110,7 @@ void ompi_waitall_f(MPI_Fint *count, MPI_Fint *array_of_requests, array_of_requests[i] = c_req[i]->req_f_to_c_index; if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses) && !OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) { - MPI_Status_c2f( &c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); + PMPI_Status_c2f( &c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); } } } diff --git a/ompi/mpi/fortran/mpif-h/waitany_f.c b/ompi/mpi/fortran/mpif-h/waitany_f.c index 005c691c1c..620d8eaefd 100644 --- a/ompi/mpi/fortran/mpif-h/waitany_f.c +++ b/ompi/mpi/fortran/mpif-h/waitany_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITANY, #define ompi_waitany_f pompi_waitany_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Waitany PMPI_Waitany -#endif static const char FUNC_NAME[] = "MPI_WAITANY"; @@ -88,7 +85,7 @@ void ompi_waitany_f(MPI_Fint *count, MPI_Fint *array_of_requests, skipping other parameter error checks. */ if (OPAL_UNLIKELY(0 == OMPI_FINT_2_INT(*count))) { *indx = OMPI_INT_2_FINT(MPI_UNDEFINED); - MPI_Status_c2f(&ompi_status_empty, status); + PMPI_Status_c2f(&ompi_status_empty, status); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS); return; } @@ -102,10 +99,10 @@ void ompi_waitany_f(MPI_Fint *count, MPI_Fint *array_of_requests, } for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } - c_ierr = MPI_Waitany(OMPI_FINT_2_INT(*count), c_req, + c_ierr = PMPI_Waitany(OMPI_FINT_2_INT(*count), c_req, OMPI_SINGLE_NAME_CONVERT(indx), &c_status); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); @@ -121,7 +118,7 @@ void ompi_waitany_f(MPI_Fint *count, MPI_Fint *array_of_requests, ++(*indx); } if (!OMPI_IS_FORTRAN_STATUS_IGNORE(status)) { - MPI_Status_c2f(&c_status, status); + PMPI_Status_c2f(&c_status, status); } } free(c_req); diff --git a/ompi/mpi/fortran/mpif-h/waitsome_f.c b/ompi/mpi/fortran/mpif-h/waitsome_f.c index 902d8c1851..e276e6c334 100644 --- a/ompi/mpi/fortran/mpif-h/waitsome_f.c +++ b/ompi/mpi/fortran/mpif-h/waitsome_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITSOME, #define ompi_waitsome_f pompi_waitsome_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Waitsome PMPI_Waitsome -#endif static const char FUNC_NAME[] = "MPI_WAITSOME"; @@ -107,11 +104,11 @@ void ompi_waitsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, c_status = (MPI_Status*) (c_req + OMPI_FINT_2_INT(*incount)); for (i = 0; i < OMPI_FINT_2_INT(*incount); ++i) { - c_req[i] = MPI_Request_f2c(array_of_requests[i]); + c_req[i] = PMPI_Request_f2c(array_of_requests[i]); } OMPI_ARRAY_FINT_2_INT_ALLOC(array_of_indices, *incount); - c_ierr = MPI_Waitsome(OMPI_FINT_2_INT(*incount), c_req, + c_ierr = PMPI_Waitsome(OMPI_FINT_2_INT(*incount), c_req, OMPI_SINGLE_NAME_CONVERT(outcount), OMPI_ARRAY_NAME_CONVERT(array_of_indices), c_status); @@ -133,7 +130,7 @@ void ompi_waitsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, if (!OMPI_IS_FORTRAN_STATUSES_IGNORE(array_of_statuses)) { for (i = 0; i < OMPI_FINT_2_INT(*incount); ++i) { if (!OMPI_IS_FORTRAN_STATUS_IGNORE(&array_of_statuses[i])) { - MPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); + PMPI_Status_c2f(&c_status[i], &array_of_statuses[i * (sizeof(MPI_Status) / sizeof(int))]); } } } diff --git a/ompi/mpi/fortran/mpif-h/win_allocate_f.c b/ompi/mpi/fortran/mpif-h/win_allocate_f.c index 3015736332..d9038ac760 100644 --- a/ompi/mpi/fortran/mpif-h/win_allocate_f.c +++ b/ompi/mpi/fortran/mpif-h/win_allocate_f.c @@ -107,9 +107,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ALLOCATE_CPTR, #define ompi_win_allocate_cptr_f pompi_win_allocate_cptr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_allocate PMPI_Win_allocate -#endif void ompi_win_allocate_f(MPI_Aint *size, MPI_Fint *disp_unit, MPI_Fint *info, MPI_Fint *comm, char *baseptr, @@ -120,13 +117,13 @@ void ompi_win_allocate_f(MPI_Aint *size, MPI_Fint *disp_unit, MPI_Comm c_comm; MPI_Win c_win; - c_info = MPI_Info_f2c(*info); - c_comm = MPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Win_allocate(*size, OMPI_FINT_2_INT(*disp_unit), + c_ierr = PMPI_Win_allocate(*size, OMPI_FINT_2_INT(*disp_unit), c_info, c_comm, baseptr, &c_win); - *win = MPI_Win_c2f(c_win); + *win = PMPI_Win_c2f(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c b/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c index 20225f2ead..19889f5eb4 100644 --- a/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c +++ b/ompi/mpi/fortran/mpif-h/win_allocate_shared_f.c @@ -107,9 +107,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ALLOCATE_SHARED_CPTR, #define ompi_win_allocate_shared_cptr_f pompi_win_allocate_shared_cptr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_allocate_shared PMPI_Win_allocate_shared -#endif void ompi_win_allocate_shared_f(MPI_Aint *size, MPI_Fint *disp_unit, MPI_Fint *info, MPI_Fint *comm, char *baseptr, @@ -120,13 +117,13 @@ void ompi_win_allocate_shared_f(MPI_Aint *size, MPI_Fint *disp_unit, MPI_Comm c_comm; MPI_Win c_win; - c_info = MPI_Info_f2c(*info); - c_comm = MPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); - c_ierr = MPI_Win_allocate_shared(*size, OMPI_FINT_2_INT(*disp_unit), + c_ierr = PMPI_Win_allocate_shared(*size, OMPI_FINT_2_INT(*disp_unit), c_info, c_comm, baseptr, &c_win); - *win = MPI_Win_c2f(c_win); + *win = PMPI_Win_c2f(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_attach_f.c b/ompi/mpi/fortran/mpif-h/win_attach_f.c index c65413db32..9f4a8b625d 100644 --- a/ompi/mpi/fortran/mpif-h/win_attach_f.c +++ b/ompi/mpi/fortran/mpif-h/win_attach_f.c @@ -55,9 +55,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_ATTACH, #define ompi_win_attach_f pompi_win_attach_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_attach PMPI_Win_attach -#endif void ompi_win_attach_f(MPI_Fint *win, char *base, MPI_Aint *size, MPI_Fint *ierr) @@ -65,7 +62,7 @@ void ompi_win_attach_f(MPI_Fint *win, char *base, MPI_Aint *size, int c_ierr; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); - c_ierr = MPI_Win_attach(c_win, base, *size); + c_win = PMPI_Win_f2c(*win); + c_ierr = PMPI_Win_attach(c_win, base, *size); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c index d61e5adbc6..4c9be629bd 100644 --- a/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_call_errhandler_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CALL_ERRHANDLER, #define ompi_win_call_errhandler_f pompi_win_call_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_call_errhandler PMPI_Win_call_errhandler -#endif void ompi_win_call_errhandler_f(MPI_Fint *win, MPI_Fint *errorcode, MPI_Fint *ierr) @@ -76,8 +73,8 @@ void ompi_win_call_errhandler_f(MPI_Fint *win, MPI_Fint *errorcode, int c_ierr; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); + c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_call_errhandler(c_win, OMPI_FINT_2_INT(*errorcode)); + c_ierr = PMPI_Win_call_errhandler(c_win, OMPI_FINT_2_INT(*errorcode)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_complete_f.c b/ompi/mpi/fortran/mpif-h/win_complete_f.c index b0c5ae70e6..96e85cadae 100644 --- a/ompi/mpi/fortran/mpif-h/win_complete_f.c +++ b/ompi/mpi/fortran/mpif-h/win_complete_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_COMPLETE, #define ompi_win_complete_f pompi_win_complete_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_complete PMPI_Win_complete -#endif void ompi_win_complete_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); + c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_complete(c_win); + c_ierr = PMPI_Win_complete(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c b/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c index edb5e3ce57..1cee3b6f8a 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_dynamic_f.c @@ -55,9 +55,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_DYNAMIC, #define ompi_win_create_dynamic_f pompi_win_create_dynamic_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_create_dynamic PMPI_Win_create_dynamic -#endif void ompi_win_create_dynamic_f(MPI_Fint *info, MPI_Fint *comm, MPI_Fint *win, MPI_Fint *ierr) @@ -67,13 +64,13 @@ void ompi_win_create_dynamic_f(MPI_Fint *info, MPI_Fint *comm, MPI_Fint *win, MPI_Info c_info; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); - c_info = MPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Win_create_dynamic(c_info, c_comm, &c_win); + c_ierr = PMPI_Win_create_dynamic(c_info, c_comm, &c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *win = MPI_Win_c2f(c_win); + *win = PMPI_Win_c2f(c_win); } } diff --git a/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c index c831ba81e9..49cee12bcb 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_errhandler_f.c @@ -68,10 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_ERRHANDLER, #define ompi_win_create_errhandler_f pompi_win_create_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_create_errhandler PMPI_Win_create_errhandler -#endif - static const char FUNC_NAME[] = "MPI_WIN_CREATE_ERRHANDLER"; @@ -83,7 +79,7 @@ void ompi_win_create_errhandler_f(ompi_errhandler_fortran_handler_fn_t* function (ompi_errhandler_generic_handler_fn_t*) function, OMPI_ERRHANDLER_LANG_FORTRAN); if (MPI_ERRHANDLER_NULL != c_errhandler) { - *errhandler = MPI_Errhandler_c2f(c_errhandler); + *errhandler = PMPI_Errhandler_c2f(c_errhandler); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(MPI_SUCCESS); } else { if (NULL != ierr) *ierr = OMPI_INT_2_FINT(MPI_ERR_INTERN); diff --git a/ompi/mpi/fortran/mpif-h/win_create_f.c b/ompi/mpi/fortran/mpif-h/win_create_f.c index 1c1566d35b..cf9e1ddcb2 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_f.c @@ -66,9 +66,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE, #define ompi_win_create_f pompi_win_create_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_create PMPI_Win_create -#endif void ompi_win_create_f(char *base, MPI_Aint *size, MPI_Fint *disp_unit, MPI_Fint *info, MPI_Fint *comm, MPI_Fint *win, @@ -79,15 +76,15 @@ void ompi_win_create_f(char *base, MPI_Aint *size, MPI_Fint *disp_unit, MPI_Info c_info; MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); - c_info = MPI_Info_f2c(*info); + c_comm = PMPI_Comm_f2c(*comm); + c_info = PMPI_Info_f2c(*info); - c_ierr = MPI_Win_create(base, *size, + c_ierr = PMPI_Win_create(base, *size, OMPI_FINT_2_INT(*disp_unit), c_info, c_comm, &c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *win = MPI_Win_c2f(c_win); + *win = PMPI_Win_c2f(c_win); } } diff --git a/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c b/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c index a2d6d2513a..05a0ff1e21 100644 --- a/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/win_create_keyval_f.c @@ -67,10 +67,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_KEYVAL, #define ompi_win_create_keyval_f pompi_win_create_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_create_keyval PMPI_Win_create_keyval -#endif - static char FUNC_NAME[] = "MPI_Win_create_keyval"; void ompi_win_create_keyval_f(ompi_mpi2_fortran_copy_attr_function* win_copy_attr_fn, diff --git a/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c index b0e6121839..9ae356f17b 100644 --- a/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_delete_attr_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_DELETE_ATTR, #define ompi_win_delete_attr_f pompi_win_delete_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_delete_attr PMPI_Win_delete_attr -#endif void ompi_win_delete_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_delete_attr(c_win, OMPI_FINT_2_INT(*win_keyval)); + c_ierr = PMPI_Win_delete_attr(c_win, OMPI_FINT_2_INT(*win_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_detach_f.c b/ompi/mpi/fortran/mpif-h/win_detach_f.c index bde855033a..60d2aac7ad 100644 --- a/ompi/mpi/fortran/mpif-h/win_detach_f.c +++ b/ompi/mpi/fortran/mpif-h/win_detach_f.c @@ -55,9 +55,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_DETACH, #define ompi_win_detach_f pompi_win_detach_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_detach PMPI_Win_detach -#endif void ompi_win_detach_f(MPI_Fint *win, char *base, MPI_Fint *ierr) @@ -65,7 +62,7 @@ void ompi_win_detach_f(MPI_Fint *win, char *base, int c_ierr; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); - c_ierr = MPI_Win_detach(c_win, base); + c_win = PMPI_Win_f2c(*win); + c_ierr = PMPI_Win_detach(c_win, base); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_fence_f.c b/ompi/mpi/fortran/mpif-h/win_fence_f.c index 7f3b1df454..a96fa797ca 100644 --- a/ompi/mpi/fortran/mpif-h/win_fence_f.c +++ b/ompi/mpi/fortran/mpif-h/win_fence_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FENCE, #define ompi_win_fence_f pompi_win_fence_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_fence PMPI_Win_fence -#endif void ompi_win_fence_f(MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_fence(OMPI_FINT_2_INT(*assert), c_win); + c_ierr = PMPI_Win_fence(OMPI_FINT_2_INT(*assert), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_flush_all_f.c b/ompi/mpi/fortran/mpif-h/win_flush_all_f.c index e5257ed2dd..2753d61d5e 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_all_f.c @@ -69,15 +69,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_ALL, #define ompi_win_flush_all_f pompi_win_flush_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_flush_all PMPI_Win_flush_all -#endif void ompi_win_flush_all_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_flush_all(c_win); + c_ierr = PMPI_Win_flush_all(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_flush_f.c b/ompi/mpi/fortran/mpif-h/win_flush_f.c index 770eba6088..c65f0c3f14 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_f.c @@ -69,15 +69,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH, #define ompi_win_flush_f pompi_win_flush_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_flush PMPI_Win_flush -#endif void ompi_win_flush_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_flush(OMPI_FINT_2_INT(*rank), c_win); + c_ierr = PMPI_Win_flush(OMPI_FINT_2_INT(*rank), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c b/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c index d551705310..6a69469297 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_local_all_f.c @@ -69,15 +69,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_LOCAL_ALL, #define ompi_win_flush_local_all_f pompi_win_flush_local_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_flush_local_all PMPI_Win_flush_local_all -#endif void ompi_win_flush_local_all_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_flush_local_all(c_win); + c_ierr = PMPI_Win_flush_local_all(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_flush_local_f.c b/ompi/mpi/fortran/mpif-h/win_flush_local_f.c index 1cb9f54153..de78970990 100644 --- a/ompi/mpi/fortran/mpif-h/win_flush_local_f.c +++ b/ompi/mpi/fortran/mpif-h/win_flush_local_f.c @@ -69,15 +69,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FLUSH_LOCAL, #define ompi_win_flush_local_f pompi_win_flush_local_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_flush_local PMPI_Win_flush_local -#endif void ompi_win_flush_local_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_flush_local(OMPI_FINT_2_INT(*rank), c_win); + c_ierr = PMPI_Win_flush_local(OMPI_FINT_2_INT(*rank), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_free_f.c b/ompi/mpi/fortran/mpif-h/win_free_f.c index 8b44fed3d8..9f2669dad0 100644 --- a/ompi/mpi/fortran/mpif-h/win_free_f.c +++ b/ompi/mpi/fortran/mpif-h/win_free_f.c @@ -66,19 +66,16 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE, #define ompi_win_free_f pompi_win_free_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_free PMPI_Win_free -#endif void ompi_win_free_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_free(&c_win); + c_ierr = PMPI_Win_free(&c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *win = MPI_Win_c2f(c_win); + *win = PMPI_Win_c2f(c_win); } } diff --git a/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c b/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c index 20a09f92a7..7d737b06ed 100644 --- a/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c +++ b/ompi/mpi/fortran/mpif-h/win_free_keyval_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE_KEYVAL, #define ompi_win_free_keyval_f pompi_win_free_keyval_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_free_keyval PMPI_Win_free_keyval -#endif void ompi_win_free_keyval_f(MPI_Fint *win_keyval, MPI_Fint *ierr) { int c_ierr; OMPI_SINGLE_NAME_DECL(win_keyval); - c_ierr = MPI_Win_free_keyval(OMPI_SINGLE_NAME_CONVERT(win_keyval)); + c_ierr = PMPI_Win_free_keyval(OMPI_SINGLE_NAME_CONVERT(win_keyval)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/win_get_attr_f.c b/ompi/mpi/fortran/mpif-h/win_get_attr_f.c index 39e4c3e602..a7fdc3180a 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_attr_f.c @@ -68,15 +68,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ATTR, #define ompi_win_get_attr_f pompi_win_get_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_get_attr PMPI_Win_get_attr -#endif - void ompi_win_get_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); OMPI_LOGICAL_NAME_DECL(flag); /* This stuff is very confusing. Be sure to see the comment at diff --git a/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c index e2100a558e..c4189a6db7 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_errhandler_f.c @@ -66,21 +66,18 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ERRHANDLER, #define ompi_win_get_errhandler_f pompi_win_get_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_get_errhandler PMPI_Win_get_errhandler -#endif void ompi_win_get_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler, MPI_Fint *ierr) { int c_ierr; MPI_Errhandler c_err; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_get_errhandler(c_win, &c_err); + c_ierr = PMPI_Win_get_errhandler(c_win, &c_err); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *errhandler = MPI_Errhandler_c2f(c_err); + *errhandler = PMPI_Errhandler_c2f(c_err); } } diff --git a/ompi/mpi/fortran/mpif-h/win_get_group_f.c b/ompi/mpi/fortran/mpif-h/win_get_group_f.c index 9291c1e579..135cbd89f3 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_group_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_group_f.c @@ -66,20 +66,17 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_GROUP, #define ompi_win_get_group_f pompi_win_get_group_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_get_group PMPI_Win_get_group -#endif void ompi_win_get_group_f(MPI_Fint *win, MPI_Fint *group, MPI_Fint *ierr) { int c_ierr; MPI_Group c_grp; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_get_group(c_win, &c_grp); + c_ierr = PMPI_Win_get_group(c_win, &c_grp); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { - *group = MPI_Group_c2f(c_grp); + *group = PMPI_Group_c2f(c_grp); } } diff --git a/ompi/mpi/fortran/mpif-h/win_get_info_f.c b/ompi/mpi/fortran/mpif-h/win_get_info_f.c index 33eeb1249d..3052f7eb18 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_info_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_info_f.c @@ -55,9 +55,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_INFO, #define ompi_win_get_info_f pompi_win_get_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_get_info PMPI_Win_get_info -#endif void ompi_win_get_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) { @@ -65,8 +62,8 @@ void ompi_win_get_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) MPI_Win c_win; MPI_Info c_info; - c_win = MPI_Win_f2c(*win); - c_ierr = MPI_Win_get_info(c_win, &c_info); + c_win = PMPI_Win_f2c(*win); + c_ierr = PMPI_Win_get_info(c_win, &c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); - *info = MPI_Info_c2f(c_info); + *info = PMPI_Info_c2f(c_info); } diff --git a/ompi/mpi/fortran/mpif-h/win_get_name_f.c b/ompi/mpi/fortran/mpif-h/win_get_name_f.c index f26c3caf39..2b141428d7 100644 --- a/ompi/mpi/fortran/mpif-h/win_get_name_f.c +++ b/ompi/mpi/fortran/mpif-h/win_get_name_f.c @@ -69,18 +69,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_NAME, #define ompi_win_get_name_f pompi_win_get_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_get_name PMPI_Win_get_name -#endif void ompi_win_get_name_f(MPI_Fint *win, char *win_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len) { int c_ierr, c_len; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); char c_name[MPI_MAX_OBJECT_NAME]; - c_ierr = MPI_Win_get_name(c_win, c_name, &c_len); + c_ierr = PMPI_Win_get_name(c_win, c_name, &c_len); if (MPI_SUCCESS == c_ierr) { ompi_fortran_string_c2f(c_name, win_name, name_len); *resultlen = OMPI_INT_2_FINT(c_len); diff --git a/ompi/mpi/fortran/mpif-h/win_lock_all_f.c b/ompi/mpi/fortran/mpif-h/win_lock_all_f.c index b0c3e3b0ba..9a91d6a55a 100644 --- a/ompi/mpi/fortran/mpif-h/win_lock_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_lock_all_f.c @@ -66,16 +66,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_LOCK_ALL, #define ompi_win_lock_all_f pompi_win_lock_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_lock_all PMPI_Win_lock_all -#endif void ompi_win_lock_all_f(MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_lock_all(OMPI_FINT_2_INT(*assert), + c_ierr = PMPI_Win_lock_all(OMPI_FINT_2_INT(*assert), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_lock_f.c b/ompi/mpi/fortran/mpif-h/win_lock_f.c index 4c538cc22a..daf5e41d13 100644 --- a/ompi/mpi/fortran/mpif-h/win_lock_f.c +++ b/ompi/mpi/fortran/mpif-h/win_lock_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_LOCK, #define ompi_win_lock_f pompi_win_lock_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_lock PMPI_Win_lock -#endif void ompi_win_lock_f(MPI_Fint *lock_type, MPI_Fint *rank, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_lock(OMPI_FINT_2_INT(*lock_type), + c_ierr = PMPI_Win_lock(OMPI_FINT_2_INT(*lock_type), OMPI_FINT_2_INT(*rank), OMPI_FINT_2_INT(*assert), c_win); diff --git a/ompi/mpi/fortran/mpif-h/win_post_f.c b/ompi/mpi/fortran/mpif-h/win_post_f.c index a0659ae4ea..75cb1f1537 100644 --- a/ompi/mpi/fortran/mpif-h/win_post_f.c +++ b/ompi/mpi/fortran/mpif-h/win_post_f.c @@ -66,18 +66,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_POST, #define ompi_win_post_f pompi_win_post_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_post PMPI_Win_post -#endif void ompi_win_post_f(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Group c_grp = MPI_Group_f2c(*group); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Group c_grp = PMPI_Group_f2c(*group); - c_ierr = MPI_Win_post(c_grp, + c_ierr = PMPI_Win_post(c_grp, OMPI_FINT_2_INT(*assert), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/win_set_attr_f.c b/ompi/mpi/fortran/mpif-h/win_set_attr_f.c index 01d38e1510..d82b0de8f8 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_attr_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_attr_f.c @@ -69,15 +69,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ATTR, #define ompi_win_set_attr_f pompi_win_set_attr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_set_attr PMPI_Win_set_attr -#endif - void ompi_win_set_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); /* This stuff is very confusing. Be sure to see the comment at the top of src/attributes/attributes.c. */ diff --git a/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c b/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c index 9615634781..aa0e9392e3 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_errhandler_f.c @@ -67,17 +67,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ERRHANDLER, #define ompi_win_set_errhandler_f pompi_win_set_errhandler_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_set_errhandler PMPI_Win_set_errhandler -#endif void ompi_win_set_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); - MPI_Errhandler c_err = MPI_Errhandler_f2c(*errhandler); + MPI_Win c_win = PMPI_Win_f2c(*win); + MPI_Errhandler c_err = PMPI_Errhandler_f2c(*errhandler); - c_ierr = MPI_Win_set_errhandler(c_win, c_err); + c_ierr = PMPI_Win_set_errhandler(c_win, c_err); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_set_info_f.c b/ompi/mpi/fortran/mpif-h/win_set_info_f.c index 5b26aabbda..f6cc0b7363 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_info_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_info_f.c @@ -55,9 +55,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_INFO, #define ompi_win_set_info_f pompi_win_set_info_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_set_info PMPI_Win_set_info -#endif void ompi_win_set_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) { @@ -65,8 +62,8 @@ void ompi_win_set_info_f(MPI_Fint *win, MPI_Fint *info, MPI_Fint *ierr) MPI_Win c_win; MPI_Info c_info; - c_win = MPI_Win_f2c(*win); - c_info = MPI_Info_f2c(*info); - c_ierr = MPI_Win_set_info(c_win, c_info); + c_win = PMPI_Win_f2c(*win); + c_info = PMPI_Info_f2c(*info); + c_ierr = PMPI_Win_set_info(c_win, c_info); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_set_name_f.c b/ompi/mpi/fortran/mpif-h/win_set_name_f.c index c0496547aa..c989484d2e 100644 --- a/ompi/mpi/fortran/mpif-h/win_set_name_f.c +++ b/ompi/mpi/fortran/mpif-h/win_set_name_f.c @@ -69,9 +69,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_NAME, #define ompi_win_set_name_f pompi_win_set_name_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_set_name PMPI_Win_set_name -#endif void ompi_win_set_name_f(MPI_Fint *win, char *win_name, MPI_Fint *ierr, int name_len) @@ -80,7 +77,7 @@ void ompi_win_set_name_f(MPI_Fint *win, char *win_name, MPI_Fint *ierr, char *c_name; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); + c_win = PMPI_Win_f2c(*win); /* Convert the fortran string */ @@ -94,7 +91,7 @@ void ompi_win_set_name_f(MPI_Fint *win, char *win_name, MPI_Fint *ierr, /* Call the C function */ - c_ierr = MPI_Win_set_name(c_win, c_name); + c_ierr = PMPI_Win_set_name(c_win, c_name); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); /* Free the C name */ diff --git a/ompi/mpi/fortran/mpif-h/win_shared_query_f.c b/ompi/mpi/fortran/mpif-h/win_shared_query_f.c index 5366cc8f7b..99dac2de47 100644 --- a/ompi/mpi/fortran/mpif-h/win_shared_query_f.c +++ b/ompi/mpi/fortran/mpif-h/win_shared_query_f.c @@ -107,9 +107,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SHARED_QUERY_CPTR, #define ompi_win_shared_query_cptr_f pompi_win_shared_query_cptr_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_shared_query PMPI_Win_shared_query -#endif void ompi_win_shared_query_f(MPI_Fint *win, MPI_Fint *rank, MPI_Aint *size, MPI_Fint *disp_unit, char *baseptr, @@ -118,9 +115,9 @@ void ompi_win_shared_query_f(MPI_Fint *win, MPI_Fint *rank, MPI_Aint *size, int c_ierr; MPI_Win c_win; - c_win = MPI_Win_f2c(*win); + c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_shared_query(c_win, OMPI_FINT_2_INT(*rank), size, + c_ierr = PMPI_Win_shared_query(c_win, OMPI_FINT_2_INT(*rank), size, OMPI_FINT_2_INT(disp_unit), baseptr); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_start_f.c b/ompi/mpi/fortran/mpif-h/win_start_f.c index c432e9d1c8..14b76ab257 100644 --- a/ompi/mpi/fortran/mpif-h/win_start_f.c +++ b/ompi/mpi/fortran/mpif-h/win_start_f.c @@ -66,18 +66,15 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_START, #define ompi_win_start_f pompi_win_start_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_start PMPI_Win_start -#endif void ompi_win_start_f(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Group c_grp = MPI_Group_f2c(*group); - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Group c_grp = PMPI_Group_f2c(*group); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_start(c_grp, + c_ierr = PMPI_Win_start(c_grp, OMPI_FINT_2_INT(*assert), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); diff --git a/ompi/mpi/fortran/mpif-h/win_sync_f.c b/ompi/mpi/fortran/mpif-h/win_sync_f.c index b2e520e015..829246572b 100644 --- a/ompi/mpi/fortran/mpif-h/win_sync_f.c +++ b/ompi/mpi/fortran/mpif-h/win_sync_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SYNC, #define ompi_win_sync_f pompi_win_sync_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_sync PMPI_Win_sync -#endif void ompi_win_sync_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_sync(c_win); + c_ierr = PMPI_Win_sync(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_test_f.c b/ompi/mpi/fortran/mpif-h/win_test_f.c index 1b141db239..bfebd96dfc 100644 --- a/ompi/mpi/fortran/mpif-h/win_test_f.c +++ b/ompi/mpi/fortran/mpif-h/win_test_f.c @@ -66,17 +66,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_TEST, #define ompi_win_test_f pompi_win_test_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_test PMPI_Win_test -#endif void ompi_win_test_f(MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); OMPI_LOGICAL_NAME_DECL(flag); - c_ierr = MPI_Win_test(c_win, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); + c_ierr = PMPI_Win_test(c_win, OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag)); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); if (MPI_SUCCESS == c_ierr) { diff --git a/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c b/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c index e3fc798ef6..f0fd41fc8f 100644 --- a/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c +++ b/ompi/mpi/fortran/mpif-h/win_unlock_all_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_UNLOCK_ALL, #define ompi_win_unlock_all_f pompi_win_unlock_all_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_unlock_all PMPI_Win_unlock_all -#endif void ompi_win_unlock_all_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_unlock_all(c_win); + c_ierr = PMPI_Win_unlock_all(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_unlock_f.c b/ompi/mpi/fortran/mpif-h/win_unlock_f.c index c442301013..304880e803 100644 --- a/ompi/mpi/fortran/mpif-h/win_unlock_f.c +++ b/ompi/mpi/fortran/mpif-h/win_unlock_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_UNLOCK, #define ompi_win_unlock_f pompi_win_unlock_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_unlock PMPI_Win_unlock -#endif void ompi_win_unlock_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_unlock(OMPI_FINT_2_INT(*rank), c_win); + c_ierr = PMPI_Win_unlock(OMPI_FINT_2_INT(*rank), c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/win_wait_f.c b/ompi/mpi/fortran/mpif-h/win_wait_f.c index 78e4b79aa4..f1be6a8ee8 100644 --- a/ompi/mpi/fortran/mpif-h/win_wait_f.c +++ b/ompi/mpi/fortran/mpif-h/win_wait_f.c @@ -66,15 +66,12 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_WAIT, #define ompi_win_wait_f pompi_win_wait_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Win_wait PMPI_Win_wait -#endif void ompi_win_wait_f(MPI_Fint *win, MPI_Fint *ierr) { int c_ierr; - MPI_Win c_win = MPI_Win_f2c(*win); + MPI_Win c_win = PMPI_Win_f2c(*win); - c_ierr = MPI_Win_wait(c_win); + c_ierr = PMPI_Win_wait(c_win); if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/fortran/mpif-h/wtick_f.c b/ompi/mpi/fortran/mpif-h/wtick_f.c index a90e4af44a..9d8053f489 100644 --- a/ompi/mpi/fortran/mpif-h/wtick_f.c +++ b/ompi/mpi/fortran/mpif-h/wtick_f.c @@ -68,11 +68,8 @@ double mpi_wtick__(void) { return ompi_wtick_f(); } #define ompi_wtick_f pompi_wtick_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Wtick PMPI_Wtick -#endif double ompi_wtick_f(void) { - return MPI_Wtick(); + return PMPI_Wtick(); } diff --git a/ompi/mpi/fortran/mpif-h/wtime_f.c b/ompi/mpi/fortran/mpif-h/wtime_f.c index a9095f6623..2722951fde 100644 --- a/ompi/mpi/fortran/mpif-h/wtime_f.c +++ b/ompi/mpi/fortran/mpif-h/wtime_f.c @@ -68,11 +68,8 @@ double mpi_wtime__(void) { return ompi_wtime_f(); } #define ompi_wtime_f pompi_wtime_f #endif -#if OMPI_ENABLE_MPI_PROFILING -#define MPI_Wtime PMPI_Wtime -#endif double ompi_wtime_f(void) { - return MPI_Wtime(); + return PMPI_Wtime(); } diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c b/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c index 3ae627cc41..3d24b3f965 100644 --- a/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c +++ b/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -58,7 +60,7 @@ void ompi_buffer_detach_f08(char *buffer, MPI_Fint *size, MPI_Fint *ierr) void *dummy; OMPI_SINGLE_NAME_DECL(size); - c_ierr = MPI_Buffer_detach(&dummy, OMPI_SINGLE_NAME_CONVERT(size)); + c_ierr = PMPI_Buffer_detach(&dummy, OMPI_SINGLE_NAME_CONVERT(size)); if (NULL != ierr) { *ierr = OMPI_INT_2_FINT(c_ierr); } diff --git a/ompi/mpi/tool/profile/Makefile.am b/ompi/mpi/tool/profile/Makefile.am index 2ef266edf5..d530d1c450 100644 --- a/ompi/mpi/tool/profile/Makefile.am +++ b/ompi/mpi/tool/profile/Makefile.am @@ -12,8 +12,10 @@ # All rights reserved. # Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. +# Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # reserved. # $COPYRIGHT$ # @@ -38,10 +40,7 @@ AM_CPPFLAGS = -DOMPI_PROFILING_DEFINES=1 # Further, this build HAS to go through if profiling is required. # -noinst_LTLIBRARIES = -if BUILD_PMPI_BINDINGS_LAYER -noinst_LTLIBRARIES += libmpi_pmpit.la -endif +noinst_LTLIBRARIES = libmpi_pmpit.la headers = defines.h diff --git a/ompi/mpiext/example/c/mpiext_example_progress.c b/ompi/mpiext/example/c/mpiext_example_progress.c index 28ba227daa..23680472db 100644 --- a/ompi/mpiext/example/c/mpiext_example_progress.c +++ b/ompi/mpiext/example/c/mpiext_example_progress.c @@ -4,6 +4,8 @@ * Corporation. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,11 +46,7 @@ int OMPI_Progress(int count, MPI_Comm comm) /* Just as an example, get the name of the communicator and print it out. Use the PMPI name when possible so that these invocations don't show up in profiling tools. */ -#if OMPI_ENABLE_MPI_PROFILING PMPI_Comm_get_name(comm, name, &len); -#else - MPI_Comm_get_name(comm, name, &len); -#endif printf("Count = %d, comm = %s\n", count, name); diff --git a/ompi/tools/ompi_info/param.c b/ompi/tools/ompi_info/param.c index 7fff70002a..0d14b9820e 100644 --- a/ompi/tools/ompi_info/param.c +++ b/ompi/tools/ompi_info/param.c @@ -253,12 +253,12 @@ void ompi_info_do_config(bool want_all) memdebug = OPAL_ENABLE_MEM_DEBUG ? "yes" : "no"; debug = OPAL_ENABLE_DEBUG ? "yes" : "no"; mpi_interface_warning = OMPI_WANT_MPI_INTERFACE_WARNING ? "yes" : "no"; - cprofiling = OMPI_ENABLE_MPI_PROFILING ? "yes" : "no"; - cxxprofiling = (OMPI_BUILD_CXX_BINDINGS && OMPI_ENABLE_MPI_PROFILING) ? "yes" : "no"; + cprofiling = "yes"; + cxxprofiling = OMPI_BUILD_CXX_BINDINGS ? "yes" : "no"; cxxexceptions = (OMPI_BUILD_CXX_BINDINGS && OMPI_HAVE_CXX_EXCEPTION_SUPPORT) ? "yes" : "no"; - fortran_mpifh_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no"; - fortran_usempi_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no"; - fortran_usempif08_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no"; + fortran_mpifh_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no"; + fortran_usempi_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no"; + fortran_usempif08_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no"; have_dl = OPAL_HAVE_DL_SUPPORT ? "yes" : "no"; #if OMPI_RTE_ORTE mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no"; diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c index b2c55f017d..4c4374cd61 100644 --- a/opal/tools/wrappers/opal_wrapper.c +++ b/opal/tools/wrappers/opal_wrapper.c @@ -13,6 +13,8 @@ * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -744,15 +746,6 @@ main(int argc, char *argv[]) flags &= ~(COMP_WANT_PREPROC|COMP_WANT_COMPILE|COMP_WANT_LINK); } -#if !OMPI_ENABLE_MPI_PROFILING - /* sanity check */ - if (flags & COMP_WANT_PMPI) { - opal_show_help("help-opal-wrapper.txt", "no-profiling-support", true, - argv[0], NULL); - } -#endif - - /**************************************************** * * Assemble the command line diff --git a/oshmem/mca/memheap/base/memheap_base_mkey.c b/oshmem/mca/memheap/base/memheap_base_mkey.c index 9a1b883b6f..95b770e6d4 100644 --- a/oshmem/mca/memheap/base/memheap_base_mkey.c +++ b/oshmem/mca/memheap/base/memheap_base_mkey.c @@ -28,7 +28,6 @@ #include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/spml/spml.h" - /* Turn ON/OFF debug output from build (default 0) */ #ifndef MEMHEAP_BASE_DEBUG #define MEMHEAP_BASE_DEBUG 0 @@ -352,7 +351,7 @@ static int oshmem_mkey_recv_cb(void) if (OPAL_LIKELY(0 == flag)) { return n; } - MPI_Get_count(&status, MPI_BYTE, &size); + PMPI_Get_count(&status, MPI_BYTE, &size); MEMHEAP_VERBOSE(5, "OOB request from PE: %d, size %d", status.MPI_SOURCE, size); n++; opal_list_remove_first(&memheap_oob.req_list); @@ -387,7 +386,7 @@ static int oshmem_mkey_recv_cb(void) OBJ_RELEASE(msg); } - rc = MPI_Start(&r->recv_req); + rc = PMPI_Start(&r->recv_req); if (MPI_SUCCESS != rc) { MEMHEAP_ERROR("Failed to post recv request %d", rc); ORTE_ERROR_LOG(rc); @@ -418,7 +417,7 @@ int memheap_oob_init(mca_memheap_map_t *map) for (i = 0; i < MEMHEAP_RECV_REQS_MAX; i++) { r = &memheap_oob.req_pool[i]; - rc = MPI_Recv_init(r->buf, sizeof(r->buf), MPI_BYTE, + rc = PMPI_Recv_init(r->buf, sizeof(r->buf), MPI_BYTE, MPI_ANY_SOURCE, 0, oshmem_comm_world, &r->recv_req); @@ -427,7 +426,7 @@ int memheap_oob_init(mca_memheap_map_t *map) return rc; } - rc = MPI_Start(&r->recv_req); + rc = PMPI_Start(&r->recv_req); if (MPI_SUCCESS != rc) { MEMHEAP_ERROR("Failed to post recv request %d", rc); return rc; @@ -449,8 +448,8 @@ void memheap_oob_destruct(void) for (i = 0; i < MEMHEAP_RECV_REQS_MAX; i++) { r = &memheap_oob.req_pool[i]; - MPI_Cancel(&r->recv_req); - MPI_Request_free(&r->recv_req); + PMPI_Cancel(&r->recv_req); + PMPI_Request_free(&r->recv_req); } OBJ_DESTRUCT(&memheap_oob.req_list); @@ -465,7 +464,7 @@ static int send_buffer(int pe, opal_buffer_t *msg) int rc; opal_dss.unload(msg, &buffer, &size); - rc = MPI_Send(buffer, size, MPI_BYTE, pe, 0, oshmem_comm_world); + rc = PMPI_Send(buffer, size, MPI_BYTE, pe, 0, oshmem_comm_world); free(buffer); OBJ_RELEASE(msg); diff --git a/oshmem/runtime/oshmem_shmem_exchange.c b/oshmem/runtime/oshmem_shmem_exchange.c index c44d7676a2..ecf24ed53b 100644 --- a/oshmem/runtime/oshmem_shmem_exchange.c +++ b/oshmem/runtime/oshmem_shmem_exchange.c @@ -18,7 +18,7 @@ int oshmem_shmem_allgather(void *send_buf, void *rcv_buf, int elem_size) { int rc; - rc = MPI_Allgather(send_buf, elem_size, MPI_BYTE, + rc = PMPI_Allgather(send_buf, elem_size, MPI_BYTE, rcv_buf, elem_size, MPI_BYTE, oshmem_comm_world); return rc; @@ -29,7 +29,7 @@ int oshmem_shmem_allgatherv(void *send_buf, void* rcv_buf, int send_count, { int rc; - rc = MPI_Allgatherv(send_buf, send_count, MPI_BYTE, + rc = PMPI_Allgatherv(send_buf, send_count, MPI_BYTE, rcv_buf, rcv_size, displs, MPI_BYTE, oshmem_comm_world); return rc; @@ -37,5 +37,5 @@ int oshmem_shmem_allgatherv(void *send_buf, void* rcv_buf, int send_count, void oshmem_shmem_barrier(void) { - MPI_Barrier(oshmem_comm_world); + PMPI_Barrier(oshmem_comm_world); } diff --git a/oshmem/runtime/oshmem_shmem_finalize.c b/oshmem/runtime/oshmem_shmem_finalize.c index 55e0129e46..eb7d8c3ca9 100644 --- a/oshmem/runtime/oshmem_shmem_finalize.c +++ b/oshmem/runtime/oshmem_shmem_finalize.c @@ -71,7 +71,7 @@ int oshmem_shmem_finalize(void) if ((OSHMEM_SUCCESS == ret) && ompi_mpi_initialized && !ompi_mpi_finalized) { - MPI_Comm_free(&oshmem_comm_world); + PMPI_Comm_free(&oshmem_comm_world); ret = ompi_mpi_finalize(); } diff --git a/oshmem/runtime/oshmem_shmem_init.c b/oshmem/runtime/oshmem_shmem_init.c index 92ae2eddeb..0c8cbf4e8f 100644 --- a/oshmem/runtime/oshmem_shmem_init.c +++ b/oshmem/runtime/oshmem_shmem_init.c @@ -150,7 +150,7 @@ int oshmem_shmem_init(int argc, char **argv, int requested, int *provided) if (!ompi_mpi_initialized && !ompi_mpi_finalized) { ret = ompi_mpi_init(argc, argv, requested, provided); } - MPI_Comm_dup(MPI_COMM_WORLD, &oshmem_comm_world); + PMPI_Comm_dup(MPI_COMM_WORLD, &oshmem_comm_world); if (OSHMEM_SUCCESS == ret) { ret = _shmem_init(argc, argv, requested, provided); diff --git a/oshmem/tools/oshmem_info/param.c b/oshmem/tools/oshmem_info/param.c index 477c578d75..e384e64b9c 100644 --- a/oshmem/tools/oshmem_info/param.c +++ b/oshmem/tools/oshmem_info/param.c @@ -3,7 +3,7 @@ * All rights reserved. * * Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. * All rights reserved. @@ -227,12 +227,12 @@ void oshmem_info_do_config(bool want_all) memdebug = OPAL_ENABLE_MEM_DEBUG ? "yes" : "no"; debug = OPAL_ENABLE_DEBUG ? "yes" : "no"; mpi_interface_warning = OMPI_WANT_MPI_INTERFACE_WARNING ? "yes" : "no"; - cprofiling = OMPI_ENABLE_MPI_PROFILING ? "yes" : "no"; - cxxprofiling = (OMPI_BUILD_CXX_BINDINGS && OMPI_ENABLE_MPI_PROFILING) ? "yes" : "no"; + cprofiling = "yes"; + cxxprofiling = OMPI_BUILD_CXX_BINDINGS ? "yes" : "no"; cxxexceptions = (OMPI_BUILD_CXX_BINDINGS && OMPI_HAVE_CXX_EXCEPTION_SUPPORT) ? "yes" : "no"; - fortran_mpifh_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no"; - fortran_usempi_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no"; - fortran_usempif08_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no"; + fortran_mpifh_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no"; + fortran_usempi_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no"; + fortran_usempif08_profiling = (OMPI_BUILD_FORTRAN_BINDINGS >= OMPI_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no"; have_dl = OPAL_HAVE_DL_SUPPORT ? "yes" : "no"; #if OMPI_RTE_ORTE mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no"; From 9fe4aceeac9f6746d2527679a78bd80d2883f50c Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 20 Nov 2015 13:29:02 +0900 Subject: [PATCH 06/12] coll/libnbc: use PMPI_* and internal ompi_* insted of MPI_* (cherry picked from commit open-mpi/ompi@d816d1c194584b56673a5ef45bed266c4374e6bc) --- ompi/mca/coll/libnbc/nbc_iallgather.c | 6 +-- ompi/mca/coll/libnbc/nbc_iallgatherv.c | 8 ++-- ompi/mca/coll/libnbc/nbc_iallreduce.c | 15 +++---- ompi/mca/coll/libnbc/nbc_ialltoall.c | 39 ++++++++++--------- ompi/mca/coll/libnbc/nbc_ialltoallv.c | 16 ++++---- ompi/mca/coll/libnbc/nbc_ibcast.c | 11 +++--- ompi/mca/coll/libnbc/nbc_ibcast_inter.c | 7 ++-- ompi/mca/coll/libnbc/nbc_iexscan.c | 4 +- ompi/mca/coll/libnbc/nbc_igather.c | 8 ++-- ompi/mca/coll/libnbc/nbc_igatherv.c | 8 ++-- .../mca/coll/libnbc/nbc_ineighbor_allgather.c | 4 +- .../coll/libnbc/nbc_ineighbor_allgatherv.c | 4 +- ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c | 8 ++-- .../mca/coll/libnbc/nbc_ineighbor_alltoallv.c | 8 ++-- ompi/mca/coll/libnbc/nbc_internal.h | 20 +++++----- ompi/mca/coll/libnbc/nbc_ireduce.c | 15 +++---- ompi/mca/coll/libnbc/nbc_ireduce_scatter.c | 8 ++-- .../coll/libnbc/nbc_ireduce_scatter_block.c | 8 ++-- ompi/mca/coll/libnbc/nbc_iscan.c | 4 +- ompi/mca/coll/libnbc/nbc_iscatter.c | 8 ++-- ompi/mca/coll/libnbc/nbc_iscatterv.c | 8 ++-- 21 files changed, 111 insertions(+), 106 deletions(-) diff --git a/ompi/mca/coll/libnbc/nbc_iallgather.c b/ompi/mca/coll/libnbc/nbc_iallgather.c index 401d98b37b..60180d1419 100644 --- a/ompi/mca/coll/libnbc/nbc_iallgather.c +++ b/ompi/mca/coll/libnbc/nbc_iallgather.c @@ -58,7 +58,7 @@ int ompi_coll_libnbc_iallgather(const void* sendbuf, int sendcount, MPI_Datatype rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { return res; } @@ -175,9 +175,9 @@ int ompi_coll_libnbc_iallgather_inter(const void* sendbuf, int sendcount, MPI_Da NBC_Handle *handle; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_iallgatherv.c b/ompi/mca/coll/libnbc/nbc_iallgatherv.c index 7b32c7555f..a8a77dc893 100644 --- a/ompi/mca/coll/libnbc/nbc_iallgatherv.c +++ b/ompi/mca/coll/libnbc/nbc_iallgatherv.c @@ -45,9 +45,9 @@ int ompi_coll_libnbc_iallgatherv(const void* sendbuf, int sendcount, MPI_Datatyp rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent (recvtype, &rcvext); + res = ompi_datatype_type_extent (recvtype, &rcvext); if (OPAL_UNLIKELY(MPI_SUCCESS != res)) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } @@ -124,9 +124,9 @@ int ompi_coll_libnbc_iallgatherv_inter(const void* sendbuf, int sendcount, MPI_D rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (OPAL_UNLIKELY(MPI_SUCCESS != res)) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_iallreduce.c b/ompi/mca/coll/libnbc/nbc_iallreduce.c index b56a4aa499..2e1b0dd00b 100644 --- a/ompi/mca/coll/libnbc/nbc_iallreduce.c +++ b/ompi/mca/coll/libnbc/nbc_iallreduce.c @@ -70,13 +70,13 @@ int ompi_coll_libnbc_iallreduce(const void* sendbuf, void* recvbuf, int count, M res = ompi_datatype_get_extent(datatype, &lb, &ext); if (OMPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } res = ompi_datatype_type_size (datatype, &size); if (OMPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } @@ -193,7 +193,8 @@ int ompi_coll_libnbc_iallreduce_inter(const void* sendbuf, void* recvbuf, int co struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int rank, res, size, rsize; + int rank, res, rsize; + size_t size; MPI_Aint ext; NBC_Schedule *schedule; NBC_Handle *handle; @@ -202,15 +203,15 @@ int ompi_coll_libnbc_iallreduce_inter(const void* sendbuf, void* recvbuf, int co rank = ompi_comm_rank (comm); rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent(datatype, &ext); + res = ompi_datatype_type_extent(datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_size(datatype, &size); + res = ompi_datatype_type_size(datatype, &size); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ialltoall.c b/ompi/mca/coll/libnbc/nbc_ialltoall.c index d19d3ad0e4..46202174ce 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoall.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoall.c @@ -51,7 +51,8 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int rank, p, res, a2asize, sndsize, datasize; + int rank, p, res, a2asize, datasize; + size_t sndsize; NBC_Schedule *schedule; MPI_Aint rcvext, sndext; #ifdef NBC_CACHE_SCHEDULE @@ -67,21 +68,21 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent(sendtype, &sndext); + res = ompi_datatype_type_extent(sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_size(sendtype, &sndsize); + res = ompi_datatype_type_size(sendtype, &sndsize); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } @@ -120,9 +121,9 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype if(NBC_Type_intrinsic(sendtype)) { datasize = sndext * sendcount; } else { - res = MPI_Pack_size (sendcount, sendtype, comm, &datasize); + res = PMPI_Pack_size (sendcount, sendtype, comm, &datasize); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Pack_size() (%i)", res); + NBC_Error("MPI Error in PMPI_Pack_size() (%i)", res); NBC_Return_handle (handle); return res; } @@ -156,20 +157,20 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype int pos=0; /* non-contiguous - pack */ - res = MPI_Pack ((char *) sendbuf + rank * sendcount * sndext, (p - rank) * sendcount, sendtype, handle->tmpbuf, + res = PMPI_Pack ((char *) sendbuf + rank * sendcount * sndext, (p - rank) * sendcount, sendtype, handle->tmpbuf, (p - rank) * datasize, &pos, comm); if (OPAL_UNLIKELY(MPI_SUCCESS != res)) { - NBC_Error("MPI Error in MPI_Pack() (%i)", res); + NBC_Error("MPI Error in PMPI_Pack() (%i)", res); NBC_Return_handle (handle); return res; } if (rank != 0) { pos = 0; - res = MPI_Pack(sendbuf, rank * sendcount, sendtype, (char *) handle->tmpbuf + datasize * (p - rank), + res = PMPI_Pack(sendbuf, rank * sendcount, sendtype, (char *) handle->tmpbuf + datasize * (p - rank), rank * datasize, &pos, comm); if (OPAL_UNLIKELY(MPI_SUCCESS != res)) { - NBC_Error("MPI Error in MPI_Pack() (%i)", res); + NBC_Error("MPI Error in PMPI_Pack() (%i)", res); NBC_Return_handle (handle); return res; } @@ -277,15 +278,15 @@ int ompi_coll_libnbc_ialltoall_inter (const void* sendbuf, int sendcount, MPI_Da rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent (sendtype, &sndext); + res = ompi_datatype_type_extent (sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent (recvtype, &rcvext); + res = ompi_datatype_type_extent (recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } @@ -415,9 +416,9 @@ static inline int a2a_sched_diss(int rank, int p, MPI_Aint sndext, MPI_Aint rcve if(NBC_Type_intrinsic(sendtype)) { datasize = sndext*sendcount; } else { - res = MPI_Pack_size(sendcount, sendtype, comm, &datasize); + res = PMPI_Pack_size(sendcount, sendtype, comm, &datasize); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Pack_size() (%i)", res); + NBC_Error("MPI Error in PMPI_Pack_size() (%i)", res); return res; } } diff --git a/ompi/mca/coll/libnbc/nbc_ialltoallv.c b/ompi/mca/coll/libnbc/nbc_ialltoallv.c index 8961d86045..946b627ca7 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoallv.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoallv.c @@ -37,15 +37,15 @@ int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, cons rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent (sendtype, &sndext); + res = ompi_datatype_type_extent (sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent (recvtype, &rcvext); + res = ompi_datatype_type_extent (recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } @@ -128,15 +128,15 @@ int ompi_coll_libnbc_ialltoallv_inter (const void* sendbuf, const int *sendcount ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; - res = MPI_Type_extent(sendtype, &sndext); + res = ompi_datatype_type_extent(sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ibcast.c b/ompi/mca/coll/libnbc/nbc_ibcast.c index d82b3461b0..83dd4ebad7 100644 --- a/ompi/mca/coll/libnbc/nbc_ibcast.c +++ b/ompi/mca/coll/libnbc/nbc_ibcast.c @@ -44,7 +44,8 @@ int ompi_coll_libnbc_ibcast(void *buffer, int count, MPI_Datatype datatype, int struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int rank, p, res, size, segsize; + int rank, p, res, segsize; + size_t size; NBC_Schedule *schedule; #ifdef NBC_CACHE_SCHEDULE NBC_Bcast_args *args, *found, search; @@ -56,9 +57,9 @@ int ompi_coll_libnbc_ibcast(void *buffer, int count, MPI_Datatype datatype, int rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_size(datatype, &size); + res = ompi_datatype_type_size(datatype, &size); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } @@ -259,9 +260,9 @@ static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *sch RANK2VRANK(rank, vrank, root); VRANK2RANK(rpeer, vrank-1, root); VRANK2RANK(speer, vrank+1, root); - res = MPI_Type_extent(datatype, &ext); + res = ompi_datatype_type_extent(datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ibcast_inter.c b/ompi/mca/coll/libnbc/nbc_ibcast_inter.c index 59ed17a3e4..f9aa0d9a1b 100644 --- a/ompi/mca/coll/libnbc/nbc_ibcast_inter.c +++ b/ompi/mca/coll/libnbc/nbc_ibcast_inter.c @@ -18,14 +18,15 @@ int ompi_coll_libnbc_ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int res, size; + int res; + size_t size; NBC_Schedule *schedule; NBC_Handle *handle; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; - res = MPI_Type_size(datatype, &size); + res = ompi_datatype_type_size(datatype, &size); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_iexscan.c b/ompi/mca/coll/libnbc/nbc_iexscan.c index 32a7d835da..736f16c50b 100644 --- a/ompi/mca/coll/libnbc/nbc_iexscan.c +++ b/ompi/mca/coll/libnbc/nbc_iexscan.c @@ -59,9 +59,9 @@ int ompi_coll_libnbc_iexscan(const void* sendbuf, void* recvbuf, int count, MPI_ rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent(datatype, &ext); + res = ompi_datatype_type_extent(datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_igather.c b/ompi/mca/coll/libnbc/nbc_igather.c index 057b3087a6..76d972edf1 100644 --- a/ompi/mca/coll/libnbc/nbc_igather.c +++ b/ompi/mca/coll/libnbc/nbc_igather.c @@ -56,9 +56,9 @@ int ompi_coll_libnbc_igather(const void* sendbuf, int sendcount, MPI_Datatype se p = ompi_comm_size (comm); if (rank == root) { - res = MPI_Type_extent (recvtype, &rcvext); + res = ompi_datatype_type_extent (recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } @@ -187,9 +187,9 @@ int ompi_coll_libnbc_igather_inter (const void* sendbuf, int sendcount, MPI_Data rsize = ompi_comm_remote_size (comm); if (root == MPI_ROOT) { - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } diff --git a/ompi/mca/coll/libnbc/nbc_igatherv.c b/ompi/mca/coll/libnbc/nbc_igatherv.c index 4cec890365..9cd250edf5 100644 --- a/ompi/mca/coll/libnbc/nbc_igatherv.c +++ b/ompi/mca/coll/libnbc/nbc_igatherv.c @@ -40,9 +40,9 @@ int ompi_coll_libnbc_igatherv(const void* sendbuf, int sendcount, MPI_Datatype s p = ompi_comm_size (comm); if (rank == root) { - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } @@ -121,9 +121,9 @@ int ompi_coll_libnbc_igatherv_inter (const void* sendbuf, int sendcount, MPI_Dat rsize = ompi_comm_size (comm); if (MPI_ROOT == root) { - res = MPI_Type_extent(recvtype, &rcvext); + res = ompi_datatype_type_extent(recvtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c b/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c index 9eec9991e9..e9ae7b388a 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c @@ -48,9 +48,9 @@ int ompi_coll_libnbc_ineighbor_allgather(const void *sbuf, int scount, MPI_Datat ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; NBC_Schedule *schedule; - res = MPI_Type_extent (rtype, &rcvext); + res = ompi_datatype_type_extent (rtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c b/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c index ba9d5e8999..50d85ee406 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c @@ -49,9 +49,9 @@ int ompi_coll_libnbc_ineighbor_allgatherv(const void *sbuf, int scount, MPI_Data ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; NBC_Schedule *schedule; - res = MPI_Type_extent(rtype, &rcvext); + res = ompi_datatype_type_extent(rtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c index 20b50f4fe4..3d8b34a191 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c @@ -45,15 +45,15 @@ int ompi_coll_libnbc_ineighbor_alltoall(const void *sbuf, int scount, MPI_Dataty ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; NBC_Schedule *schedule; - res = MPI_Type_extent(stype, &sndext); + res = ompi_datatype_type_extent(stype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent(rtype, &rcvext); + res = ompi_datatype_type_extent(rtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c index 3db725db70..52983b1632 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c @@ -49,15 +49,15 @@ int ompi_coll_libnbc_ineighbor_alltoallv(const void *sbuf, const int *scounts, c ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; NBC_Schedule *schedule; - res = MPI_Type_extent (stype, &sndext); + res = ompi_datatype_type_extent (stype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_extent (rtype, &rcvext); + res = ompi_datatype_type_extent (rtype, &rcvext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h index ba7f2436af..fbf68339bb 100644 --- a/ompi/mca/coll/libnbc/nbc_internal.h +++ b/ompi/mca/coll/libnbc/nbc_internal.h @@ -500,9 +500,9 @@ static inline int NBC_Copy(const void *src, int srccount, MPI_Datatype srctype, memcpy(tgt, src, srccount*ext); } else { /* we have to pack and unpack */ - res = MPI_Pack_size(srccount, srctype, comm, &size); + res = PMPI_Pack_size(srccount, srctype, comm, &size); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Pack_size() (%i:%i)", res, size); + NBC_Error ("MPI Error in PMPI_Pack_size() (%i:%i)", res, size); return res; } @@ -516,19 +516,19 @@ static inline int NBC_Copy(const void *src, int srccount, MPI_Datatype srctype, } pos=0; - res = MPI_Pack(src, srccount, srctype, packbuf, size, &pos, comm); + res = PMPI_Pack(src, srccount, srctype, packbuf, size, &pos, comm); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Pack() (%i)", res); + NBC_Error ("MPI Error in PMPI_Pack() (%i)", res); free (packbuf); return res; } pos=0; - res = MPI_Unpack(packbuf, size, &pos, tgt, tgtcount, tgttype, comm); + res = PMPI_Unpack(packbuf, size, &pos, tgt, tgtcount, tgttype, comm); free(packbuf); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Unpack() (%i)", res); + NBC_Error ("MPI Error in PMPI_Unpack() (%i)", res); return res; } } @@ -557,15 +557,15 @@ static inline int NBC_Unpack(void *src, int srccount, MPI_Datatype srctype, void } else { /* we have to unpack */ - res = MPI_Pack_size(srccount, srctype, comm, &size); + res = PMPI_Pack_size(srccount, srctype, comm, &size); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Pack_size() (%i)", res); + NBC_Error ("MPI Error in PMPI_Pack_size() (%i)", res); return res; } pos = 0; - res = MPI_Unpack(src, size, &pos, tgt, srccount, srctype, comm); + res = PMPI_Unpack(src, size, &pos, tgt, srccount, srctype, comm); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Unpack() (%i)", res); + NBC_Error ("MPI Error in PMPI_Unpack() (%i)", res); return res; } } diff --git a/ompi/mca/coll/libnbc/nbc_ireduce.c b/ompi/mca/coll/libnbc/nbc_ireduce.c index e1ed4776ce..fbd15d942d 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce.c @@ -47,7 +47,8 @@ int NBC_Reduce_args_compare(NBC_Reduce_args *a, NBC_Reduce_args *b, void *param) int ompi_coll_libnbc_ireduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int rank, p, res, segsize, size; + int rank, p, res, segsize; + size_t size; MPI_Aint ext; NBC_Schedule *schedule; char *redbuf=NULL, inplace; @@ -60,15 +61,15 @@ int ompi_coll_libnbc_ireduce(const void* sendbuf, void* recvbuf, int count, MPI_ rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent(datatype, &ext); + res = ompi_datatype_type_extent(datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } - res = MPI_Type_size(datatype, &size); + res = ompi_datatype_type_size(datatype, &size); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_size() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); return res; } @@ -207,9 +208,9 @@ int ompi_coll_libnbc_ireduce_inter(const void* sendbuf, void* recvbuf, int count rank = ompi_comm_rank (comm); rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent (datatype, &ext); + res = ompi_datatype_type_extent (datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c index e890cea790..cd1dad14e7 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c @@ -50,9 +50,9 @@ int ompi_coll_libnbc_ireduce_scatter(const void* sendbuf, void* recvbuf, const i rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent (datatype, &ext); + res = ompi_datatype_type_extent (datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } @@ -208,9 +208,9 @@ int ompi_coll_libnbc_ireduce_scatter_inter (const void* sendbuf, void* recvbuf, rank = ompi_comm_rank (comm); rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent (datatype, &ext); + res = ompi_datatype_type_extent (datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c index dd2b35730b..c11a7ad418 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c @@ -48,9 +48,9 @@ int ompi_coll_libnbc_ireduce_scatter_block(const void* sendbuf, void* recvbuf, i rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent(datatype, &ext); + res = ompi_datatype_type_extent(datatype, &ext); if (MPI_SUCCESS != res || 0 == ext) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i:%i)", res, (int) ext); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i:%i)", res, (int) ext); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res; } @@ -208,9 +208,9 @@ int ompi_coll_libnbc_ireduce_scatter_block_inter(const void *sbuf, void *rbuf, i rank = ompi_comm_rank (comm); rsize = ompi_comm_remote_size (comm); - res = MPI_Type_extent (dtype, &ext); + res = ompi_datatype_type_extent (dtype, &ext); if (MPI_SUCCESS != res) { - NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error ("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_iscan.c b/ompi/mca/coll/libnbc/nbc_iscan.c index 0d0b8c01bf..a239d14ed1 100644 --- a/ompi/mca/coll/libnbc/nbc_iscan.c +++ b/ompi/mca/coll/libnbc/nbc_iscan.c @@ -56,9 +56,9 @@ int ompi_coll_libnbc_iscan(const void* sendbuf, void* recvbuf, int count, MPI_Da rank = ompi_comm_rank (comm); p = ompi_comm_size (comm); - res = MPI_Type_extent (datatype, &ext); + res = ompi_datatype_type_extent (datatype, &ext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } diff --git a/ompi/mca/coll/libnbc/nbc_iscatter.c b/ompi/mca/coll/libnbc/nbc_iscatter.c index f30e572de0..ab7a9a2af0 100644 --- a/ompi/mca/coll/libnbc/nbc_iscatter.c +++ b/ompi/mca/coll/libnbc/nbc_iscatter.c @@ -57,9 +57,9 @@ int ompi_coll_libnbc_iscatter(const void* sendbuf, int sendcount, MPI_Datatype s p = ompi_comm_size (comm); if (rank == root) { - res = MPI_Type_extent (sendtype, &sndext); + res = ompi_datatype_type_extent (sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } @@ -183,9 +183,9 @@ int ompi_coll_libnbc_iscatter_inter(const void* sendbuf, int sendcount, MPI_Data rsize = ompi_comm_remote_size (comm); if (MPI_ROOT == root) { - res = MPI_Type_extent(sendtype, &sndext); + res = ompi_datatype_type_extent(sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); return res; } } diff --git a/ompi/mca/coll/libnbc/nbc_iscatterv.c b/ompi/mca/coll/libnbc/nbc_iscatterv.c index 8b475cffc4..3460afdfa5 100644 --- a/ompi/mca/coll/libnbc/nbc_iscatterv.c +++ b/ompi/mca/coll/libnbc/nbc_iscatterv.c @@ -46,9 +46,9 @@ int ompi_coll_libnbc_iscatterv(const void* sendbuf, const int *sendcounts, const /* receive from root */ if (rank == root) { - res = MPI_Type_extent (sendtype, &sndext); + res = ompi_datatype_type_extent (sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); OBJ_RELEASE(schedule); return res; } @@ -131,9 +131,9 @@ int ompi_coll_libnbc_iscatterv_inter (const void* sendbuf, const int *sendcounts return res; } } else if (MPI_ROOT == root) { - res = MPI_Type_extent(sendtype, &sndext); + res = ompi_datatype_type_extent(sendtype, &sndext); if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in MPI_Type_extent() (%i)", res); + NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res); OBJ_RELEASE(schedule); return res; } From d27326603346f1207e504fd1db099ac7c44f67aa Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 20 Nov 2015 13:30:35 +0900 Subject: [PATCH 07/12] osc: use PMPI_* insted of MPI_* (cherry picked from commit open-mpi/ompi@025fd8a9fc1f420c9982ab5d9153f39ef025ab70) --- ompi/mca/osc/base/osc_base_obj_convert.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/osc/base/osc_base_obj_convert.h b/ompi/mca/osc/base/osc_base_obj_convert.h index 4163670a08..c6514bbbe0 100644 --- a/ompi/mca/osc/base/osc_base_obj_convert.h +++ b/ompi/mca/osc/base/osc_base_obj_convert.h @@ -76,7 +76,7 @@ static inline ompi_op_t * ompi_osc_base_op_create(int op_id) { - ompi_op_t *op = MPI_Op_f2c(op_id); + ompi_op_t *op = PMPI_Op_f2c(op_id); OBJ_RETAIN(op); return op; } From 2a26cda893ed9f89c1ecab13f1f30b87e35e1073 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 20 Nov 2015 13:31:18 +0900 Subject: [PATCH 08/12] vprotocol/pessimist: use internal ompi_* insted of MPI_* (cherry picked from commit open-mpi/ompi@561e7f6647c05cfe55da73d89933d01df6575041) --- ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c index 2892c4da11..ce3c6b172b 100644 --- a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c +++ b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c @@ -47,7 +47,7 @@ int vprotocol_pessimist_event_logger_connect(int el_rank, ompi_communicator_t ** } /* Send Rank, receive max buffer size and max_clock back */ - MPI_Comm_rank(MPI_COMM_WORLD, &rank); + rank = ompi_comm_rank(&ompi_mpi_comm_world.comm); rc = mca_pml_v.host_pml.pml_send(&rank, 1, MPI_INTEGER, 0, VPROTOCOL_PESSIMIST_EVENTLOG_NEW_CLIENT_CMD, MCA_PML_BASE_SEND_STANDARD, From b481a52e0d2f61802407622c166869cc9a89f01e Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 20 Nov 2015 13:32:02 +0900 Subject: [PATCH 09/12] fcoll/two_phase: use PMPI_* insted of MPI_* (cherry picked from commit open-mpi/ompi@002c7b8b3a163247754854527e778e9ccbc44490) --- ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c | 4 ++-- ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c | 4 ++-- ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c index 0c29c98de7..0abf6963e0 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c @@ -677,8 +677,8 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh, } if (req_off < real_off + real_size) { count[i]++; - MPI_Address(read_buf+req_off-real_off, - &(others_req[i].mem_ptrs[j])); + PMPI_Address(read_buf+req_off-real_off, + &(others_req[i].mem_ptrs[j])); send_size[i] += (int)(OMPIO_MIN(real_off + real_size - req_off, (OMPI_MPI_OFFSET_TYPE)req_len)); diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c index ac42ec1ecf..f1cd3089ef 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c @@ -766,8 +766,8 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh, size,i, count[i]); #endif - MPI_Address(write_buf+req_off-off, - &(others_req[i].mem_ptrs[j])); + PMPI_Address(write_buf+req_off-off, + &(others_req[i].mem_ptrs[j])); #if DEBUG_ON printf("%d : mem_ptrs : %ld\n", fh->f_rank, others_req[i].mem_ptrs[j]); diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c index f83b11fc2c..9d6d94bc7a 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c @@ -173,7 +173,7 @@ int mca_fcoll_two_phase_calc_aggregator(mca_io_ompio_file_t *fh, fprintf(stderr, "rank_index(%d) >= num_aggregators(%d)fd_size=%lld off=%lld\n", rank_index,num_aggregators,fd_size,off); - MPI_Abort(MPI_COMM_WORLD, 1); + PMPI_Abort(MPI_COMM_WORLD, 1); } From d871301ef640765184f1aec38e81df3aab8dd692 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 7 Dec 2015 10:13:43 +0900 Subject: [PATCH 10/12] coll/libnbc: correctly handle changed types. this fixes open-mpi/ompi@d816d1c194584b56673a5ef45bed266c4374e6bc thanks Jeff for the review (cherry picked from commit open-mpi/ompi@37c978f5e9cd2c2127d4bf29e2686cd0cad7efb4) --- ompi/mca/coll/libnbc/nbc_ialltoall.c | 6 +++--- ompi/mca/coll/libnbc/nbc_ibcast.c | 16 ++++++++-------- ompi/mca/coll/libnbc/nbc_ibcast_inter.c | 9 +-------- ompi/mca/coll/libnbc/nbc_ireduce.c | 4 ++-- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/ompi/mca/coll/libnbc/nbc_ialltoall.c b/ompi/mca/coll/libnbc/nbc_ialltoall.c index 46202174ce..d318e6e09c 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoall.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoall.c @@ -51,8 +51,8 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { - int rank, p, res, a2asize, datasize; - size_t sndsize; + int rank, p, res, datasize; + size_t a2asize, sndsize; NBC_Schedule *schedule; MPI_Aint rcvext, sndext; #ifdef NBC_CACHE_SCHEDULE @@ -94,7 +94,7 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype * total communicated size is smaller than 1<<17 *and* if we don't * have eager messages (msgsize < 1<<13) */ alg = NBC_A2A_LINEAR; - } else if(a2asize < (1<<12)*p) { + } else if(a2asize < (1<<12)*(unsigned int)p) { /*alg = NBC_A2A_DISS;*/ alg = NBC_A2A_LINEAR; } else diff --git a/ompi/mca/coll/libnbc/nbc_ibcast.c b/ompi/mca/coll/libnbc/nbc_ibcast.c index 83dd4ebad7..5f0470a133 100644 --- a/ompi/mca/coll/libnbc/nbc_ibcast.c +++ b/ompi/mca/coll/libnbc/nbc_ibcast.c @@ -1,11 +1,11 @@ /* -*- Mode: C; c-basic-offset:2 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2006 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2006 The Technical University of Chemnitz. All - * rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2006 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2006 The Technical University of Chemnitz. All + * rights reserved. + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. @@ -20,7 +20,7 @@ static inline int bcast_sched_binomial(int rank, int p, int root, NBC_Schedule * static inline int bcast_sched_linear(int rank, int p, int root, NBC_Schedule *schedule, void *buffer, int count, MPI_Datatype datatype); static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *schedule, void *buffer, int count, - MPI_Datatype datatype, int fragsize, int size); + MPI_Datatype datatype, int fragsize, size_t size); #ifdef NBC_CACHE_SCHEDULE /* tree comparison function for schedule cache */ @@ -252,7 +252,7 @@ static inline int bcast_sched_linear(int rank, int p, int root, NBC_Schedule *sc } /* simple chained MPI_Ibcast */ -static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *schedule, void *buffer, int count, MPI_Datatype datatype, int fragsize, int size) { +static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *schedule, void *buffer, int count, MPI_Datatype datatype, int fragsize, size_t size) { int res, vrank, rpeer, speer, numfrag, fragcount, thiscount; MPI_Aint ext; char *buf; diff --git a/ompi/mca/coll/libnbc/nbc_ibcast_inter.c b/ompi/mca/coll/libnbc/nbc_ibcast_inter.c index f9aa0d9a1b..8188ec6573 100644 --- a/ompi/mca/coll/libnbc/nbc_ibcast_inter.c +++ b/ompi/mca/coll/libnbc/nbc_ibcast_inter.c @@ -5,7 +5,7 @@ * Corporation. All rights reserved. * Copyright (c) 2006 The Technical University of Chemnitz. All * rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. @@ -19,17 +19,10 @@ int ompi_coll_libnbc_ibcast_inter(void *buffer, int count, MPI_Datatype datatype struct ompi_communicator_t *comm, ompi_request_t ** request, struct mca_coll_base_module_2_1_0_t *module) { int res; - size_t size; NBC_Schedule *schedule; NBC_Handle *handle; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; - res = ompi_datatype_type_size(datatype, &size); - if (MPI_SUCCESS != res) { - NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res); - return res; - } - schedule = OBJ_NEW(NBC_Schedule); if (OPAL_UNLIKELY(NULL == schedule)) { return OMPI_ERR_OUT_OF_RESOURCE; diff --git a/ompi/mca/coll/libnbc/nbc_ireduce.c b/ompi/mca/coll/libnbc/nbc_ireduce.c index fbd15d942d..0045deb6a5 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce.c @@ -18,7 +18,7 @@ static inline int red_sched_binomial (int rank, int p, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, void *redbuf, NBC_Schedule *schedule, NBC_Handle *handle); static inline int red_sched_chain (int rank, int p, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int ext, int size, NBC_Schedule *schedule, NBC_Handle *handle, int fragsize); + MPI_Op op, int ext, size_t size, NBC_Schedule *schedule, NBC_Handle *handle, int fragsize); static inline int red_sched_linear (int rank, int rsize, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, NBC_Schedule *schedule, NBC_Handle *handle); @@ -360,7 +360,7 @@ static inline int red_sched_binomial (int rank, int p, int root, const void *sen /* chain send ... */ static inline int red_sched_chain (int rank, int p, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int ext, int size, NBC_Schedule *schedule, NBC_Handle *handle, int fragsize) { + MPI_Op op, int ext, size_t size, NBC_Schedule *schedule, NBC_Handle *handle, int fragsize) { int res, vrank, rpeer, speer, numfrag, fragcount, thiscount; long offset; From 330b178066daad7f270f9301d7683dbd6792e1a3 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 7 Dec 2015 11:34:01 +0900 Subject: [PATCH 11/12] ompi: fix comment in ompi/mpi/c/Makefile.am Thanks Jeff for the review (cherry picked from commit open-mpi/ompi@ef03bc726ce6af3abbc4b0bdae603b248cb79627) --- ompi/mpi/c/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index 5ffb8eeed4..cbca901d61 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -26,7 +26,7 @@ SUBDIRS = profile -# if OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols +# OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols # to be replaced by PMPI_*. # In this directory, we need it to be 0 From 263271833ee58a072eabf8444b0bf44e0db2eb4d Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 7 Dec 2015 11:34:36 +0900 Subject: [PATCH 12/12] fcoll/two_phase: use ompi_mpi_abort instead of PMPI_Abort Thanks Jeff for the review (cherry picked from commit open-mpi/ompi@bfe8e03d9de505083574fe876b7edc51f1e7b793) --- ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c index 9d6d94bc7a..b6b658ed3f 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c @@ -173,7 +173,7 @@ int mca_fcoll_two_phase_calc_aggregator(mca_io_ompio_file_t *fh, fprintf(stderr, "rank_index(%d) >= num_aggregators(%d)fd_size=%lld off=%lld\n", rank_index,num_aggregators,fd_size,off); - PMPI_Abort(MPI_COMM_WORLD, 1); + ompi_mpi_abort(&ompi_mpi_comm_world.comm, 1); }