From 8f6496d9735499ef7161d54a36e45bb5040f5544 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 25 Aug 2023 08:41:31 +0100 Subject: [PATCH 1/2] config methods which do and do not return none --- spinnman/processes/get_machine_process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spinnman/processes/get_machine_process.py b/spinnman/processes/get_machine_process.py index 3a87f572e..f04b31d9a 100644 --- a/spinnman/processes/get_machine_process.py +++ b/spinnman/processes/get_machine_process.py @@ -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) from spinn_utilities.data import UtilsDataView from spinn_utilities.log import FormatAdapter from spinn_machine import (Router, Chip, Link) @@ -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): From 7d0790e16094e01f9ff7276074c0b1f3bc2941eb Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 25 Aug 2023 10:59:35 +0100 Subject: [PATCH 2/2] use correct config method to check for none --- spinnman/processes/get_machine_process.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spinnman/processes/get_machine_process.py b/spinnman/processes/get_machine_process.py index f04b31d9a..2a52f3491 100644 --- a/spinnman/processes/get_machine_process.py +++ b/spinnman/processes/get_machine_process.py @@ -18,7 +18,7 @@ import functools from os.path import join from spinn_utilities.config_holder import ( - get_config_bool, get_config_int_or_none, 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) @@ -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: @@ -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: @@ -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)