From 16d65a276272be748493c43ef2df3fc7aa1ac3a5 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 9 Sep 2015 16:30:26 +0900 Subject: [PATCH] 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 --- 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 | 8 +- 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 | 8 +- ompi/mpi/fortran/mpif-h/imrecv_f.c | 8 +- .../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 | 8 +- ompi/mpi/fortran/mpif-h/mrecv_f.c | 8 +- .../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, 4323 insertions(+), 2381 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 8430ea635d..f75830a624 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 a26b09b489..3d4b23596a 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 b44c527ad0..2e2cb87045 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 0f9c21f0e9..24dd2fc81a 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 00d4f87b71..f899825281 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 64bbc102a1..1e2724d053 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 63521199b0..649023fb45 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 656c3c630c..75f24b0471 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 4e08a0bd1b..d26ac0af72 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 3bd40efd76..f848e367eb 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 b34e179a2d..3a851f1aa2 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 7b4c4d2fe9..1584ea894a 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 3dfe04ec33..d9a85b2fd4 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 ed9f9f7f70..3bc3fb223f 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 e5f5608184..02f0c1f6e3 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 13f2f5a269..383ea4c168 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 758aabe46a..9874bdf7da 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 38c9592f6d..bc624ad27b 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 f6c56021dd..b77d80d97a 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 8c3eb9055d..7e8282ca50 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 87c1aa19cf..2c97f91d5a 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 8fa79ab6d3..57257f58dd 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 51e1f3542a..0097865cb2 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 8a810250d3..9a295a511c 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 fc93dd59a1..c66ab35ced 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 f935be8ba8..ee75c35944 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 e176acea21..45fa05da4d 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 cce97d413d..b243e34776 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 26648551f1..29f4da0f8f 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 af5768410f..f1e10dc8bc 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 86aa20ef63..06f93964b8 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 3ff3fe855c..27f89343e8 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 5a5310317c..e17f89de34 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 47920595c9..9cd432205f 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 1be25c50ac..44a18638b7 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 c6e006c7b6..86cad62dd5 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 b7cbc33840..ab3391d2ec 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 978895467a..43ffc380d8 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 5673941ea1..b166b652ff 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 a09c22b4a7..71fde8455a 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 0c2220889f..a07297b840 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 475ca24850..031fbbe4ef 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 5fb92be285..fdf142f641 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 8e90df5cf0..de6f03cd60 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 ec765a5870..488da16157 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 3adae06cff..ee621aae9a 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 46622a05bd..3e9287a5df 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 5eaf864ea5..9825015e87 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 354567aab6..737b2851df 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 e7b2a4da61..9b80c081f4 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 8df957536b..beb5363d1f 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 3e26eecda0..f2d4dbcc74 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 2c7585336a..63ddc56833 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 fa7f407ca3..9035ed5e67 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 9edaa8f0be..bce09bfaad 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 d94b1638ac..a0b5e3ffee 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 46109e978c..85487d3223 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 77a320ac99..8c9ce24ca3 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 95c214ad7a..f0dcde06b5 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 efdda952d7..40dfc0fa00 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 acb4b521b6..bc6d1fc487 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 9ec65e245d..0afa9ba29f 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 77effc02dd..80a024ecda 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"; @@ -74,8 +76,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 327ad68ec7..8c69877a49 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 0ea821ceda..b114adbc87 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 70cc696d17..13540801ec 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 2ea34390c4..93904db13c 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 5c407666db..32a516d158 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 e15eee77b9..43dca5b9b7 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 f998fdb0b1..f0acff9a7c 100644 --- a/ompi/mpi/c/compare_and_swap.c +++ b/ompi/mpi/c/compare_and_swap.c @@ -30,12 +30,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 0b65e3685d..2ade9f74c2 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 7c58340d4a..7d393e4164 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 c49709c8af..df3f9151f2 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 c76b3565bd..2fc1b2edc4 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 a4b455d9c1..be4c720314 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 d16810a53c..746809d2db 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 a909ebd2a4..721404fe7b 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 daef6340b0..caff306366 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 c8dcb2c292..21f52a882f 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 69b37a8b4a..8c44bfdc99 100644 --- a/ompi/mpi/c/fetch_and_op.c +++ b/ompi/mpi/c/fetch_and_op.c @@ -30,12 +30,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 f27c8a8395..db54c1a28e 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 215c44f8dd..6deb9ff80c 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 1dbf3d57bc..2ffdd8ed82 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 cb4d35ecda..60e724cd2d 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 0bb60a0c6b..8e56ff33ab 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 96c5cedee5..1f2e61aee5 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 2f93382f1f..ac11147bd2 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 7c1fad2621..703c5406d8 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 bb54de9d63..fa19376aa6 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 21f49c8904..a6c67003d5 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 5ef6c88c61..2521637853 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 c0f6c4f81e..91d7739f67 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 66814f2973..3afa88c50c 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 1403a494d3..23067575d6 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 51590e12fc..4172254fe4 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 59f4cb5026..4a3b69168a 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 7ed4c19745..bf3fa98fee 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 407c3e01e5..19a0fe1c8d 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 76d0c7198e..6344fc8064 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 904b537bf0..603cf5d976 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 8ec0adbbca..ae7aaf2bcc 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 b43d22eeb8..aaab4bfff2 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 dd9062a8f5..67a625515d 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 10f6aeee46..285e39dd6c 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 7ce933a6da..2d534d3743 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 d5dd1a54af..2443af78d2 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 6c53cac7be..1909152ba2 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 5656fce87b..55e2eda96e 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 fd5bb48309..7635d32c8e 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 df89953b00..49d65e3bb4 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 ec2e1bc5d7..d0a6c2518b 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 b56a3491f9..0cc53ce5ed 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 4ef066d534..9936cb56f3 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 c8264c946e..4077f6258d 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 386dfa4026..ac026a6e62 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 b9a7053bfe..9a2bcb4e23 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 f718de9bca..d07e6e86e6 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 4434ecb104..f6f86675f2 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 145edee4a5..5e1ba88a69 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 8ec7869d37..6a26afb98d 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 93d6327fd9..5313328562 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 136c2b1943..772bc137bd 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 8ab65e132d..c837c7074e 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 7a7065be34..fe77da1eed 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 ad14783107..817c07f44e 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 4f206640cf..caa6a45bb7 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 6ea67554d2..bfebcb71bd 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 f609506963..28fba9bbe8 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 e7a0fe521d..d645a07612 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 7f90892370..7bb760c5a7 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 49ad6f10a8..c64d53af13 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 0811e7de95..2875bd278d 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 0392175f16..c099010c1f 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 d3bdd86b74..c415444c15 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 83bf7d7a73..e5fb923094 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 015f990eb7..143de0799b 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 f162d533eb..db526c5ac9 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 a34cf811bf..8676917ac0 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 88b78cb3f4..e7454bd882 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 8a6962e318..bca75cc589 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 7223cec197..225bc0647f 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 2892e07871..9936c46738 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 e26d6f697b..fcce3cf9ef 100644 --- a/ompi/mpi/c/finalized.c +++ b/ompi/mpi/c/finalized.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_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 bc77c2d806..eb6580b44f 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 601da378ed..8497d9c8ff 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 aa6c41a501..5ee713ff02 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 22edcdd3ae..7a1f45f7bb 100644 --- a/ompi/mpi/c/get.c +++ b/ompi/mpi/c/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/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 4edc6bccb5..919cdad3a3 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 6dc2c0d782..a1128d943a 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 9363ea00bd..36ad935928 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 99ece8097a..3082e463c5 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 3d7a72a94c..36c1fea971 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 4351dce02a..829ef0a2f2 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 30d95d5e63..6cce6c5c69 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 beb5db2793..77b4437810 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 32dcb3b412..4886475c37 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 271ebcdf1f..f696c92aa8 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 d3bc762ff2..922d2ec32b 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 c2371ffbfc..a5840263f5 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 b578a2fba1..c8ac43347a 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 bf53d77c63..6e3e05550f 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 f2a748dd90..6ba065d2ff 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 3a40ff44a5..e8ec858846 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 41a39c6da4..2ec288fbcd 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 36495b75bc..35b8477000 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 be9a8307aa..68ce0de90d 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 2931c0c839..1b793de7c6 100644 --- a/ompi/mpi/c/group_excl.c +++ b/ompi/mpi/c/group_excl.c @@ -30,12 +30,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 b567ea9f9e..5df3138cf3 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 985789682c..35d260fcb0 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 4532daa254..4532bdfae8 100644 --- a/ompi/mpi/c/group_incl.c +++ b/ompi/mpi/c/group_incl.c @@ -31,12 +31,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 e2325b39c7..fd94fd6643 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 9e2992ce78..7781948400 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 ea8a2e7ac6..feb2ae5fef 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 3718fdc61f..bcb2723c7b 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 6cae937642..9a9dac94a1 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 49b75c1d90..23a5296081 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 40cf7612af..149f93159e 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 489c1d299b..c30fcf8802 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 3b4dbbecda..b3001680c0 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 dc02d37fac..be0f205955 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 94d6004420..5294f7ee90 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 df8052941a..44828d3a83 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 a51c03c16e..7c47f6277f 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 40297f980a..6f1aae2953 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 7e313993b9..66319ab343 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 f4366d62ae..08457fffc5 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 e8fd56a75d..c0d3606262 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 786d17f1bd..9f4b78a14f 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 fe4ed38b0a..44f39cb086 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 34cc946de4..b055a2f819 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 35fed70022..00dcc2bc33 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 00dfa3586c..2aa6c16309 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 d695318704..b9d2c1953d 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 d823be57df..51eabacadf 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 7c07438f44..bd987ee82b 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 08dc834720..f51117d418 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 ec8c7b88c9..a46ef5aa2d 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 574844efcb..f01a6d2ab7 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 d323034a3e..c6b787c002 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 14e1dcafa7..fe4f4ef410 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 6c56df0e43..524945d476 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 49fe9010a8..03659fa8ef 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 78daa3a997..c1544c6af1 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 1e79717fde..3a74e883a9 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 fbf0c57d7d..20fc9dc7e7 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 82e9912427..05fd0177a0 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 b3f82a433f..1ad27d4890 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 bdf6492dde..8e98aeb6b8 100644 --- a/ompi/mpi/c/init.c +++ b/ompi/mpi/c/init.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 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 03c3d2acf0..49695c6e22 100644 --- a/ompi/mpi/c/init_thread.c +++ b/ompi/mpi/c/init_thread.c @@ -10,6 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * 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$ * * Additional copyrights may follow @@ -26,12 +28,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 e271011514..12ecc01fe4 100644 --- a/ompi/mpi/c/initialized.c +++ b/ompi/mpi/c/initialized.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_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 74fa8169e5..90a6f330bb 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 3483a4952d..c4850f09f0 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 f2ab558085..c421e69721 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 1aa30a80c7..aef5360699 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 0f300945a7..a87b225181 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 b92d1feaeb..1e96a20937 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 b6b1932d1e..6005c4f261 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 ddea39b843..511934510b 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 c43fc2a393..6b6b0b33eb 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 69395a7566..a08910ea93 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 7eebbcba35..7d4f4a8e4b 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 46cad4ed29..ea731f4f75 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 2b67b3014d..0552902367 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 19f9b08305..f66f0e1fd1 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 a35f80e2f8..49592c0080 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 ae66c8809f..a31d0d3270 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 d51a357783..9796599711 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 cea0323e9e..4116f0d4cc 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 473116eb01..ce245b0906 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 f30d3bfc6b..f9a7150d4b 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 f9d2377e22..b81f1b1ec2 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 1fb109ef34..62f585f15b 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 d827f00546..255b9a2185 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 0aba4df5c8..2e7788e786 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 bac0d3a107..7aa5d9dfb3 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 7ad9837eb4..2d7c0c0aad 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 37cf646f95..9f566a2142 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 5102306fba..73c9e67e5a 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 07c0aaa2dc..1d4cbc2a3e 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 fbe59e88a0..46e3ae6bbd 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 68157a5c41..5be704776b 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 cc30116af5..770f90d73b 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 cf5ca6f092..22503b9bfe 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 8c3b874bb8..f3c54c15ec 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 2dce9e4675..1f194461cf 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 6ba2f198e1..26d532049c 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 f910ed641d..a3f8149081 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 d4f4e613af..7b05f5b911 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 30dbe5599d..4dd0432319 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 3d16581b36..6e18228c7b 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 3470680e01..c80c2fe7b0 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 48887b9dac..a33b7424ec 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 0a5ecf7c71..a80d3ac662 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 b2276198e6..d11ffbd224 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 0f2e2aafa0..3d1a9800c1 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 1c876c4c63..447a1efd73 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 53de2c5c58..0b24805de4 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 66022f5fa7..37385c93b4 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 73ce13a0e9..f405a9975d 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 926dc71e44..246611ed38 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 0e205b5109..6a91141fc7 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 1c6ad3607c..e66c8f3e99 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 59536a1bca..11092f9219 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 ab63e793d4..9ae5e7a842 100644 --- a/ompi/mpi/c/rget.c +++ b/ompi/mpi/c/rget.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 @@ -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 92a3c34af1..0b57b67074 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 01e592d6af..79cc35763a 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 25ba9109b4..ceacecf806 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 7d7e29b006..872556f328 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 340c8b6593..5561dad782 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 dc3716802e..189cac9deb 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 f6aa3d2bba..652a3b60ca 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 bcf22de8c6..558ddb9ef3 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 c9ffbaa660..86325cd43a 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 4ace64e93d..4aaac615d9 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 7e4084d9b4..612f18bcc0 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 84dd5d7775..1d1db3a74a 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 9405f1a391..1954ffb2d5 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 a47d880ee3..e5a9f8a095 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 735bdcab06..b79c6e3db9 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 da0207746c..ef2e6a8ab5 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 83e193b408..aec9566cc2 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 20bb47c385..bdaac4799a 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 839c65023c..f1751f7194 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 f999400757..53872de9e3 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 091a23a05d..7bc28b6acb 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 b1f3ea0847..54a9f7efe3 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 feed9b527b..1245d5271c 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 5688a2133c..365b6942ab 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 9e5b495b6b..1e5e1012a8 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 0382ef8603..e13c6dbe7a 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 664ede94ef..b45a31408b 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 0617bf690a..c575816380 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 220dcc2e02..0d7a2cc181 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 d8303f0a9d..ff0bcca113 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 cf2d971c1f..e7fc843101 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 23985fbb51..2e6e3a33de 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 d75a2a158e..ae7f2922f8 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 a9c6e0224d..25d30663df 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 8a81d8f84e..6e20ae2d4b 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 0fdb7703be..3e1a731908 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 a7636795fe..55e5ff3881 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 f504f23e15..90da38c97b 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 859d2fabdf..69e05027a8 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 f9990f9470..7f61c22007 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 307245c05c..e374566a34 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 2719919afe..214cadc025 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 17e93001a0..f8a02d1a34 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 cceb685ef6..2c64ac8439 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 970aec3e3e..40036cd5dd 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 75c3fcce0f..a68f3314ed 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 a1d3838ddc..b41767aeae 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 208a82dc5b..a5bbab51a2 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 fc544e5bc4..74ed1aca5d 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 87f1464981..8d61265aaf 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 4d5e617205..e3faed2116 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 a5db6d76dd..9d9a84b058 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 421f2647a1..7895674635 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 f938439acb..1163ca7030 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 6bcfd4e7f8..8e1ff7e51b 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 935b00f712..f3a189feea 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 beb83757ed..f18c0bd03a 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 8b485bbeaf..018060cee8 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 f0adc05c06..52dc34c189 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 b6d8c969f4..7a649ee193 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 4708e94e6e..2d6c709910 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 42111cfcd0..bbb1646632 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 679c94e160..de0bbf89b4 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 0b6a645859..68976082fe 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 f97d56bf8c..14aba459e7 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 e2eec5f798..7ea3e0fd9b 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 856fd22293..3bde7f82bf 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 7b52e4fc5e..c6f325491c 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 ab66f254b2..ed14d3f636 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 846a00cbe0..6f2f43485a 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 35edd9c941..5141d1f0c1 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 2057878a90..0ac6e93047 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 e5f85b4e49..b16ce9319a 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 1cc9bdc543..2a7185206b 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 02fe32de2e..8a53029b73 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 1f74bcfa6f..5f8bb7baa6 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 cc982fa017..ec94c959ba 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 e2bef643c9..6d2d17dee8 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 5c71a6ba96..67d2767b01 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 f34367e66c..64789ddab1 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 c3a319453e..1deabee55b 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 db83c6d0a7..8f6d8a99d3 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 bdfe0bfd8f..3407633db2 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 885d72c9fd..123a8bee3f 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 9ae8e99cd0..041eea6b49 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 e7ace5e39e..6b685553f2 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 36c055a1b3..e3c349be80 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 2a1704bf7c..0dd36e2e08 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 c02e37591c..af4a27c078 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 e955f7daee..57460180e7 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 45c81bd2eb..34f647c94e 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 81d2eb8209..b3d3e5e944 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 0fa721f992..a7ef3cd5dc 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 67a0a814f4..786ba6e50b 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 7af78acd5a..fb96f82ac1 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 04d03f5c90..7fe8519db1 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 5ecfcbd0a4..a0dc24d5e3 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 5bf39cba85..0565133e9c 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 a41e08094e..e360b54b49 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 361cb9d3a7..308482f8a9 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 b54d7bba87..bd40fb28f9 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 415a9b526a..bea89c5fc3 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 e1ee8a0396..62ac6f66c6 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 67f0992c81..7a97ff3dfe 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 94fe893f0c..4672f8368c 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 9e43a3ca08..145441b125 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 36c1e5a72d..0a12acb4af 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 46008517aa..ee69042864 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 78c9b336b7..5d8d535eeb 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 dec449e11f..8d1b4b642a 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 1911a902a7..beb9f300be 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) { OPAL_CR_NOOP_PROGRESS(); diff --git a/ompi/mpi/c/wtime.c b/ompi/mpi/c/wtime.c index 2c533ec463..a7cfc49701 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 4352fcf591..4652db76b6 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 68ab362878..933ef04434 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 c3057c74f7..77f602892a 100644 --- a/ompi/mpi/fortran/mpif-h/improbe_f.c +++ b/ompi/mpi/fortran/mpif-h/improbe_f.c @@ -11,6 +11,8 @@ * 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 @@ -61,7 +63,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 dd6761039d..55388dce2f 100644 --- a/ompi/mpi/fortran/mpif-h/imrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/imrecv_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 @@ -58,7 +60,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 a135d20d6a..d11ad315bc 100644 --- a/ompi/mpi/fortran/mpif-h/mprobe_f.c +++ b/ompi/mpi/fortran/mpif-h/mprobe_f.c @@ -12,6 +12,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 @@ -65,7 +67,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 a5a1e4b8bb..6ad2dee54a 100644 --- a/ompi/mpi/fortran/mpif-h/mrecv_f.c +++ b/ompi/mpi/fortran/mpif-h/mrecv_f.c @@ -11,6 +11,8 @@ * 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 @@ -61,7 +63,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 53e0cb7ebf..df4b3f7aeb 100644 --- a/ompi/mpi/fortran/mpif-h/rget_accumulate_f.c +++ b/ompi/mpi/fortran/mpif-h/rget_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_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)