Skip to content

Commit

Permalink
Merge branch 'master' into fix_energy_when_not_recording
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B authored Dec 18, 2024
2 parents b8385ba + 81ad016 commit 06307bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion spinn_front_end_common/data/fec_data_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ def clear_notification_protocol(self) -> None:

@classmethod
@overrides(FecDataView.add_vertex)
def add_vertex(cls, vertex: ApplicationVertex):
def add_vertex(cls, vertex: ApplicationVertex) -> None:
# Avoid the safety check in FecDataView
PacmanDataWriter.add_vertex(vertex)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,12 @@ def _max_send_buffer_keys_per_timestep(
counts = numpy.bincount(
numpy.concatenate(send_buffer_times).astype("int"))
if len(counts):
return max(counts)
return int(numpy.max(counts))
return 0
if len(send_buffer_times):
counts = numpy.bincount(send_buffer_times)
if len(counts):
return n_keys * max(counts)
return n_keys * int(numpy.max(counts))
return 0
return 0

Expand Down

0 comments on commit 06307bc

Please sign in to comment.