diff --git a/spynnaker/pyNN/external_devices/__init__.py b/spynnaker/pyNN/external_devices/__init__.py index ef9b1d78c55..7ef1c59d269 100644 --- a/spynnaker/pyNN/external_devices/__init__.py +++ b/spynnaker/pyNN/external_devices/__init__.py @@ -30,7 +30,7 @@ LivePacketGatherParameters) from spynnaker.pyNN.external_devices_models import ( AbstractEthernetController, AbstractEthernetSensor, - ArbitraryFPGADevice, ExternalCochleaDevice, ExternalFPGARetinaDevice, + ArbitraryFPGADevice, ExternalFPGARetinaDevice, MunichMotorDevice, MunichRetinaDevice, ExternalDeviceLifControl, SPIFRetinaDevice, ICUBRetinaDevice, SPIFOutputDevice, SPIFInputDevice) from spynnaker.pyNN import model_binaries @@ -80,7 +80,7 @@ "EIEIOType", # General Devices - "ExternalCochleaDevice", "ExternalFPGARetinaDevice", + "ExternalFPGARetinaDevice", "MunichRetinaDevice", "MunichMotorDevice", "ArbitraryFPGADevice", "PushBotRetinaViewer", "ExternalDeviceLifControl", "SPIFRetinaDevice", "ICUBRetinaDevice", "SPIFOutputDevice", "SPIFInputDevice", diff --git a/spynnaker/pyNN/external_devices_models/__init__.py b/spynnaker/pyNN/external_devices_models/__init__.py index a921a707960..671bec8bf91 100644 --- a/spynnaker/pyNN/external_devices_models/__init__.py +++ b/spynnaker/pyNN/external_devices_models/__init__.py @@ -19,7 +19,6 @@ AbstractMulticastControllableDevice, SendType) from .arbitrary_fpga_device import ArbitraryFPGADevice from .external_device_lif_control import ExternalDeviceLifControl -from .external_spinnaker_link_cochlea_device import ExternalCochleaDevice from .external_spinnaker_link_fpga_retina_device import ( ExternalFPGARetinaDevice) from .machine_munich_motor_device import MachineMunichMotorDevice @@ -35,8 +34,7 @@ __all__ = ["AbstractEthernetController", "AbstractEthernetSensor", "AbstractEthernetTranslator", "ArbitraryFPGADevice", "AbstractMulticastControllableDevice", "ExternalDeviceLifControl", - "ExternalCochleaDevice", "ExternalFPGARetinaDevice", - "MachineMunichMotorDevice", + "ExternalFPGARetinaDevice", "MachineMunichMotorDevice", "MunichMotorDevice", "MunichRetinaDevice", "SendType", "ThresholdTypeMulticastDeviceControl", "SPIFRetinaDevice", "ICUBRetinaDevice", "SPIFOutputDevice", "SPIFInputDevice"] diff --git a/spynnaker/pyNN/external_devices_models/external_spinnaker_link_cochlea_device.py b/spynnaker/pyNN/external_devices_models/external_spinnaker_link_cochlea_device.py deleted file mode 100644 index 0e146489e20..00000000000 --- a/spynnaker/pyNN/external_devices_models/external_spinnaker_link_cochlea_device.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2017 The University of Manchester -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -from typing import Optional -from pacman.model.graphs.application import ApplicationSpiNNakerLinkVertex -from spynnaker.pyNN.models.common import PopulationApplicationVertex - - -class ExternalCochleaDevice( - ApplicationSpiNNakerLinkVertex, PopulationApplicationVertex): - """ - An ear vertex. - """ - __slots__ = () - - def __init__( - self, n_neurons: int, spinnaker_link: int, - label: Optional[str] = None, board_address: Optional[str] = None): - """ - :param int n_neurons: Number of neurons - :param int spinnaker_link: - The SpiNNaker link to which the cochlea is connected - :param str label: - :param str board_address: - """ - super().__init__( - n_atoms=n_neurons, spinnaker_link_id=spinnaker_link, - label=label, board_address=board_address)