Skip to content
Snippets Groups Projects
Commit ddadb311 authored by Oscar Gustafsson's avatar Oscar Gustafsson :bicyclist:
Browse files

Fix some typing issues

parent 81491e13
No related branches found
No related tags found
1 merge request!172Change return type for coordinates to tuples and split port methods
Pipeline #89107 passed
Stage: test
This commit is part of merge request !172. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
b_asic/operation.py
+ 23
− 11
View file @ ddadb311
......@@ -407,7 +407,9 @@ class Operation(GraphComponent, SignalSourceProvider):
@abstractmethod
def get_plot_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
"""
Return a tuple containing coordinates for the two polygons outlining
the latency and execution time of the operation.
......@@ -418,7 +420,9 @@ class Operation(GraphComponent, SignalSourceProvider):
@abstractmethod
def get_io_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
"""
Return a tuple containing coordinates for inputs and outputs, respectively.
These maps to the polygons and are corresponding to a start time of 0
......@@ -434,7 +438,7 @@ class Operation(GraphComponent, SignalSourceProvider):
@abstractmethod
def get_input_coordinates(
self,
) -> Tuple[Tuple[float]]:
) -> Tuple[Tuple[float, float], ...]:
"""
Return coordinates for inputs.
These maps to the polygons and are corresponding to a start time of 0
......@@ -450,7 +454,7 @@ class Operation(GraphComponent, SignalSourceProvider):
@abstractmethod
def get_output_coordinates(
self,
) -> Tuple[Tuple[float]]:
) -> Tuple[Tuple[float, float], ...]:
"""
Return coordinates for outputs.
These maps to the polygons and are corresponding to a start time of 0
......@@ -953,7 +957,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
return self.output(0)
@property
def destination(self) -> OutputPort:
def destination(self) -> InputPort:
if self.input_count != 1:
diff = "more" if self.input_count > 1 else "less"
raise TypeError(
......@@ -1082,14 +1086,18 @@ class AbstractOperation(Operation, AbstractGraphComponent):
def get_plot_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
# Doc-string inherited
return (
self._get_plot_coordinates_for_latency(),
self._get_plot_coordinates_for_execution_time(),
)
def _get_plot_coordinates_for_execution_time(self) -> Tuple[Tuple[float]]:
def _get_plot_coordinates_for_execution_time(
self,
) -> Tuple[Tuple[float, float], ...]:
# Always a rectangle, but easier if coordinates are returned
execution_time = self._execution_time # Copy for type checking
if execution_time is None:
......@@ -1108,7 +1116,9 @@ class AbstractOperation(Operation, AbstractGraphComponent):
f"All latencies must be set: {self.latency_offsets}"
)
def _get_plot_coordinates_for_latency(self) -> Tuple[Tuple[float]]:
def _get_plot_coordinates_for_latency(
self,
) -> Tuple[Tuple[float, float], ...]:
self._check_all_latencies_set()
# Points for latency polygon
latency = []
......@@ -1132,7 +1142,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
return tuple(latency)
def get_input_coordinates(self) -> Tuple[Tuple[float]]:
def get_input_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
self._check_all_latencies_set()
return tuple(
......@@ -1143,7 +1153,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
for k in range(len(self.inputs))
)
def get_output_coordinates(self) -> Tuple[Tuple[float]]:
def get_output_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
self._check_all_latencies_set()
return tuple(
......@@ -1156,6 +1166,8 @@ class AbstractOperation(Operation, AbstractGraphComponent):
def get_io_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
# Doc-string inherited
return self.get_input_coordinates(), self.get_output_coordinates()
b_asic/signal.py
+ 6
− 5
View file @ ddadb311
......@@ -47,10 +47,8 @@ class Signal(AbstractGraphComponent):
def __init__(
self,
source: Optional[Union["OutputPort", "Signal", "Operation"]] = None,
destination: Optional[
Union["InputPort", "Signal", "Operation"]
] = None,
source: Optional["OutputPort"] = None,
destination: Optional["InputPort"] = None,
bits: Optional[int] = None,
name: Name = Name(""),
):
......@@ -104,7 +102,10 @@ class Signal(AbstractGraphComponent):
If Operation, it must have a single output, otherwise a TypeError is
raised. That output is used to extract the OutputPort.
"""
if hasattr(source, "source"):
# import here to avoid cyclic imports
from b_asic.operation import Operation
if isinstance(source, (Signal, Operation)):
# Signal or Operation
source = source.source
......
b_asic/special_operations.py
+ 10
− 6
View file @ ddadb311
......@@ -57,7 +57,9 @@ class Input(AbstractOperation):
def get_plot_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
# Doc-string inherited
return (
(
......@@ -78,11 +80,11 @@ class Input(AbstractOperation):
),
)
def get_input_coordinates(self) -> Tuple[Tuple[float]]:
def get_input_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
return tuple()
def get_output_coordinates(self) -> Tuple[Tuple[float]]:
def get_output_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
return ((0, 0.5),)
......@@ -121,18 +123,20 @@ class Output(AbstractOperation):
def get_plot_coordinates(
self,
) -> Tuple[Tuple[Tuple[float]], Tuple[Tuple[float]]]:
) -> Tuple[
Tuple[Tuple[float, float], ...], Tuple[Tuple[float, float], ...]
]:
# Doc-string inherited
return (
((0, 0), (0, 1), (0.25, 1), (0.5, 0.5), (0.25, 0), (0, 0)),
((0, 0), (0, 1), (0.25, 1), (0.5, 0.5), (0.25, 0), (0, 0)),
)
def get_input_coordinates(self) -> Tuple[Tuple[float]]:
def get_input_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
return ((0, 0.5),)
def get_output_coordinates(self) -> Tuple[Tuple[float]]:
def get_output_coordinates(self) -> Tuple[Tuple[float, float], ...]:
# doc-string inherited
return tuple()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment