[](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
{
PyErr_WarnEx(PyExc_DeprecationWarning,
- "get_clock() is deprecated and will be dropped after v3.33, use clock() instead.", 1);
+ "get_clock() is deprecated and will be dropped after v3.33, use clock instead.", 1);
return self.attr("clock");
})
.def_property_readonly_static(
[](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
{
PyErr_WarnEx(PyExc_DeprecationWarning,
- "get_all_hosts() is deprecated and will be dropped after v3.33, use all_host() instead.", 1);
+ "get_all_hosts() is deprecated and will be dropped after v3.33, use all_hosts instead.", 1);
return self.attr("all_hosts");
})
.def_property_readonly("all_hosts", &Engine::get_all_hosts, "Returns the list of all hosts found in the platform")
[](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
{
PyErr_WarnEx(PyExc_DeprecationWarning,
- "get_all_links() is deprecated and will be dropped after v3.33, use all_links() instead.",
- 1);
+ "get_all_links() is deprecated and will be dropped after v3.33, use all_links instead.", 1);
return self.attr("all_links");
})
.def_property_readonly("all_links", &Engine::get_all_links, "Returns the list of all links found in the platform")
{
PyErr_WarnEx(
PyExc_DeprecationWarning,
- "get_all_netpoints() is deprecated and will be dropped after v3.33, use all_netpoints() instead.", 1);
+ "get_all_netpoints() is deprecated and will be dropped after v3.33, use all_netpoints instead.", 1);
return self.attr("all_netpoints");
})
.def_property_readonly("all_netpoints", &Engine::get_all_netpoints)
.def("get_netzone_root",
[](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
{
- PyErr_WarnEx(
- PyExc_DeprecationWarning,
- "get_netzone_root() is deprecated and will be dropped after v3.3, use netzone_root() instead.", 1);
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "get_netzone_root() is deprecated and will be dropped after v3.3, use netzone_root instead.",
+ 1);
return self.attr("netzone_root");
})
.def_property_readonly("netzone_root", &Engine::get_netzone_root,
.def("create_router", &simgrid::s4u::NetZone::create_router, "Create a router")
.def("set_parent", &simgrid::s4u::NetZone::set_parent, "Set the parent of this zone")
.def("set_property", &simgrid::s4u::NetZone::set_property, "Add a property to this zone")
- .def("get_netpoint", &simgrid::s4u::NetZone::get_netpoint, "Retrieve the netpoint associated to this zone")
+ .def("get_netpoint",
+ [](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "get_netpoint() is deprecated and will be dropped after v3.33, use netpoint instead.", 1);
+ return self.attr("netpoint");
+ })
+ .def_property_readonly("netpoint", &simgrid::s4u::NetZone::get_netpoint,
+ "Retrieve the netpoint associated to this zone")
.def("seal", &simgrid::s4u::NetZone::seal, "Seal this NetZone")
.def_property_readonly(
"name", [](const simgrid::s4u::NetZone* self) { return self->get_name(); },
" \"\"\"\n\n"
"The second function parameter is the periodicity: the time to wait after the last event to start again over "
"the list. Set it to -1 to not loop over.")
- .def("get_pstate_count", &Host::get_pstate_count, "Retrieve the count of defined pstate levels")
- .def("get_pstate_speed", &Host::get_pstate_speed, "Retrieve the maximal speed at the given pstate")
- .def("get_netpoint", &Host::get_netpoint, "Retrieve the netpoint associated to this host")
+ .def("get_pstate_count",
+ [](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(
+ PyExc_DeprecationWarning,
+ "get_pstate_count() is deprecated and will be dropped after v3.33, use pstate_count instead.", 1);
+ return self.attr("pstate_count");
+ })
+ .def_property_readonly("pstate_count", &Host::get_pstate_count, "Retrieve the count of defined pstate levels")
+ .def("get_pstate_speed",
+ [](pybind11::object& self, int state) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(
+ PyExc_DeprecationWarning,
+ "get_pstate_speed() is deprecated and will be dropped after v3.33, use pstate_speed instead.", 1);
+ return self.attr("pstate_speed")(state);
+ })
+ .def("pstate_speed", &Host::get_pstate_speed, py::call_guard<py::gil_scoped_release>(),
+ "Retrieve the maximal speed at the given pstate")
+ .def("get_netpoint",
+ [](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "get_netpoint() is deprecated and will be dropped after v3.33, use netpoint instead.", 1);
+ return self.attr("netpoint");
+ })
+ .def_property_readonly("netpoint", &Host::get_netpoint, "Retrieve the netpoint associated to this zone")
.def("get_disks", &Host::get_disks, "Retrieve the list of disks in this host")
- .def("set_core_count", &Host::set_core_count, py::call_guard<py::gil_scoped_release>(),
- "Set the number of cores in the CPU")
+ .def("set_core_count",
+ [](pybind11::object& self, double count) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "set_core_count() is deprecated and will be dropped after v3.33, use core_count instead.",
+ 1);
+ self.attr("core_count")(count);
+ })
+ .def_property(
+ "core_count", &Host::get_core_count,
+ [](Host* h, int count) {
+ py::gil_scoped_release gil_guard;
+ return h->set_core_count(count);
+ },
+ "Manage the number of cores in the CPU")
.def("set_coordinates", &Host::set_coordinates, py::call_guard<py::gil_scoped_release>(),
"Set the coordinates of this host")
.def("set_sharing_policy", &simgrid::s4u::Host::set_sharing_policy, py::call_guard<py::gil_scoped_release>(),
/* Class Split-Duplex Link */
py::class_<simgrid::s4u::SplitDuplexLink, Link, std::unique_ptr<simgrid::s4u::SplitDuplexLink, py::nodelete>>(
m, "SplitDuplexLink", "Network split-duplex link")
- .def("get_link_up", &simgrid::s4u::SplitDuplexLink::get_link_up, "Get link direction up")
- .def("get_link_down", &simgrid::s4u::SplitDuplexLink::get_link_down, "Get link direction down");
+ .def("get_link_up",
+ [](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "get_link_up() is deprecated and will be dropped after v3.33, use link_up instead.", 1);
+ return self.attr("link_up");
+ })
+ .def_property_readonly("link_up", &simgrid::s4u::SplitDuplexLink::get_link_up, "Get link direction up")
+ .def("get_link_down",
+ [](pybind11::object& self) // XBT_ATTRIB_DEPRECATED_v334
+ {
+ PyErr_WarnEx(PyExc_DeprecationWarning,
+ "get_link_down() is deprecated and will be dropped after v3.33, use link_down instead.", 1);
+ return self.attr("link_down");
+ })
+ .def_property_readonly("link_down", &simgrid::s4u::SplitDuplexLink::get_link_down, "Get link direction down");
/* Class Mailbox */
py::class_<simgrid::s4u::Mailbox, std::unique_ptr<Mailbox, py::nodelete>>(
msg_base = "Creating zone: "
this_actor.info(msg_base + dijkstra.name)
dijkstra.set_parent(root)
- host1 = dijkstra.create_host("host1", [1e9, 1e8]).set_core_count(2)
+ host1 = dijkstra.create_host("host1", [1e9, 1e8])
+ host1.core_count = 2
hosts.append(host1)
host1.create_disk("disk1", 1e5, 1e4).seal()
host1.create_disk("disk2", "1MBps", "1Mbps").seal()
hosts.append(host2)
link1 = dijkstra.create_link("link1_up", [1e9]).set_latency(1e-3).set_concurrency_limit(10).seal()
link2 = dijkstra.create_link("link1_down", ["1GBps"]).set_latency("1ms").seal()
- dijkstra.add_route(host1.get_netpoint(), host2.get_netpoint(), None, None, [LinkInRoute(link1)], False)
- dijkstra.add_route(host2.get_netpoint(), host1.get_netpoint(), None, None, [LinkInRoute(link2)], False)
+ dijkstra.add_route(host1.netpoint, host2.netpoint, None, None, [LinkInRoute(link1)], False)
+ dijkstra.add_route(host2.netpoint, host1.netpoint, None, None, [LinkInRoute(link2)], False)
dijkstra.seal()
# vivaldi
link_a = vivaldi.create_link("linkA", 1e9).seal()
link_b = vivaldi.create_link("linkB", "1GBps").seal()
link_c = vivaldi.create_link("linkC", "1GBps").seal()
- root.add_route(dijkstra.get_netpoint(), vivaldi.get_netpoint(
- ), host1.get_netpoint(), host3.get_netpoint(), [LinkInRoute(link_a)], True)
- root.add_route(vivaldi.get_netpoint(), empty.get_netpoint(
- ), host3.get_netpoint(), host5.get_netpoint(), [LinkInRoute(link_b)], True)
- root.add_route(empty.get_netpoint(), wifi.get_netpoint(
- ), host5.get_netpoint(), router, [LinkInRoute(link_c)], True)
+ root.add_route(dijkstra.netpoint, vivaldi.netpoint, host1.netpoint, host3.netpoint, [LinkInRoute(link_a)], True)
+ root.add_route(vivaldi.netpoint, empty.netpoint, host3.netpoint, host5.netpoint, [LinkInRoute(link_b)], True)
+ root.add_route(empty.netpoint, wifi.netpoint, host5.netpoint, router, [LinkInRoute(link_c)], True)
# create actors Sender/Receiver
Actor.create("sender", hosts[0], Sender(hosts))
