diff --git a/spynnaker/pyNN/external_devices_models/machine_munich_motor_device.py b/spynnaker/pyNN/external_devices_models/machine_munich_motor_device.py index 9afe9cb42c..1698fa299d 100644 --- a/spynnaker/pyNN/external_devices_models/machine_munich_motor_device.py +++ b/spynnaker/pyNN/external_devices_models/machine_munich_motor_device.py @@ -13,6 +13,7 @@ # limitations under the License. from spinn_utilities.overrides import overrides +from spinnman.model.enums import ExecutableType from pacman.model.graphs.common import Slice from pacman.model.graphs.machine import MachineVertex from pacman.model.resources import ConstantSDRAM @@ -25,7 +26,6 @@ from spinn_front_end_common.interface.simulation import simulation_utilities from spinn_front_end_common.utilities.constants import ( SYSTEM_BYTES_REQUIREMENT, SIMULATION_N_BYTES, BYTES_PER_WORD) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spynnaker.pyNN.data import SpynnakerDataView from spynnaker.pyNN.exceptions import SpynnakerException diff --git a/spynnaker/pyNN/extra_algorithms/neuron_expander.py b/spynnaker/pyNN/extra_algorithms/neuron_expander.py index 5de874b360..0069ef7529 100644 --- a/spynnaker/pyNN/extra_algorithms/neuron_expander.py +++ b/spynnaker/pyNN/extra_algorithms/neuron_expander.py @@ -17,7 +17,7 @@ from spinn_utilities.progress_bar import ProgressBar from spinn_front_end_common.utilities.system_control_logic import ( run_system_application) -from spinn_front_end_common.utilities.utility_objs import ExecutableType +from spinnman.model.enums import ExecutableType from spinn_front_end_common.utilities.helpful_functions import ( write_address_to_user1) from spinnman.model import ExecutableTargets diff --git a/spynnaker/pyNN/extra_algorithms/spynnaker_machine_bit_field_router_compressor.py b/spynnaker/pyNN/extra_algorithms/spynnaker_machine_bit_field_router_compressor.py index 526b7d5f16..837796675f 100644 --- a/spynnaker/pyNN/extra_algorithms/spynnaker_machine_bit_field_router_compressor.py +++ b/spynnaker/pyNN/extra_algorithms/spynnaker_machine_bit_field_router_compressor.py @@ -16,7 +16,7 @@ from spinn_utilities.config_holder import get_config_bool from spinn_utilities.log import FormatAdapter from spinnman.model import ExecutableTargets -from spinnman.model.enums import CPUState +from spinnman.model.enums import CPUState, ExecutableType from spinn_front_end_common.interface.interface_functions.\ machine_bit_field_router_compressor import ( machine_bit_field_ordered_covering_compressor, @@ -25,7 +25,6 @@ write_address_to_user1) from spinn_front_end_common.utilities.system_control_logic import ( run_system_application) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spynnaker.pyNN.data import SpynnakerDataView from spynnaker.pyNN.models.abstract_models import ( AbstractSynapseExpandable, SYNAPSE_EXPANDER_APLX) diff --git a/spynnaker/pyNN/extra_algorithms/synapse_expander.py b/spynnaker/pyNN/extra_algorithms/synapse_expander.py index 824fb544ff..c5b3f0d69e 100644 --- a/spynnaker/pyNN/extra_algorithms/synapse_expander.py +++ b/spynnaker/pyNN/extra_algorithms/synapse_expander.py @@ -15,9 +15,9 @@ from spinn_utilities.config_holder import get_config_bool from spinn_utilities.log import FormatAdapter from spinn_utilities.progress_bar import ProgressBar +from spinnman.model.enums import ExecutableType from spinn_front_end_common.utilities.system_control_logic import ( run_system_application) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spinnman.model import ExecutableTargets from spinnman.model.enums import CPUState from spynnaker.pyNN.data import SpynnakerDataView diff --git a/spynnaker/pyNN/models/neuron/population_machine_common.py b/spynnaker/pyNN/models/neuron/population_machine_common.py index 4fcbdab4f2..dd6f3a3fa6 100644 --- a/spynnaker/pyNN/models/neuron/population_machine_common.py +++ b/spynnaker/pyNN/models/neuron/population_machine_common.py @@ -13,6 +13,7 @@ # limitations under the License. from dataclasses import dataclass from spinn_utilities.overrides import overrides +from spinnman.model.enums import ExecutableType from pacman.model.graphs.machine import MachineVertex from spinn_front_end_common.interface.provenance import ( @@ -30,7 +31,6 @@ from spinn_front_end_common.interface.simulation.simulation_utilities import ( get_simulation_header_array) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spinn_front_end_common.interface.profiling import AbstractHasProfileData from spinn_front_end_common.utilities.constants import SIMULATION_N_BYTES diff --git a/spynnaker/pyNN/models/spike_source/spike_source_poisson_machine_vertex.py b/spynnaker/pyNN/models/spike_source/spike_source_poisson_machine_vertex.py index 1ef5e71971..eb612242eb 100644 --- a/spynnaker/pyNN/models/spike_source/spike_source_poisson_machine_vertex.py +++ b/spynnaker/pyNN/models/spike_source/spike_source_poisson_machine_vertex.py @@ -15,6 +15,7 @@ from enum import IntEnum import numpy +from spinnman.model.enums import ExecutableType from data_specification.enums import DataType from spinn_front_end_common.interface.buffer_management import ( recording_utilities) @@ -34,7 +35,6 @@ AbstractReceiveBuffersToHost) from spinn_front_end_common.utilities.helpful_functions import ( locate_memory_region_for_placement) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spinn_front_end_common.interface.profiling import ( AbstractHasProfileData, profile_utils) from spinn_front_end_common.interface.profiling.profile_utils import ( diff --git a/spynnaker/pyNN/models/utility_models/delays/delay_extension_machine_vertex.py b/spynnaker/pyNN/models/utility_models/delays/delay_extension_machine_vertex.py index dac8df5de9..7d8f9c81a7 100644 --- a/spynnaker/pyNN/models/utility_models/delays/delay_extension_machine_vertex.py +++ b/spynnaker/pyNN/models/utility_models/delays/delay_extension_machine_vertex.py @@ -13,6 +13,7 @@ # limitations under the License. from enum import Enum, IntEnum +from spinnman.model.enums import ExecutableType from spinn_front_end_common.interface.simulation import simulation_utilities from spinn_front_end_common.utilities.constants import SIMULATION_N_BYTES from spinn_utilities.overrides import overrides @@ -21,7 +22,6 @@ ProvidesProvenanceDataFromMachineImpl, ProvenanceWriter) from spinn_front_end_common.abstract_models import ( AbstractHasAssociatedBinary, AbstractGeneratesDataSpecification) -from spinn_front_end_common.utilities.utility_objs import ExecutableType from spynnaker.pyNN.data import SpynnakerDataView from spynnaker.pyNN.utilities.constants import SPIKE_PARTITION_ID