A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
we cannot use PYBIND11 without PYTHONLIBS
[simgrid.git]
/
src
/
smpi
/
bindings
/
smpi_pmpi.cpp
diff --git
a/src/smpi/bindings/smpi_pmpi.cpp
b/src/smpi/bindings/smpi_pmpi.cpp
index
e8622ac
..
76da5cd
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-31,17
+31,18
@@
int PMPI_Init(int *argc, char ***argv)
{
xbt_assert(simgrid::s4u::Engine::is_initialized(),
"Your MPI program was not properly initialized. The easiest is to use smpirun to start it.");
+
// Init is called only once per SMPI process
if (not smpi_process()->initializing()){
- simgrid::smpi::ActorExt::init(
argc, argv
);
+ simgrid::smpi::ActorExt::init();
}
if (not smpi_process()->initialized()){
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_init(rank);
- TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("init"));
- TRACE_smpi_comm_out(rank);
- TRACE_smpi_computing_init(rank);
- TRACE_smpi_sleeping_init(rank);
+ int rank
_traced
= simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_init(rank
_traced
);
+ TRACE_smpi_comm_in(rank
_traced
, __func__, new simgrid::instr::NoOpTIData("init"));
+ TRACE_smpi_comm_out(rank
_traced
);
+ TRACE_smpi_computing_init(rank
_traced
);
+ TRACE_smpi_sleeping_init(rank
_traced
);
smpi_bench_begin();
smpi_process()->mark_as_initialized();
}
@@
-54,13
+55,13
@@
int PMPI_Init(int *argc, char ***argv)
int PMPI_Finalize()
{
smpi_bench_end();
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize"));
+ int rank
_traced
= simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(rank
_traced
, __func__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
- TRACE_smpi_comm_out(rank);
- TRACE_smpi_finalize(rank);
+ TRACE_smpi_comm_out(rank
_traced
);
+ TRACE_smpi_finalize(rank
_traced
);
return MPI_SUCCESS;
}
@@
-223,8
+224,8
@@
int PMPI_Error_string(int errorcode, char* string, int* resultlen){
}
int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) {
- smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr};
- smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr};
+ smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr
,nullptr,nullptr,nullptr
};
+ smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr
,nullptr,nullptr,nullptr
};
return simgrid::smpi::Keyval::keyval_create<simgrid::smpi::Comm>(_copy_fn, _delete_fn, keyval, extra_state);
}