From be8efdea6c1a17caf5aa7c9aa2e1786761fb65b3 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 7 Mar 2024 05:57:14 +0000 Subject: [PATCH] rename chip user processor(s) chip placable processor(s) --- .../test_onchip_compressor/many_bitfields.py | 4 ++-- .../test_onchip_compressor/many_routes.py | 4 ++-- .../test_onchip_compressor/one_route.py | 4 ++-- test_whole_board/test_whole_board.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spynnaker_integration_tests/test_onchip_compressor/many_bitfields.py b/spynnaker_integration_tests/test_onchip_compressor/many_bitfields.py index 44a5d4bdec..59c8f8a5ea 100644 --- a/spynnaker_integration_tests/test_onchip_compressor/many_bitfields.py +++ b/spynnaker_integration_tests/test_onchip_compressor/many_bitfields.py @@ -25,8 +25,8 @@ def find_good_chip(machine, n_target): chip = machine.get_chip_at(x, y) if chip: # Must be greater than to allow the extra monitor - if chip.n_user_processors > n_target: - print(chip.n_user_processors) + if chip.n_placable_processors > n_target: + print(chip.n_placable_processors) return (x, y) SpynnakerDataView.raise_skiptest( f"No Chip found with at least {n_target} user processors") diff --git a/spynnaker_integration_tests/test_onchip_compressor/many_routes.py b/spynnaker_integration_tests/test_onchip_compressor/many_routes.py index 519e62cda4..03b938a966 100644 --- a/spynnaker_integration_tests/test_onchip_compressor/many_routes.py +++ b/spynnaker_integration_tests/test_onchip_compressor/many_routes.py @@ -26,8 +26,8 @@ def find_good_chip(machine, n_target): chip = machine.get_chip_at(x, y) if chip: # Must be greater than to allow the extra monitor - if chip.n_user_processors > n_target: - print(chip.n_user_processors, "processors on", x, y) + if chip.n_placable_processors > n_target: + print(chip.n_placable_processors, "processors on", x, y) return (x, y) SpynnakerDataView.raise_skiptest( f"No Chip found with at least {n_target} user processors") diff --git a/spynnaker_integration_tests/test_onchip_compressor/one_route.py b/spynnaker_integration_tests/test_onchip_compressor/one_route.py index 9e68c1ea4e..c0322d596d 100644 --- a/spynnaker_integration_tests/test_onchip_compressor/one_route.py +++ b/spynnaker_integration_tests/test_onchip_compressor/one_route.py @@ -26,8 +26,8 @@ def find_good_chip(machine, n_target): chip = machine.get_chip_at(x, y) if chip: # Must be greater than to allow the extra monitor - if chip.n_user_processors > n_target: - print(chip.n_user_processors) + if chip.n_placable_processors > n_target: + print(chip.n_placable_processors) return (x, y) raise SkipTest("No Chip found with You Need at least {} user processors" .format(n_target)) diff --git a/test_whole_board/test_whole_board.py b/test_whole_board/test_whole_board.py index 3b535d54da..bdcce9a93c 100644 --- a/test_whole_board/test_whole_board.py +++ b/test_whole_board/test_whole_board.py @@ -160,7 +160,7 @@ def do_run(self): # find number of cores on machine less one for monitors self.to_allocate = dict() for key, chip in machine: - self.to_allocate[key] = chip.n_user_processors - 1 + self.to_allocate[key] = chip.n_placable_processors - 1 # less 1 for the gather self.to_allocate[(0, 0)] -= 1