Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle case correctly when benchmark results contain only one simulation #30

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Handle case correctly when benchmark results contain only one simulation #30

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80a0bc1
Update bennchplot.py
JanVogelsang Apr 11, 2023
2258358
Update bennchplot.py
JanVogelsang Apr 11, 2023
5a413ef
Update bennchplot.py
JanVogelsang Apr 12, 2023
1029375
Update bennchplot.py
JanVogelsang May 21, 2023
4334156
Update bennchplot.py
JanVogelsang May 29, 2023
cd8b8ec
Merge branch 'main' into main
JanVogelsang Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions bennchplot/bennchplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def __init__(self, x_axis,
additional_params=pp.additional_params,
label_params=pp.label_params,
time_scaling=1,
df=None,
detailed_timers=True):

self.x_axis = x_axis
Expand All @@ -72,8 +73,8 @@ def __init__(self, x_axis,
self.color_params = color_params
self.label_params = label_params
self.time_scaling = time_scaling
self.df = df
self.detailed_timers = detailed_timers

self.load_data(data_file)
self.compute_derived_quantities()

Expand All @@ -92,11 +93,12 @@ def load_data(self, data_file):
------
ValueError
"""
try:
self.df = pd.read_csv(data_file, delimiter=',')
except FileNotFoundError:
print('File could not be found')
quit()
if self.df is None:
try:
self.df = pd.read_csv(data_file, delimiter=',')
except FileNotFoundError:
print('File could not be found')
quit()

for py_timer in ['py_time_create', 'py_time_connect']:
if py_timer not in self.df:
Expand All @@ -112,6 +114,13 @@ def load_data(self, data_file):
'time_construction_create': ['mean', 'std'],
'time_construction_connect': ['mean', 'std'],
'time_simulate': ['mean', 'std'],
'time_collocate_spike_data': ['mean', 'std'],
'time_communicate_spike_data': ['mean', 'std'],
'time_deliver_spike_data': ['mean', 'std'],
'time_update': ['mean', 'std'],
'time_communicate_target_data': ['mean', 'std'],
'time_gather_spike_data': ['mean', 'std'],
'time_gather_target_data': ['mean', 'std'],
'time_communicate_prepare': ['mean', 'std'],
'py_time_create': ['mean', 'std'],
'py_time_connect': ['mean', 'std'],
Expand Down Expand Up @@ -266,9 +275,9 @@ def plot_fractions(self, axis, fill_variables,

fill_height = 0
for fill in fill_variables:
axis.fill_between(np.squeeze(self.df[self.x_axis]),
axis.fill_between(self.df[self.x_axis].to_numpy().squeeze(axis=1),
fill_height,
np.squeeze(self.df[fill]) + fill_height,
self.df[fill].to_numpy() + fill_height,
label=self.label_params[fill],
facecolor=self.color_params[fill],
interpolate=interpolate,
Expand All @@ -277,18 +286,17 @@ def plot_fractions(self, axis, fill_variables,
linewidth=0.5,
edgecolor='#444444')
if error:
axis.errorbar(np.squeeze(self.df[self.x_axis]),
np.squeeze(self.df[fill]) + fill_height,
yerr=np.squeeze(self.df[fill + '_std']),
axis.errorbar(self.df[self.x_axis].to_numpy().squeeze(axis=1),
self.df[fill].to_numpy() + fill_height,
yerr=self.df[fill + '_std'].to_numpy(),
capsize=3,
capthick=1,
color='k',
fmt='none'
)
fmt='none')
fill_height += self.df[fill].to_numpy()

if self.x_ticks == 'data':
axis.set_xticks(np.squeeze(self.df[self.x_axis]))
axis.set_xticks(self.df[self.x_axis].to_numpy().squeeze(axis=1))
else:
axis.set_xticks(self.x_ticks)

Expand Down Expand Up @@ -320,25 +328,25 @@ def plot_main(self, quantities, axis, log=(False, False),
for y in quantities:
label = self.label_params[y] if label is None else label
color = self.color_params[y] if color is None else color
axis.plot(self.df[self.x_axis],
self.df[y],
axis.plot(self.df[self.x_axis].to_numpy().squeeze(axis=1),
self.df[y].to_numpy(),
marker=None,
label=label,
color=color,
linewidth=2)
if error:
axis.errorbar(
self.df[self.x_axis].values,
self.df[y].values,
yerr=self.df[y + '_std'].values,
self.df[self.x_axis].to_numpy().squeeze(axis=1),
self.df[y].to_numpy(),
yerr=self.df[y + '_std'].to_numpy(),
marker=None,
capsize=3,
capthick=1,
color=color,
fmt=fmt)

if self.x_ticks == 'data':
axis.set_xticks(self.df[self.x_axis].values)
axis.set_xticks(self.df[self.x_axis].to_numpy().squeeze(axis=1))
else:
axis.set_xticks(self.x_ticks)

Expand Down