Merge branch 'master' into interdimensional_compatibility

.github/workflows/python_actions.yml

@@ -48,7 +48,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories:
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
         install: true
 
     - name: Setup
@@ -95,7 +95,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories:
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
         install: true
     - name: Setup
       uses: ./support/actions/run-install

.ratexcludes

@@ -15,5 +15,4 @@
 **/SpiNNMachine/**
 **/SpiNNMan/**
 **/PACMAN/**
-**/DataSpecification/**
 **/spalloc/**

README.md

@@ -16,15 +16,14 @@ In addition to a standard Python installation, this package depends on:
     numpy
     SpiNNUtilities
     SpiNNMachine
-    DataSpecification
     PACMAN
     SpiNNMan
     spalloc
 
 These dependencies can be installed using `pip`:
 
     pip install numpy
-    pip install SpiNNUtilities SpiNNMachine DataSpecification PACMAN SpiNNMan spalloc
+    pip install SpiNNUtilities SpiNNMachine PACMAN SpiNNMan spalloc
 
 If you want to use the `spinnaker_router_provenance_mapper` command line tool
 to visualise the traffic on SpiNNaker boards caused by your simulations, you

doc/doc_requirements.txt

@@ -16,5 +16,4 @@
 -e git+https://github.com/SpiNNakerManchester/SpiNNMachine.git@master#egg=SpiNNMachine
 -e git+https://github.com/SpiNNakerManchester/SpiNNMan.git@master#egg=spinnman
 -e git+https://github.com/SpiNNakerManchester/PACMAN.git@master#egg=spinnaker-pacman
--e git+https://github.com/SpiNNakerManchester/DataSpecification.git@master#egg=spinnaker-dataspecification
 -e git+https://github.com/SpiNNakerManchester/spalloc.git@master#egg=spalloc

pypi_to_import

@@ -1,5 +1,4 @@
 SpiNNUtilities:spinn_utilities
 SpiNNMachine:spinn_machine
 SpiNNMan:spinnman
-SpiNNaker_PACMAN:pacman
-SpiNNaker_DataSpecification:data_specification
+SpiNNaker_PACMAN:pacman

setup.cfg

@@ -48,7 +48,6 @@ include_package_data = True
 install_requires =
         SpiNNMan == 1!6.0.1
         SpiNNaker_PACMAN == 1!6.0.1
-        SpiNNaker_DataSpecification == 1!6.0.1
         spalloc == 1!6.0.1
         scipy >= 0.16.0
 

spinn_front_end_common/abstract_models/abstract_generates_data_specification.py

@@ -14,10 +14,10 @@
 
 from spinn_utilities.abstract_base import AbstractBase, abstractmethod
 from spinn_utilities.require_subclass import require_subclass
-from pacman.model.graphs.machine import MachineVertex
+from .abstract_has_associated_binary import AbstractHasAssociatedBinary
 
 
-@require_subclass(MachineVertex)
+@require_subclass(AbstractHasAssociatedBinary)
 class AbstractGeneratesDataSpecification(object, metaclass=AbstractBase):
 
     __slots__ = ()

spinn_front_end_common/abstract_models/abstract_rewrites_data_specification.py

@@ -14,10 +14,11 @@
 
 from spinn_utilities.abstract_base import AbstractBase, abstractmethod
 from spinn_utilities.require_subclass import require_subclass
-from pacman.model.graphs.machine import MachineVertex
+from .abstract_generates_data_specification import (
+    AbstractGeneratesDataSpecification)
 
 
-@require_subclass(MachineVertex)
+@require_subclass(AbstractGeneratesDataSpecification)
 class AbstractRewritesDataSpecification(object, metaclass=AbstractBase):
     """
     Indicates an object that allows data to be changed after run,

spinn_front_end_common/data/fec_data_view.py

@@ -70,6 +70,7 @@ class _FecDataModel(object):
         "_n_chips_required",
         "_n_chips_in_graph",
         "_next_sync_signal",
+        "_next_ds_reference",
         "_none_labelled_edge_count",
         "_notification_protocol",
         "_max_run_time_steps",
@@ -133,6 +134,7 @@ def _hard_reset(self):
         self._data_in_multicast_routing_tables = None
         self._database_file_path = None
         self._dsg_targets = None
+        self._next_ds_reference = 0
         self._executable_targets = None
         self._fixed_routes = None
         self._gatherer_map = None
@@ -1190,3 +1192,18 @@ def iterate_live_output_vertices(cls):
             str))
         """
         return iter(cls.__fec_data._live_output_vertices)
+
+    @classmethod
+    def get_next_ds_references(cls, number):
+        """
+        Get a a list of unigue ds references
+
+        These will be Unigue since the last hard reset
+
+        :param number: number of values in the list
+        :rtype: list(inrt)
+        """
+        references = range(cls.__fec_data._next_ds_reference,
+                           cls.__fec_data._next_ds_reference+number)
+        cls.__fec_data._next_ds_reference += number
+        return list(references)

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -37,8 +37,6 @@
 from spinnman.model.cpu_infos import CPUInfos
 from spinnman.model.enums import CPUState, ExecutableType
 
-from data_specification import __version__ as data_spec_version
-
 from spalloc_client import __version__ as spalloc_version
 
 from pacman import __version__ as pacman_version
@@ -763,7 +761,6 @@ def _create_version_provenance(self):
             db.insert_version("spalloc_version", spalloc_version)
             db.insert_version("spinnman_version", spinnman_version)
             db.insert_version("pacman_version", pacman_version)
-            db.insert_version("data_specification_version", data_spec_version)
             db.insert_version("front_end_common_version", fec_version)
             db.insert_version("numpy_version", numpy_version)
             db.insert_version("scipy_version", scipy_version)

spinn_front_end_common/interface/buffer_management/buffer_manager.py

@@ -21,8 +21,8 @@
 from spinnman.messages.eieio.command_messages import EventStopRequest
 from spinnman.messages.eieio import EIEIOType
 from spinnman.messages.eieio.data_messages import EIEIODataMessage
-from data_specification.constants import BYTES_PER_WORD
 from spinn_front_end_common.data import FecDataView
+from spinn_front_end_common.utilities.constants import BYTES_PER_WORD
 from spinn_front_end_common.utilities.exceptions import (
     BufferableRegionTooSmall, SpinnFrontEndException)
 from spinn_front_end_common.utilities.helpful_functions import (

spinn_front_end_common/interface/config_setup.py

@@ -17,7 +17,6 @@
     add_default_cfg, clear_cfg_files)
 from spinnman.config_setup import add_spinnman_cfg
 from pacman.config_setup import add_pacman_cfg
-from data_specification.config_setup import add_data_specification_cfg
 from spinn_front_end_common.data.fec_data_writer import FecDataWriter
 
 BASE_CONFIG_FILE = "spinnaker.cfg"
@@ -46,5 +45,4 @@ def add_spinnaker_cfg():
     """
     add_pacman_cfg()  # This add its dependencies too
     add_spinnman_cfg()  # double adds of dependencies ignored
-    add_data_specification_cfg()  # double adds of dependencies ignored
     add_default_cfg(os.path.join(os.path.dirname(__file__), BASE_CONFIG_FILE))

spinn_front_end_common/interface/ds/__init__.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from .data_specification_generator import DataSpecificationGenerator
+from .data_specification_reloader import DataSpecificationReloader
+from .data_type import DataType
 from .ds_sqllite_database import DsSqlliteDatabase
-from .data_row_writer import DataRowWriter
 
 __all__ = [
-    "DataRowWriter",
-    "DsSqlliteDatabase"]
+    "DataSpecificationGenerator", "DataSpecificationReloader",
+    "DataType", "DsSqlliteDatabase"]