X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f12b085d941522c6c45e47db742a7fdfedb832da..c4000f89d4644c3d7ff6187a62a0930c4d53e683:/src/smpi/bindings/smpi_f77.cpp diff --git a/src/smpi/bindings/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp index ad40a6b49e..a7c841aab1 100644 --- a/src/smpi/bindings/smpi_f77.cpp +++ b/src/smpi/bindings/smpi_f77.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" @@ -239,8 +239,8 @@ void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr){ } void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr){ - *ierr = MPI_Win_create_keyval(reinterpret_cast(copy_fn), reinterpret_cast(delete_fn), - keyval, extra_state) ; + *ierr = MPI_Win_create_keyval(reinterpret_cast(copy_fn), + reinterpret_cast(delete_fn), keyval, extra_state); } void mpi_win_free_keyval_(int* keyval, int* ierr){ @@ -399,8 +399,9 @@ void mpi_fetch_and_op_( int *origin_addr, int* result_addr, int* datatype, int* *target_disp, simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); } -void mpi_compare_and_swap_( int *origin_addr, int* compare_addr, int* result_addr, - int* datatype, int* target_rank, MPI_Aint* target_disp, int* win, int* ierr){ +void mpi_compare_and_swap_(int* origin_addr, int* compare_addr, int* result_addr, int* datatype, int* target_rank, + MPI_Aint* target_disp, int* win, int* ierr) +{ *ierr = MPI_Compare_and_swap( static_cast(origin_addr),static_cast(compare_addr), static_cast(result_addr), simgrid::smpi::Datatype::f2c(*datatype),*target_rank, *target_disp, simgrid::smpi::Win::f2c(*win)); @@ -409,20 +410,22 @@ void mpi_compare_and_swap_( int *origin_addr, int* compare_addr, int* result_add void mpi_get_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, int* target_datatype, int* op, int* win, int* ierr){ - *ierr = MPI_Get_accumulate( static_cast(origin_addr), *origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype), - static_cast(result_addr), *result_count, simgrid::smpi::Datatype::f2c(*result_datatype), - *target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*target_datatype), - simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); + *ierr = + MPI_Get_accumulate(static_cast(origin_addr), *origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype), + static_cast(result_addr), *result_count, simgrid::smpi::Datatype::f2c(*result_datatype), + *target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*target_datatype), + simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); } void mpi_rget_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, int* target_datatype, int* op, int* win, int* request, int* ierr){ MPI_Request req; - *ierr = MPI_Rget_accumulate( static_cast(origin_addr), *origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype), - static_cast(result_addr), *result_count, simgrid::smpi::Datatype::f2c(*result_datatype), - *target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*target_datatype), - simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win), &req); + *ierr = MPI_Rget_accumulate(static_cast(origin_addr), *origin_count, + simgrid::smpi::Datatype::f2c(*origin_datatype), static_cast(result_addr), + *result_count, simgrid::smpi::Datatype::f2c(*result_datatype), *target_rank, *target_disp, + *target_count, simgrid::smpi::Datatype::f2c(*target_datatype), + simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win), &req); if(*ierr == MPI_SUCCESS) { *request = req->add_f(); } @@ -430,7 +433,6 @@ void mpi_rget_accumulate_(int *origin_addr, int* origin_count, int* origin_datat //following are automatically generated, and have to be checked void mpi_finalized_ (int * flag, int* ierr){ - *ierr = MPI_Finalized(flag); } @@ -441,7 +443,6 @@ void mpi_init_thread_ (int* required, int *provided, int* ierr){ } void mpi_query_thread_ (int *provided, int* ierr){ - *ierr = MPI_Query_thread(provided); }