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

Remove scipy as dependency and import MPL usage

parent 6be39360
No related branches found
No related tags found
No related merge requests found
Pipeline #87623 failed
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 5
− 5
View file @ 8ae391d5
...@@ -22,10 +22,6 @@ before_script: ...@@ -22,10 +22,6 @@ before_script:
coverage_format: cobertura coverage_format: cobertura
path: cov.xml path: cov.xml
run-test-3.7:
image: python:3.7
extends: ".run-test"
run-test-3.8: run-test-3.8:
image: python:3.8 image: python:3.8
extends: ".run-test" extends: ".run-test"
...@@ -38,9 +34,13 @@ run-test-3.10: ...@@ -38,9 +34,13 @@ run-test-3.10:
image: python:3.10 image: python:3.10
extends: ".run-test" extends: ".run-test"
run-test-3.11:
image: python:3.11
extends: ".run-test"
pages: pages:
stage: deploy stage: deploy
image: python:3.10 image: python:3.11
script: script:
- sphinx-build -b html docs_sphinx public - sphinx-build -b html docs_sphinx public
artifacts: artifacts:
......
b_asic/schedule.py
+ 47
− 56
View file @ 8ae391d5
...@@ -11,8 +11,9 @@ from typing import Dict, List, Optional, Tuple ...@@ -11,8 +11,9 @@ from typing import Dict, List, Optional, Tuple
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np import numpy as np
from matplotlib.patches import PathPatch
from matplotlib.path import Path
from matplotlib.ticker import MaxNLocator from matplotlib.ticker import MaxNLocator
from scipy import interpolate
from b_asic import OutputPort, Signal from b_asic import OutputPort, Signal
from b_asic.graph_component import GraphID from b_asic.graph_component import GraphID
...@@ -353,13 +354,13 @@ class Schedule: ...@@ -353,13 +354,13 @@ class Schedule:
) )
self._remove_delays() self._remove_delays()
def _plot_schedule(self): def _plot_schedule(self, ax):
def _draw_arrow2(start, end): def _draw_arrow2(start, end):
if end[0] < start[0]: # Wrap around if end[0] < start[0]: # Wrap around
plt.plot([start[0], self._schedule_time], [start[1], start[1]]) ax.plot([start[0], self._schedule_time], [start[1], start[1]])
plt.plot([0, end[0]], [end[1], end[1]]) ax.plot([0, end[0]], [end[1], end[1]])
elif end[0] == start[0]: elif end[0] == start[0]:
plt.plot( ax.plot(
[ [
start[0], start[0],
start[0] + 0.2, start[0] + 0.2,
...@@ -378,7 +379,7 @@ class Schedule: ...@@ -378,7 +379,7 @@ class Schedule:
], ],
) )
else: else:
plt.plot( ax.plot(
[ [
start[0], start[0],
(start[0] + end[0]) / 2, (start[0] + end[0]) / 2,
...@@ -388,31 +389,21 @@ class Schedule: ...@@ -388,31 +389,21 @@ class Schedule:
[start[1], start[1], end[1], end[1]], [start[1], start[1], end[1], end[1]],
) )
def _draw_spline(x, y):
l = len(x)
t = np.linspace(0, 1, l - 2, endpoint=True)
t = np.append([0, 0, 0], t)
t = np.append(t, [1, 1, 1])
tck = [t, [x, y], 3]
u3 = np.linspace(0, 1, 50, endpoint=True)
out = interpolate.splev(u3, tck)
plt.plot(out[0], out[1], color="black")
def _draw_arrow(start, end, name="", laps=0): def _draw_arrow(start, end, name="", laps=0):
if end[0] < start[0] or laps > 0: # Wrap around if end[0] < start[0] or laps > 0: # Wrap around
plt.plot( ax.plot(
[start[0], self._schedule_time + 0.2], [start[0], self._schedule_time + 0.2],
[start[1], start[1]], [start[1], start[1]],
color="black", color="black",
) )
plt.plot([-0.2, end[0]], [end[1], end[1]], color="black") ax.plot([-0.2, end[0]], [end[1], end[1]], color="black")
plt.text( ax.text(
self._schedule_time + 0.2, self._schedule_time + 0.2,
start[1], start[1],
name, name,
verticalalignment="center", verticalalignment="center",
) )
plt.text( ax.text(
-0.2, -0.2,
end[1], end[1],
"{}: {}".format(name, laps), "{}: {}".format(name, laps),
...@@ -421,34 +412,33 @@ class Schedule: ...@@ -421,34 +412,33 @@ class Schedule:
) )
elif end[0] == start[0]: elif end[0] == start[0]:
_draw_spline( p = Path(
[ [
start[0], start,
start[0] + 0.2, [start[0] + 0.2, start[1]],
start[0] + 0.2, [start[0] + 0.2, (start[1] + end[1]) / 2],
start[0] - 0.2, [start[0], (start[1] + end[1]) / 2],
start[0] - 0.2, [start[0] - 0.2, (start[1] + end[1]) / 2],
start[0], [start[0] - 0.2, end[1]],
], end
[
start[1],
start[1],
(start[1] + end[1]) / 2,
(start[1] + end[1]) / 2,
end[1],
end[1],
], ],
[Path.MOVETO, Path.CURVE4, Path.CURVE4, Path.CURVE4, Path.CURVE4, Path.CURVE4, Path.CURVE4]
) )
pp = PathPatch(p, fc='none')
ax.add_patch(pp)
else: else:
_draw_spline( p = Path(
[ [
start[0], start,
(start[0] + end[0]) / 2, [(start[0] + end[0]) / 2, start[1]],
(start[0] + end[0]) / 2, [(start[0] + end[0]) / 2, end[1]],
end[0], end,
], ],
[start[1], start[1], end[1], end[1]], [Path.MOVETO, Path.CURVE4, Path.CURVE4, Path.CURVE4]
) )
pp = PathPatch(p, fc='none')
ax.add_patch(pp)
def _draw_offset_arrow( def _draw_offset_arrow(
start, end, start_offset, end_offset, name="", laps=0 start, end, start_offset, end_offset, name="", laps=0
...@@ -463,7 +453,7 @@ class Schedule: ...@@ -463,7 +453,7 @@ class Schedule:
ypos = 0.5 ypos = 0.5
ytickpositions = [] ytickpositions = []
yticklabels = [] yticklabels = []
plt.grid(zorder=0.5) ax.grid(zorder=0.5)
ypositions = {} ypositions = {}
for op_id, op_start_time in self._start_times.items(): for op_id, op_start_time in self._start_times.items():
op = self._sfg.find_by_id(op_id) op = self._sfg.find_by_id(op_id)
...@@ -471,12 +461,12 @@ class Schedule: ...@@ -471,12 +461,12 @@ class Schedule:
_x, _y = zip(*latency_coords) _x, _y = zip(*latency_coords)
x = np.array(_x) x = np.array(_x)
y = np.array(_y) y = np.array(_y)
plt.fill(x + op_start_time, y + ypos) ax.fill(x + op_start_time, y + ypos)
if execution_time_coords: if execution_time_coords:
_x, _y = zip(*execution_time_coords) _x, _y = zip(*execution_time_coords)
x = np.array(_x) x = np.array(_x)
y = np.array(_y) y = np.array(_y)
plt.plot( ax.plot(
x + op_start_time, x + op_start_time,
y + ypos, y + ypos,
color="black", color="black",
...@@ -512,11 +502,12 @@ class Schedule: ...@@ -512,11 +502,12 @@ class Schedule:
laps=self._laps[output_signal.graph_id], laps=self._laps[output_signal.graph_id],
) )
plt.yticks(ytickpositions, yticklabels) ax.set_yticks(ytickpositions)
plt.axis([-1, self._schedule_time + 1, 0, ypos]) ax.set_yticklabels(yticklabels)
plt.gca().xaxis.set_major_locator(MaxNLocator(integer=True)) ax.axis([-1, self._schedule_time + 1, 0, ypos])
plt.plot([0, 0], [0, ypos], linestyle="--", color="black") ax.xaxis.set_major_locator(MaxNLocator(integer=True))
plt.plot( ax.plot([0, 0], [0, ypos], linestyle="--", color="black")
ax.plot(
[self._schedule_time, self._schedule_time], [self._schedule_time, self._schedule_time],
[0, ypos], [0, ypos],
linestyle="--", linestyle="--",
...@@ -524,14 +515,14 @@ class Schedule: ...@@ -524,14 +515,14 @@ class Schedule:
) )
def plot_schedule(self) -> None: def plot_schedule(self) -> None:
plt.figure() fig, ax = plt.subplots()
self._plot_schedule() self._plot_schedule(ax)
plt.show() fig.show()
def _repr_svg_(self): def _repr_svg_(self):
plt.figure() fig, ax = plt.subplots()
self._plot_schedule() self._plot_schedule(ax)
f = io.StringIO() f = io.StringIO()
plt.savefig(f, format="svg") fig.savefig(f, format="svg")
return f.getvalue() return f.getvalue()
pyproject.toml
+ 3
− 4
View file @ 8ae391d5
...@@ -6,24 +6,23 @@ maintainers = [ ...@@ -6,24 +6,23 @@ maintainers = [
{ name = "Oscar Gustafsson", email = "oscar.gustafsson@gmail.com" }, { name = "Oscar Gustafsson", email = "oscar.gustafsson@gmail.com" },
] ]
license = { file = "LICENSE" } license = { file = "LICENSE" }
requires-python = ">=3.7" requires-python = ">=3.8"
dependencies = [ dependencies = [
"numpy", "numpy",
"pybind11>=2.3.0", "pybind11>=2.3.0",
"pyside2", "pyside2",
"qtpy", "qtpy",
"graphviz<=0.17", "graphviz",
"matplotlib", "matplotlib",
"scipy",
] ]
classifiers = [ classifiers = [
"Intended Audience :: Education", "Intended Audience :: Education",
"Intended Audience :: Science/Research", "Intended Audience :: Science/Research",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: C++", "Programming Language :: C++",
"License :: OSI Approved :: MIT License", "License :: OSI Approved :: MIT License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment