From: Martin Quinson Date: Thu, 1 Jun 2023 11:20:43 +0000 (+0000) Subject: Merge branch 'python-repr' into 'master' X-Git-Tag: v3.34~77 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/985e0a5509e230076d22095da54dd0123d2afe5e?hp=85179dfa31427bb06257a75a380424627ee7b7b3 Merge branch 'python-repr' into 'master' add repr for many simgrid objects See merge request simgrid/simgrid!156 --- diff --git a/examples/python/operation-io/operation-io.tesh b/examples/python/operation-io/operation-io.tesh index d7963639ff..b217012f6a 100644 --- a/examples/python/operation-io/operation-io.tesh +++ b/examples/python/operation-io/operation-io.tesh @@ -1,12 +1,12 @@ #!/usr/bin/env tesh $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-io.py --platform ${platfdir}/hosts_with_disks.xml -> [1.0] Operation exec1 finished (1) -> [1.25] Operation write finished (1) -> [1.35] Operation read finished (1) -> [2.0] Operation exec1 finished (2) -> [2.25] Operation write finished (2) -> [2.35] Operation exec2 finished (1) -> [2.35] Operation read finished (2) -> [3.35] Operation exec2 finished (2) +> [1.0] Operation ExecOp(exec1) finished (1) +> [1.25] Operation IoOp(write) finished (1) +> [1.35] Operation IoOp(read) finished (1) +> [2.0] Operation ExecOp(exec1) finished (2) +> [2.25] Operation IoOp(write) finished (2) +> [2.35] Operation ExecOp(exec2) finished (1) +> [2.35] Operation IoOp(read) finished (2) +> [3.35] Operation ExecOp(exec2) finished (2) diff --git a/examples/python/operation-simple/operation-simple.tesh b/examples/python/operation-simple/operation-simple.tesh index 7cb04993bc..fcea020620 100644 --- a/examples/python/operation-simple/operation-simple.tesh +++ b/examples/python/operation-simple/operation-simple.tesh @@ -1,9 +1,9 @@ #!/usr/bin/env tesh $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-simple.py --platform ${platfdir}/small_platform.xml -> [10.194199500484224] Operation exec1 finished (1) -> [11.714617112501687] Operation comm finished (1) -> [20.388399000968448] Operation exec1 finished (2) -> [21.90881661298591] Operation comm finished (2) -> [24.82146412938331] Operation exec2 finished (1) -> [37.92831114626493] Operation exec2 finished (2) +> [10.194199500484224] Operation ExecOp(exec1) finished (1) +> [11.714617112501687] Operation CommOp(comm) finished (1) +> [20.388399000968448] Operation ExecOp(exec1) finished (2) +> [21.90881661298591] Operation CommOp(comm) finished (2) +> [24.82146412938331] Operation ExecOp(exec2) finished (1) +> [37.92831114626493] Operation ExecOp(exec2) finished (2) diff --git a/examples/python/operation-switch-host/operation-switch-host.tesh b/examples/python/operation-switch-host/operation-switch-host.tesh index a74c06d5bb..ced340b115 100644 --- a/examples/python/operation-switch-host/operation-switch-host.tesh +++ b/examples/python/operation-switch-host/operation-switch-host.tesh @@ -1,15 +1,15 @@ #!/usr/bin/env tesh $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-switch-host.py --platform ${platfdir}/small_platform.xml -> [1.5204176120174615] Operation comm0 finished (1) -> [2.873012467069035] Operation comm0 finished (2) -> [4.393430079086497] Operation comm0 finished (3) -> [5.74602493413807] Operation comm0 finished (4) -> [14.62726462889908] Operation exec1 finished (1) -> [15.979859483950655] Operation exec2 finished (1) -> [16.14768224091654] Operation comm1 finished (1) -> [17.33245433900223] Operation comm2 finished (1) -> [27.7341116457807] Operation exec1 finished (2) -> [29.086706500832275] Operation exec2 finished (2) -> [29.25452925779816] Operation comm1 finished (2) -> [30.43930135588385] Operation comm2 finished (2) \ No newline at end of file +> [1.5204176120174615] Operation CommOp(comm0) finished (1) +> [2.873012467069035] Operation CommOp(comm0) finished (2) +> [4.393430079086497] Operation CommOp(comm0) finished (3) +> [5.74602493413807] Operation CommOp(comm0) finished (4) +> [14.62726462889908] Operation ExecOp(exec1) finished (1) +> [15.979859483950655] Operation ExecOp(exec2) finished (1) +> [16.14768224091654] Operation CommOp(comm1) finished (1) +> [17.33245433900223] Operation CommOp(comm2) finished (1) +> [27.7341116457807] Operation ExecOp(exec1) finished (2) +> [29.086706500832275] Operation ExecOp(exec2) finished (2) +> [29.25452925779816] Operation CommOp(comm1) finished (2) +> [30.43930135588385] Operation CommOp(comm2) finished (2) diff --git a/examples/python/operation-variable-load/operation-variable-load.tesh b/examples/python/operation-variable-load/operation-variable-load.tesh index 4420174dc1..70ecefe202 100644 --- a/examples/python/operation-variable-load/operation-variable-load.tesh +++ b/examples/python/operation-variable-load/operation-variable-load.tesh @@ -2,17 +2,18 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-variable-load.py --platform ${platfdir}/small_platform.xml > --- Small load --- -> [1.5204176120174615] Operation comm finished (1) -> [14.62726462889908] Operation exec finished (1) -> [101.52041761201747] Operation comm finished (2) -> [114.62726462889908] Operation exec finished (2) -> [201.52041761201744] Operation comm finished (3) -> [214.62726462889907] Operation exec finished (3) +> [1.5204176120174615] Operation CommOp(comm) finished (1) +> [14.62726462889908] Operation ExecOp(exec) finished (1) +> [101.52041761201747] Operation CommOp(comm) finished (2) +> [114.62726462889908] Operation ExecOp(exec) finished (2) +> [201.52041761201744] Operation CommOp(comm) finished (3) +> [214.62726462889907] Operation ExecOp(exec) finished (3) > --- Heavy load --- -> [1301.5204176120174] Operation comm finished (4) -> [1303.0408352240347] Operation comm finished (5) -> [1304.561252836052] Operation comm finished (6) -> [1314.627264628899] Operation exec finished (4) -> [1327.7341116457806] Operation exec finished (5) -> [1340.8409586626622] Operation exec finished (6) +> [1301.5204176120174] Operation CommOp(comm) finished (4) +> [1303.0408352240347] Operation CommOp(comm) finished (5) +> [1304.561252836052] Operation CommOp(comm) finished (6) +> [1314.627264628899] Operation ExecOp(exec) finished (4) +> [1327.7341116457806] Operation ExecOp(exec) finished (5) +> [1340.8409586626622] Operation ExecOp(exec) finished (6) + diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index db4ec584a5..0b7fd840bb 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -33,14 +33,14 @@ #include namespace py = pybind11; -using simgrid::plugins::Operation; -using simgrid::plugins::OperationPtr; using simgrid::plugins::CommOp; using simgrid::plugins::CommOpPtr; using simgrid::plugins::ExecOp; using simgrid::plugins::ExecOpPtr; using simgrid::plugins::IoOp; using simgrid::plugins::IoOpPtr; +using simgrid::plugins::Operation; +using simgrid::plugins::OperationPtr; using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; using simgrid::s4u::Barrier; @@ -247,7 +247,7 @@ PYBIND11_MODULE(simgrid, m) params[i - 1] = py::cast(args[i]); const auto fun_or_class = py::reinterpret_borrow(fun_or_class_p); - py::object res = fun_or_class(*params); + py::object res = fun_or_class(*params); /* If I was passed a class, I just built an instance, so I need to call it now */ if (py::isinstance(res)) res(); @@ -322,7 +322,10 @@ PYBIND11_MODULE(simgrid, m) "Retrieve the netpoint associated to this zone") .def("seal", &simgrid::s4u::NetZone::seal, "Seal this NetZone") .def_property_readonly("name", &simgrid::s4u::NetZone::get_name, - "The name of this network zone (read-only property)."); + "The name of this network zone (read-only property).") + .def( + "__repr__", [](const simgrid::s4u::NetZone net) { return "NetZone(" + net.get_name() + ")"; }, + "Textual representation of the NetZone"); /* Class ClusterCallbacks */ py::class_(m, "ClusterCallbacks", "Callbacks used to create cluster zones") @@ -470,7 +473,10 @@ PYBIND11_MODULE(simgrid, m) } }); }, - ""); + "") + .def( + "__repr__", [](const Host* h) { return "Host(" + h->get_name() + ")"; }, + "Textual representation of the Host"); py::enum_(host, "SharingPolicy") .value("NONLINEAR", simgrid::s4u::Host::SharingPolicy::NONLINEAR) @@ -492,7 +498,10 @@ PYBIND11_MODULE(simgrid, m) "Set sharing policy for this disk", py::arg("op"), py::arg("policy"), py::arg("cb") = simgrid::s4u::NonLinearResourceCb()) .def("seal", &simgrid::s4u::Disk::seal, py::call_guard(), "Seal this disk") - .def_property_readonly("name", &simgrid::s4u::Disk::get_name, "The name of this disk (read-only property)."); + .def_property_readonly("name", &simgrid::s4u::Disk::get_name, "The name of this disk (read-only property).") + .def( + "__repr__", [](const Disk* d) { return "Disk(" + d->get_name() + ")"; }, + "Textual representation of the Disk"); py::enum_(disk, "SharingPolicy") .value("NONLINEAR", simgrid::s4u::Disk::SharingPolicy::NONLINEAR) .value("LINEAR", simgrid::s4u::Disk::SharingPolicy::LINEAR) @@ -588,8 +597,10 @@ PYBIND11_MODULE(simgrid, m) .def_property_readonly("name", &Link::get_name, "The name of this link") .def_property_readonly("bandwidth", &Link::get_bandwidth, "The bandwidth (in bytes per second) (read-only property).") - .def_property_readonly("latency", &Link::get_latency, "The latency (in seconds) (read-only property)."); - + .def_property_readonly("latency", &Link::get_latency, "The latency (in seconds) (read-only property).") + .def( + "__repr__", [](const Link* l) { return "Link(" + l->get_name() + ")"; }, + "Textual representation of the Link"); py::enum_(link, "SharingPolicy") .value("NONLINEAR", Link::SharingPolicy::NONLINEAR) .value("WIFI", Link::SharingPolicy::WIFI) @@ -632,8 +643,8 @@ PYBIND11_MODULE(simgrid, m) py::class_>( m, "Mailbox", "Mailbox. See the C++ documentation for details.") .def( - "__str__", [](const Mailbox* self) { return "Mailbox(" + self->get_name() + ")"; }, - "Textual representation of the Mailbox`") + "__repr__", [](const Mailbox* self) { return "Mailbox(" + self->get_name() + ")"; }, + "Textual representation of the Mailbox") .def_static("by_name", &Mailbox::by_name, py::call_guard(), py::arg("name"), "Retrieve a Mailbox from its name") .def_property_readonly("name", &Mailbox::get_name, "The name of that mailbox (read-only property).") @@ -807,8 +818,7 @@ PYBIND11_MODULE(simgrid, m) .def("acquire_timeout", &Semaphore::acquire_timeout, py::call_guard(), py::arg("timeout"), "Acquire on the semaphore object with no timeout. Blocks until the semaphore is acquired or return " "true if it has not been acquired after the specified timeout.") - .def("release", &Semaphore::release, py::call_guard(), - "Release the semaphore.") + .def("release", &Semaphore::release, py::call_guard(), "Release the semaphore.") .def_property_readonly("capacity", &Semaphore::get_capacity, py::call_guard(), "Get the semaphore capacity.") .def_property_readonly("would_block", &Semaphore::would_block, py::call_guard(), @@ -830,12 +840,12 @@ PYBIND11_MODULE(simgrid, m) .def("unlock", &Mutex::unlock, py::call_guard(), "Release the mutex.") // Allow mutexes to be automatically acquired/released with a context manager: `with mutex: ...` .def("__enter__", &Mutex::lock, py::call_guard()) - .def("__exit__", [](Mutex* self, const py::object&, const py::object&, const py::object&) { self->unlock(); }, - py::call_guard()); + .def( + "__exit__", [](Mutex* self, const py::object&, const py::object&, const py::object&) { self->unlock(); }, + py::call_guard()); /* Class Barrier */ - py::class_(m, "Barrier", - "A classical barrier, but blocking in the simulation world.") + py::class_(m, "Barrier", "A classical barrier, but blocking in the simulation world.") .def(py::init<>(&Barrier::create), py::call_guard(), py::arg("expected_actors"), "Barrier constructor.") .def("wait", &Barrier::wait, py::call_guard(), @@ -899,18 +909,22 @@ PYBIND11_MODULE(simgrid, m) .def("resume", &Actor::resume, py::call_guard(), "Resume that actor, that was previously suspend()ed.") .def_static("kill_all", &Actor::kill_all, py::call_guard(), - "Kill all actors but the caller."); - - /* Enum Class IoOpType */ - py::enum_(m, "IoOpType") + "Kill all actors but the caller.") + .def( + "__repr__", [](const ActorPtr a) { return "Actor(" + a->get_name() + ")"; }, + "Textual representation of the Actor"); + + /* Enum Class IoOpType */ + py::enum_(m, "IoOpType") .value("READ", simgrid::s4u::Io::OpType::READ) .value("WRITE", simgrid::s4u::Io::OpType::WRITE); - /* Class Operation */ - py::class_(m, "Operation", - "Operation. See the C++ documentation for details.") + /* Class Operation */ + py::class_(m, "Operation", "Operation. See the C++ documentation for details.") .def_static("init", &Operation::init) - .def_static("on_start_cb", [](py::object cb) { + .def_static( + "on_start_cb", + [](py::object cb) { cb.inc_ref(); // keep alive after return const py::gil_scoped_release gil_release; Operation::on_start_cb([cb](Operation* op) { @@ -919,7 +933,9 @@ PYBIND11_MODULE(simgrid, m) }); }, "Add a callback called when each operation starts.") - .def_static("on_end_cb", [](py::object cb) { + .def_static( + "on_end_cb", + [](py::object cb) { cb.inc_ref(); // keep alive after return const py::gil_scoped_release gil_release; Operation::on_end_cb([cb](Operation* op) { @@ -931,46 +947,64 @@ PYBIND11_MODULE(simgrid, m) .def_property_readonly("name", &Operation::get_name, "The name of this operation (read-only).") .def_property_readonly("count", &Operation::get_count, "The execution count of this operation (read-only).") .def_property_readonly("successors", &Operation::get_successors, "The successors of this operation (read-only).") - .def_property("amount", &Operation::get_amount, &Operation::set_amount, "The amount of work to do for this operation.") - .def("enqueue_execs", py::overload_cast(&Operation::enqueue_execs), py::call_guard(), py::arg("n"), "Enqueue executions for this operation.") - .def("add_successor", py::overload_cast(&Operation::add_successor), py::call_guard(), py::arg("op"), "Add a successor to this operation.") - .def("remove_successor", py::overload_cast(&Operation::remove_successor), py::call_guard(), py::arg("op"), "Remove a successor of this operation.") - .def("remove_all_successors", &Operation::remove_all_successors, py::call_guard(), "Remove all successors of this operation.") - .def("on_this_start", py::overload_cast&>(&Operation::on_this_start), py::arg("func"), "Add a callback called when this operation starts.") - .def("on_this_end", py::overload_cast&>(&Operation::on_this_end), py::arg("func"), "Add a callback called when this operation ends.") - .def("__repr__", [](const OperationPtr op) { - return op->get_name(); - }); - - /* Class CommOp */ - py::class_(m, "CommOp", - "Communication Operation. See the C++ documentation for details.") - .def_static("init", py::overload_cast(&CommOp::init), py::call_guard(), - py::arg("name"), "CommOp constructor") - .def_static("init", py::overload_cast(&CommOp::init), py::call_guard(), - py::arg("name"), py::arg("bytes"), py::arg("source"), py::arg("destination"), "CommOp constructor") + .def_property("amount", &Operation::get_amount, &Operation::set_amount, + "The amount of work to do for this operation.") + .def("enqueue_execs", py::overload_cast(&Operation::enqueue_execs), py::call_guard(), + py::arg("n"), "Enqueue executions for this operation.") + .def("add_successor", py::overload_cast(&Operation::add_successor), + py::call_guard(), py::arg("op"), "Add a successor to this operation.") + .def("remove_successor", py::overload_cast(&Operation::remove_successor), + py::call_guard(), py::arg("op"), "Remove a successor of this operation.") + .def("remove_all_successors", &Operation::remove_all_successors, py::call_guard(), + "Remove all successors of this operation.") + .def("on_this_start", py::overload_cast&>(&Operation::on_this_start), + py::arg("func"), "Add a callback called when this operation starts.") + .def("on_this_end", py::overload_cast&>(&Operation::on_this_end), + py::arg("func"), "Add a callback called when this operation ends.") + .def( + "__repr__", [](const OperationPtr op) { return "Operation(" + op->get_name() + ")"; }, + "Textual representation of the Operation"); + + /* Class CommOp */ + py::class_(m, "CommOp", + "Communication Operation. See the C++ documentation for details.") + .def_static("init", py::overload_cast(&CommOp::init), + py::call_guard(), py::arg("name"), "CommOp constructor") + .def_static("init", py::overload_cast(&CommOp::init), + py::call_guard(), py::arg("name"), py::arg("bytes"), py::arg("source"), + py::arg("destination"), "CommOp constructor") .def_property("source", &CommOp::get_source, &CommOp::set_source, "The source of the communication.") - .def_property("destination", &CommOp::get_destination, &CommOp::set_destination, "The destination of the communication.") - .def_property("bytes", &CommOp::get_bytes, &CommOp::set_bytes, "The amount of bytes to send."); - - /* Class ExecOp */ - py::class_(m, "ExecOp", - "Execution Operation. See the C++ documentation for details.") - .def_static("init", py::overload_cast(&ExecOp::init), py::call_guard(), - py::arg("name"), "ExecOp constructor") - .def_static("init", py::overload_cast(&ExecOp::init), py::call_guard(), - py::arg("name"), py::arg("flops"), py::arg("host"), "CommOp constructor.") + .def_property("destination", &CommOp::get_destination, &CommOp::set_destination, + "The destination of the communication.") + .def_property("bytes", &CommOp::get_bytes, &CommOp::set_bytes, "The amount of bytes to send.") + .def( + "__repr__", [](const CommOpPtr c) { return "CommOp(" + c->get_name() + ")"; }, + "Textual representation of the CommOp"); + + /* Class ExecOp */ + py::class_(m, "ExecOp", "Execution Operation. See the C++ documentation for details.") + .def_static("init", py::overload_cast(&ExecOp::init), + py::call_guard(), py::arg("name"), "ExecOp constructor") + .def_static("init", py::overload_cast(&ExecOp::init), + py::call_guard(), py::arg("name"), py::arg("flops"), py::arg("host"), + "CommOp constructor.") .def_property("host", &ExecOp::get_host, &ExecOp::set_host, "The host of the execution.") - .def_property("flops", &ExecOp::get_flops, &ExecOp::set_flops, "The amount of flops to execute."); - - /* Class IoOp */ - py::class_(m, "IoOp", - "IO Operation. See the C++ documentation for details.") + .def_property("flops", &ExecOp::get_flops, &ExecOp::set_flops, "The amount of flops to execute.") + .def( + "__repr__", [](const ExecOpPtr e) { return "ExecOp(" + e->get_name() + ")"; }, + "Textual representation of the ExecOp"); + + /* Class IoOp */ + py::class_(m, "IoOp", "IO Operation. See the C++ documentation for details.") .def_static("init", py::overload_cast(&IoOp::init), py::call_guard(), - py::arg("name"), "IoOp constructor") - .def_static("init", py::overload_cast(&IoOp::init), py::call_guard(), - py::arg("name"), py::arg("bytes"), py::arg("disk"), py::arg("type"), "IoOp constructor.") + py::arg("name"), "IoOp constructor") + .def_static("init", py::overload_cast(&IoOp::init), + py::call_guard(), py::arg("name"), py::arg("bytes"), py::arg("disk"), + py::arg("type"), "IoOp constructor.") .def_property("disk", &IoOp::get_disk, &IoOp::set_disk, "The disk of the IO.") .def_property("bytes", &IoOp::get_bytes, &IoOp::set_bytes, "The amount of bytes to process.") - .def_property("type", &IoOp::get_bytes, &IoOp::set_bytes, "The type of IO."); + .def_property("type", &IoOp::get_bytes, &IoOp::set_bytes, "The type of IO.") + .def( + "__repr__", [](const IoOpPtr io) { return "IoOp(" + io->get_name() + ")"; }, + "Textual representation of the IoOp"); }