-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2019. 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 <cfloat>
-
#include <exception>
-#include "colls_private.h"
-#include "smpi_process.hpp"
-
+#include "colls_private.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
//attempt to do a quick autotuning version of the collective,
-
#define TRACE_AUTO_COLL(cat) \
if (TRACE_is_enabled()) { \
- simgrid::instr::Type* type = PJ_type_get_root()->getChildOrNull(#cat); \
- if (not type) { \
- type = simgrid::instr::Type::eventNew(#cat, PJ_type_get_root()); \
- } \
- char cont_name[25]; \
- snprintf(cont_name, 25, "rank-%d", smpi_process()->index()); \
- simgrid::instr::Value* val = \
- simgrid::instr::Value::get_or_new(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0", type); \
- new simgrid::instr::NewEvent(SIMIX_get_clock(), PJ_container_get(cont_name), type, val); \
+ simgrid::instr::EventType* type = \
+ simgrid::instr::Container::get_root()->type_->by_name_or_create<simgrid::instr::EventType>(#cat); \
+ \
+ std::string cont_name = std::string("rank-" + std::to_string(simgrid::s4u::this_actor::get_pid())); \
+ type->add_entity_value(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0"); \
+ new simgrid::instr::NewEvent(SIMIX_get_clock(), simgrid::instr::Container::by_name(cont_name), type, \
+ type->get_entity_value(Colls::mpi_coll_##cat##_description[i].name)); \
}
#define AUTOMATIC_COLL_BENCH(cat, ret, args, args2) \
int min_coll = -1, global_coll = -1; \
int i; \
double buf_in, buf_out, max_min = DBL_MAX; \
- for (i = 0; Colls::mpi_coll_##cat##_description[i].name; i++) { \
- if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "automatic")) \
+ for (i = 0; not Colls::mpi_coll_##cat##_description[i].name.empty(); i++) { \
+ if (Colls::mpi_coll_##cat##_description[i].name == "automatic") \
continue; \
- if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "default")) \
+ if (Colls::mpi_coll_##cat##_description[i].name == "default") \
continue; \
Coll_barrier_default::barrier(comm); \
TRACE_AUTO_COLL(cat) \
} \
if (comm->rank() == 0) { \
XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max", \
- Colls::mpi_coll_##cat##_description[min_coll].name, time_min, \
- Colls::mpi_coll_##cat##_description[global_coll].name, max_min); \
+ Colls::mpi_coll_##cat##_description[min_coll].name.c_str(), time_min, \
+ Colls::mpi_coll_##cat##_description[global_coll].name.c_str(), max_min); \
} else \
XBT_WARN("The quickest %s was %s on rank %d and took %f", #cat, \
- Colls::mpi_coll_##cat##_description[min_coll].name, comm->rank(), time_min); \
+ Colls::mpi_coll_##cat##_description[min_coll].name.c_str(), comm->rank(), time_min); \
return (min_coll != -1) ? MPI_SUCCESS : MPI_ERR_INTERN; \
}
