Commit 98236eba authored by Fred Suter's avatar Fred Suter

Merge branch 'master' of https://framagit.org/simgrid/simgrid

parents 173e6cb3 81bd8421
Pipeline #190653 passed with stages
in 21 minutes and 38 seconds
......@@ -72,6 +72,7 @@ static const std::vector<std::string> filtered_libraries = {
"libm",
"libomp",
"libpapi",
"libpcre2-8",
"libpfm",
"libpgmath",
"libpthread",
......
......@@ -544,7 +544,7 @@ int PMPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat
smpi_bench_end();
int rank = simgrid::s4u::this_actor::get_pid();
std::unique_ptr<unsigned char[]> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);
TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan",
new simgrid::instr::Pt2PtTIData(request == MPI_REQUEST_IGNORED ? "scan" : "iscan", -1,
......@@ -584,7 +584,7 @@ int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat
smpi_bench_end();
int rank = simgrid::s4u::this_actor::get_pid();
std::unique_ptr<unsigned char[]> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);
TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan",
new simgrid::instr::Pt2PtTIData(request == MPI_REQUEST_IGNORED ? "exscan" : "iexscan", -1,
......@@ -638,7 +638,7 @@ int PMPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcoun
totalcount += recvcounts[i];
}
std::unique_ptr<unsigned char[]> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, totalcount, datatype);;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, totalcount, datatype);
TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter" : "PMPI_Ireduce_scatter",
new simgrid::instr::VarCollTIData(
......
......@@ -113,7 +113,7 @@ int main(int argc, char **argv)
}
/* Test Iallreduce */
if (sol != out)
errs++;;
errs++;
/* Test new communicator */
errs += MTestTestComm(newcomm);
......@@ -132,7 +132,7 @@ int main(int argc, char **argv)
}
/* Test Iallreduce */
if (sol != out)
errs++;;
errs++;
/* Test new communicator */
errs += MTestTestComm(newcomm);
......@@ -149,7 +149,7 @@ int main(int argc, char **argv)
if (sol != out)
errs++;;
errs++;
/* Test new inter communicator */
errs += MTestTestComm(newcomm);
MPI_Comm_free(&newcomm);
......@@ -167,7 +167,7 @@ int main(int argc, char **argv)
}
/* Test Iallreduce resutls for split-communicator */
if (sol != out)
errs++;;
errs++;
/* Test new inter-communicator */
errs += MTestTestComm(newcomm);
......@@ -190,7 +190,7 @@ int main(int argc, char **argv)
if (sol != out)
errs++;;
errs++;
/* Test new communicator */
errs += MTestTestComm(newcomm);
MPI_Comm_free(&newcomm);
......
......@@ -168,7 +168,7 @@ endif()
mark_as_advanced(GCCLIBATOMIC_LIBRARY)
if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-znoseparate-code")
set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-znorelro -Wl,-znoseparate-code")
endif()
target_link_libraries(simgrid ${SIMGRID_DEP})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment