saymrwulf/uhd
1
0
Fork 0
mirror of https://github.com/saymrwulf/uhd.git synced 2026-05-16 21:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rfnoc: Rename skip_property_propagation to is_back_edge

Browse source 
`skip_property_propagation` was always a bad choice for a name, but
since 3930a615, it is completely wrong.

In the C++ API, there is no change in API or ABI, because the argument
name is not part of API/ABI, although the documentation strings were
modified.

In the Python API, the argument name and default value are also modified
to match the C++ API. Scripts using named arguments may have to be
modified to track this change.
This commit is contained in:
Martin Braun 2022-06-08 16:34:03 +02:00 committed by Aaron Rossetto
parent f163af41a4
commit 84c56eae1f
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
host/include/uhd/rfnoc_graph.hpp
View file

@ -179,7 +179,7 @@ public:
* \param src_port The port of the source block to connect.
* \param dst_blk The block ID of the destination block to connect to.
* \param dst_port The port of the destination block to connect to.
* \param skip_property_propagation Skip property propagation for this edge.
* \param is_back_edge Flag this edge as a back-edge.
* See also \ref props_graph_resolution_back_edges.
*
* \throws uhd::routing_error if the source or destination ports are
@ -189,7 +189,7 @@ public:
size_t src_port,
const block_id_t& dst_blk,
size_t dst_port,
bool skip_property_propagation = false) = 0;
bool is_back_edge = false) = 0;
/*! Connect TX streamer to an input of an NoC block
*

8
host/lib/rfnoc/rfnoc_graph.cpp
View file

@ -228,7 +228,7 @@ public:
size_t src_port,
const block_id_t& dst_blk,
size_t dst_port,
bool skip_property_propagation) override
bool is_back_edge) override
{
if (!has_block(src_blk)) {
throw uhd::lookup_error(
@ -246,7 +246,7 @@ public:
get_block(dst_blk),
dst_port,
edge_type,
skip_property_propagation);
is_back_edge);
}
void disconnect(const block_id_t& src_blk,
@ -823,10 +823,10 @@ private:
std::shared_ptr<node_t> dst_blk,
size_t dst_port,
graph_edge_t::edge_t edge_type,
bool skip_property_propagation)
bool is_back_edge)
{
graph_edge_t edge_info(
src_port, dst_port, edge_type, not skip_property_propagation);
src_port, dst_port, edge_type, not is_back_edge);
edge_info.src_blockid = src_blk->get_unique_id();
edge_info.dst_blockid = dst_blk->get_unique_id();
_graph->connect(src_blk.get(), dst_blk.get(), edge_info);

7
host/lib/rfnoc/rfnoc_python.hpp
View file

@ -183,7 +183,12 @@ void export_rfnoc(py::module& m)
.def("is_connectable", &rfnoc_graph::is_connectable)
.def("connect",
py::overload_cast<const block_id_t&, size_t, const block_id_t&, size_t, bool>(
&rfnoc_graph::connect))
&rfnoc_graph::connect),
py::arg("src_blk"),
py::arg("src_port"),
py::arg("dst_blk"),
py::arg("dst_port"),
py::arg("is_back_edge") = false)
.def("connect",
py::overload_cast<uhd::tx_streamer::sptr,
size_t,