Merge pull request #463 from SpiNNakerManchester/extdev_fpgas

Extdev fpgas
SpiNNakerManchester · Sep 8, 2022 · 648e22b · 648e22b
2 parents 85394e2 + 8e291df
commit 648e22b
Show file tree

Hide file tree

Showing 46 changed files with 1,572 additions and 837 deletions.
diff --git a/pacman/model/constraints/key_allocator_constraints/__init__.py b/pacman/model/constraints/key_allocator_constraints/__init__.py
diff --git a/pacman/model/constraints/key_allocator_constraints/contiguous_key_range_constraint.py b/pacman/model/constraints/key_allocator_constraints/contiguous_key_range_constraint.py
diff --git a/pacman/model/constraints/key_allocator_constraints/fixed_key_and_mask_constraint.py b/pacman/model/constraints/key_allocator_constraints/fixed_key_and_mask_constraint.py
diff --git a/pacman/model/constraints/partitioner_constraints/__init__.py b/pacman/model/constraints/partitioner_constraints/__init__.py
diff --git a/pacman/model/constraints/partitioner_constraints/abstract_partitioner_constraint.py b/pacman/model/constraints/partitioner_constraints/abstract_partitioner_constraint.py
diff --git a/pacman/model/graphs/__init__.py b/pacman/model/graphs/__init__.py
@@ -14,17 +14,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .abstract_edge import AbstractEdge
-from .abstract_fpga import AbstractFPGA
 from .abstract_vertex import AbstractVertex
 from .abstract_virtual import AbstractVirtual
-from .abstract_spinnaker_link import AbstractSpiNNakerLink
 from .abstract_edge_partition import AbstractEdgePartition
 from .abstract_multiple_partition import AbstractMultiplePartition
 from .abstract_single_source_partition import AbstractSingleSourcePartition
 from .abstract_supports_sdram_edges import AbstractSupportsSDRAMEdges
 
 __all__ = [
-    "AbstractEdge", "AbstractEdgePartition", "AbstractFPGA",
+    "AbstractEdge", "AbstractEdgePartition",
     "AbstractMultiplePartition", "AbstractSingleSourcePartition",
-    "AbstractSpiNNakerLink", "AbstractSupportsSDRAMEdges", "AbstractVertex",
+    "AbstractSupportsSDRAMEdges", "AbstractVertex",
     "AbstractVirtual"]
diff --git a/pacman/model/graphs/abstract_fpga.py b/pacman/model/graphs/abstract_fpga.py
diff --git a/pacman/model/graphs/abstract_spinnaker_link.py b/pacman/model/graphs/abstract_spinnaker_link.py
diff --git a/pacman/model/graphs/abstract_virtual.py b/pacman/model/graphs/abstract_virtual.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from spinn_utilities.abstract_base import abstractproperty
+from spinn_utilities.abstract_base import abstractmethod, abstractproperty
 from spinn_utilities.require_subclass import require_subclass
 from pacman.model.graphs.abstract_vertex import AbstractVertex
 
@@ -32,8 +32,47 @@ class AbstractVirtual(object):
 
     @abstractproperty
     def board_address(self):
-        """ The IP address of the board to which the device is connected,\
-            or ``None`` for the boot board.
+        """ The IP address of the board to which the device is connected,
+            or ``None`` for the boot board, or when using linked chip
+            coordinates.
 
-        :rtype: str
+        :rtype: str or None
+        """
+
+    @abstractproperty
+    def linked_chip_coordinates(self):
+        """ The coordinates of the chip to which the device is connected,
+            or ``None`` for the boot board, or when using a board address.
+
+        :rtype: tuple(int, int) or None
+        """
+
+    @abstractmethod
+    def outgoing_keys_and_masks(self):
+        """ Get the keys sent by the device or None if there aren't any
+            explicitly defined.
+
+        :rtype: list of KeyAndMask or None
+        """
+
+    @abstractproperty
+    def incoming(self):
+        """ Indicates if this device sends traffic into SpiNNaker
+
+        :rtype: bool
+        """
+
+    @abstractproperty
+    def outgoing(self):
+        """ Indicates if this device receives traffic from SpiNNaker
+
+        :rtype: bool
+        """
+
+    @abstractmethod
+    def get_link_data(self, machine):
+        """ Get link data from the machine
+
+        :param Machine machine: The machine to get the data from
+        :rtype: AbstractLinkData
         """
diff --git a/pacman/model/graphs/application/__init__.py b/pacman/model/graphs/application/__init__.py
@@ -19,7 +19,16 @@
 from .application_spinnaker_link_vertex import ApplicationSpiNNakerLinkVertex
 from .application_vertex import ApplicationVertex
 from .application_edge_partition import ApplicationEdgePartition
+from .fpga_connection import FPGAConnection
+from .application_2d_fpga_vertex import Application2DFPGAVertex
+from .application_2d_spinnaker_link_vertex import (
+    Application2DSpiNNakerLinkVertex)
+from .application_virtual_vertex import ApplicationVirtualVertex
+
 
 __all__ = ["ApplicationEdge", "ApplicationEdgePartition",
            "ApplicationFPGAVertex", "ApplicationGraph",
-           "ApplicationSpiNNakerLinkVertex", "ApplicationVertex"]
+           "ApplicationSpiNNakerLinkVertex", "ApplicationVertex",
+           "FPGAConnection", "Application2DFPGAVertex",
+           "Application2DSpiNNakerLinkVertex",
+           "ApplicationVirtualVertex"]
diff --git a/pacman/model/graphs/application/abstract/__init__.py b/pacman/model/graphs/application/abstract/__init__.py
@@ -14,5 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .abstract_one_app_one_machine_vertex import AbstractOneAppOneMachineVertex
+from .abstract_2d_device_vertex import Abstract2DDeviceVertex
 
-__all__ = ["AbstractOneAppOneMachineVertex"]
+__all__ = ["AbstractOneAppOneMachineVertex", "Abstract2DDeviceVertex"]