Skip to content

Commit

Permalink
Merge pull request #360 from SpiNNakerManchester/is_config_none
Browse files Browse the repository at this point in the history
Is config none
  • Loading branch information
Christian-B authored Sep 11, 2023
2 parents 2ab3e9c + 6abaf01 commit e02ab1b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions spinnman/processes/get_machine_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import functools
from os.path import join
from spinn_utilities.config_holder import (
get_config_bool, get_config_int, get_config_str)
get_config_bool, get_config_int_or_none, get_config_str_or_none)
from spinn_utilities.data import UtilsDataView
from spinn_utilities.log import FormatAdapter
from spinn_machine import (Router, Chip, Link)
Expand Down Expand Up @@ -114,7 +114,7 @@ def _make_chip(self, chip_info, machine):

# Create the chip's SDRAM object
sdram_size = chip_info.largest_free_sdram_block
max_sdram_size = get_config_int(
max_sdram_size = get_config_int_or_none(
"Machine", "max_sdram_allowed_per_chip")
if (max_sdram_size is not None and
sdram_size > max_sdram_size):
Expand Down Expand Up @@ -294,7 +294,7 @@ def _process_ignore_links(self, machine):
An empty machine to handle wrap-arounds
"""
for ignore in IgnoreLink.parse_string(
get_config_str("Machine", "down_links")):
get_config_str_or_none("Machine", "down_links")):
global_xy = self._ignores_local_to_global(
ignore.x, ignore.y, ignore.ip_address, machine)
if global_xy is None:
Expand Down Expand Up @@ -343,7 +343,7 @@ def _preprocess_ignore_cores(self, machine):
"""
# Convert by ip to global
for ignore in IgnoreCore.parse_string(
get_config_str("Machine", "down_cores")):
get_config_str_or_none("Machine", "down_cores")):
global_xy = self._ignores_local_to_global(
ignore.x, ignore.y, ignore.ip_address, machine)
if global_xy is None:
Expand All @@ -367,7 +367,7 @@ def _preprocess_ignore_chips(self, machine):
An empty machine to handle wrap-arounds
"""
for ignore in IgnoreChip.parse_string(
get_config_str("Machine", "down_chips")):
get_config_str_or_none("Machine", "down_chips")):
# Convert by ip to global
global_xy = self._ignores_local_to_global(
ignore.x, ignore.y, ignore.ip_address, machine)
Expand Down

0 comments on commit e02ab1b

Please sign in to comment.