Merge branch 'master' into boot_port_no

spinnman/exceptions.py

@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import traceback
-from collections import OrderedDict
 
 
 class SpinnmanException(Exception):
@@ -250,7 +249,7 @@ def group_exceptions(error_requests, exceptions, tracebacks, connections):
         :return: a sorted exception pile
         :rtype: dict(Exception,_Group)
         """
-        data = OrderedDict()
+        data = dict()
         for error_request, exception, trace_back, connection in zip(
                 error_requests, exceptions, tracebacks, connections):
             for stored_exception in data.keys():

spinnman/model/cpu_infos.py

@@ -13,8 +13,6 @@
 # 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 collections import OrderedDict
-
 
 class CPUInfos(object):
     """ A set of CPU information objects.
@@ -23,7 +21,7 @@ class CPUInfos(object):
         "_cpu_infos"]
 
     def __init__(self):
-        self._cpu_infos = OrderedDict()
+        self._cpu_infos = dict()
 
     def add_processor(self, x, y, processor_id, cpu_info):
         """ Add a processor on a given chip to the set.

spinnman/processes/read_iobuf_process.py

@@ -15,7 +15,7 @@
 
 import functools
 import struct
-from collections import defaultdict, OrderedDict
+from collections import defaultdict
 from spinnman.model import IOBuffer
 from spinnman.utilities.utility_functions import get_vcpu_address
 from spinnman.messages.scp.impl import ReadMemory
@@ -50,10 +50,10 @@ def __init__(self, connection_selector):
         self._iobuf_address = dict()
 
         # A dictionary of (x, y, p) -> OrderedDict(n) -> bytearray
-        self._iobuf = defaultdict(OrderedDict)
+        self._iobuf = defaultdict(dict)
 
         # A dictionary of (x, y, p) -> OrderedDict(n) -> memoryview
-        self._iobuf_view = defaultdict(OrderedDict)
+        self._iobuf_view = defaultdict(dict)
 
         # A list of extra reads that need to be done as a result of the first
         # read = list of (x, y, p, n, base_address, size, offset)