Skip to content

Commit

Permalink
Merge 553e222 into e5fe263
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B committed Feb 8, 2019
2 parents e5fe263 + 553e222 commit bddb711
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,15 @@ def generate_machine_data_specification(

def get_data(self, buffer_manager, placement):
# for buffering output info is taken form the buffer manager
reader, data_missing = buffer_manager.get_data_for_vertex(placement, 0)
# get raw data, convert to list of booleans
raw_data, data_missing = buffer_manager.get_data_by_placement(
placement, 0)

# do check for missing data
if data_missing:
print("missing_data from ({}, {}, {}); ".format(
placement.x, placement.y, placement.p))

# get raw data, convert to list of booleans
raw_data = reader.read_all()

# return the data, converted to list of booleans
return [
bool(element)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: string output
"""
data_pointer, missing_data = buffer_manager.get_data_for_vertex(
raw_data, missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if missing_data:
raise Exception("missing data!")
return str(data_pointer.read_all())
return str(raw_data)

def get_minimum_buffer_sdram_usage(self):
return self._string_data_size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: The data read, as bytes
"""
data_pointer, is_missing_data = buffer_manager.get_data_for_vertex(
raw_data, is_missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if is_missing_data:
logger.warn("Some data was lost when recording")
return data_pointer.read_all()
logger.warning("Some data was lost when recording")
return raw_data

@overrides(AbstractReceiveBuffersToHost.get_minimum_buffer_sdram_usage)
def get_minimum_buffer_sdram_usage(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: string output
"""
data_pointer, missing_data = buffer_manager.get_data_for_vertex(
raw_data, missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if missing_data:
raise Exception("missing data!")
return str(data_pointer.read_all())
return str(raw_data)

def get_minimum_buffer_sdram_usage(self):
return self._string_data_size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: string output
"""
data_pointer, missing_data = buffer_manager.get_data_for_vertex(
raw_data, missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if missing_data:
raise Exception("missing data!")
return str(data_pointer.read_all())
return str(raw_data)

def get_minimum_buffer_sdram_usage(self):
return self._string_data_size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: string output
"""
data_pointer, missing_data = buffer_manager.get_data_for_vertex(
raw_data, missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if missing_data:
raise Exception("missing data!")
return str(data_pointer.read_all())
return str(raw_data)

def get_minimum_buffer_sdram_usage(self):
return self._string_data_size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def read(self, placement, buffer_manager):
:param buffer_manager: the buffer manager
:return: string output
"""
data_pointer, missing_data = buffer_manager.get_data_for_vertex(
raw_data, missing_data = buffer_manager.get_data_by_placement(
placement, 0)
if missing_data:
raise Exception("missing data!")
return str(data_pointer.read_all())
return str(raw_data)

def get_minimum_buffer_sdram_usage(self):
return self._string_data_size
Expand Down

0 comments on commit bddb711

Please sign in to comment.