Merge pull request #1352 from SpiNNakerManchester/ds_rework

Ds rework
SpiNNakerManchester · Jun 20, 2023 · 1de7600 · 1de7600
2 parents a0c24a3 + af6195d
commit 1de7600
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 441 deletions.
diff --git a/spynnaker/pyNN/extra_algorithms/splitter_components/__init__.py b/spynnaker/pyNN/extra_algorithms/splitter_components/__init__.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from .abstract_spynnaker_splitter_delay import AbstractSpynnakerSplitterDelay
-from .spynnaker_splitter_partitioner import spynnaker_splitter_partitioner
 from .spynnaker_splitter_selector import spynnaker_splitter_selector
 from .splitter_abstract_pop_vertex_fixed import (
     SplitterAbstractPopulationVertexFixed)
@@ -26,8 +25,7 @@
 
 __all__ = [
     'AbstractSpynnakerSplitterDelay', 'SplitterAbstractPopulationVertexFixed',
-    'SplitterDelayVertexSlice', 'spynnaker_splitter_partitioner',
-    'spynnaker_splitter_selector',
+    'SplitterDelayVertexSlice', 'spynnaker_splitter_selector',
     'SplitterAbstractPopulationVertexNeuronsSynapses',
     'SplitterPoissonDelegate', 'AbstractSupportsOneToOneSDRAMInput',
     'SplitterAbstractPopulationVertexFixed']
diff --git a/...yNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_neurons_synapses.py b/...yNN/extra_algorithms/splitter_components/splitter_abstract_pop_vertex_neurons_synapses.py
@@ -25,8 +25,8 @@
     MulticastEdgePartition)
 from pacman.utilities.algorithm_utilities.partition_algorithm_utilities \
     import get_multidimensional_slices
-from data_specification.reference_context import ReferenceContext
 from spinn_front_end_common.utilities.constants import BYTES_PER_WORD
+from spynnaker.pyNN.data import SpynnakerDataView
 from spynnaker.pyNN.models.neuron import (
     PopulationNeuronsMachineVertex, PopulationSynapsesMachineVertexLead,
     PopulationSynapsesMachineVertexShared, NeuronProvenance, SynapseProvenance,
@@ -373,7 +373,8 @@ def __add_lead_synapse_core(
             synapse core, and the basic label for the synapse cores
         :rtype: tuple(SynapseRegions, str)
         """
-        synapse_references = self.__synapse_references
+        synapse_references = SynapseRegions(
+            *SpynnakerDataView.get_next_ds_references(7))
         syn_label = (
             f"{label}_Synapses:{vertex_slice.lo_atom}-{vertex_slice.hi_atom}")
 
@@ -652,19 +653,6 @@ def n_synapse_vertices(self):
         """
         return self.__n_synapse_vertices
 
-    @property
-    def __synapse_references(self):
-        """
-        The reference identifiers for the shared synapse regions.
-
-        :rtype: SynapseRegions
-        """
-        references = [
-            ReferenceContext.next()
-            for _ in range(
-                len(PopulationSynapsesMachineVertexLead.SYNAPSE_REGIONS))]
-        return SynapseRegions(*references)
-
     def __get_neuron_sdram(self, n_atoms, sdram_edge_sdram):
         """
         Gets the resources of the neurons of a slice of atoms from a given

diff --git a/spynnaker/pyNN/extra_algorithms/splitter_components/spynnaker_splitter_partitioner.py b/spynnaker/pyNN/extra_algorithms/splitter_components/spynnaker_splitter_partitioner.py
diff --git a/spynnaker/pyNN/models/neural_properties/__init__.py b/spynnaker/pyNN/models/neural_properties/__init__.py
diff --git a/spynnaker/pyNN/models/neural_properties/neural_parameter.py b/spynnaker/pyNN/models/neural_properties/neural_parameter.py
diff --git a/spynnaker/pyNN/spinnaker.py b/spynnaker/pyNN/spinnaker.py
@@ -48,7 +48,7 @@
 from spynnaker.pyNN.extra_algorithms.connection_holder_finisher import (
     finish_connection_holders)
 from spynnaker.pyNN.extra_algorithms.splitter_components import (
-    spynnaker_splitter_partitioner, spynnaker_splitter_selector)
+    spynnaker_splitter_selector)
 from spynnaker.pyNN.utilities import constants
 from spynnaker.pyNN.utilities.neo_buffer_database import NeoBufferDatabase
 from spynnaker.pyNN.utilities.utility_calls import (
@@ -503,14 +503,6 @@ def _execute_delay_support_adder(self):
             raise ConfigurationException(
                 f"Unexpected cfg setting delay_support_adder: {name}")
 
-    @overrides(AbstractSpinnakerBase._execute_splitter_partitioner)
-    def _execute_splitter_partitioner(self):
-        if self._data_writer.get_n_vertices() == 0:
-            return
-        with FecTimer("SpynnakerSplitterPartitioner", TimerWork.OTHER):
-            n_chips_in_graph = spynnaker_splitter_partitioner()
-            self._data_writer.set_n_chips_in_graph(n_chips_in_graph)
-
     @overrides(AbstractSpinnakerBase._execute_buffer_extractor)
     def _execute_buffer_extractor(self):
         super()._execute_buffer_extractor()