Updated to return the correct items from numpy

Updated version for pre-release
SpiNNakerManchester · Mar 19, 2015 · 9a658cd · 9a658cd
1 parent dba4acf
commit 9a658cd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pacman/model/routing_info/key_and_mask.py b/pacman/model/routing_info/key_and_mask.py
@@ -118,5 +118,5 @@ def get_keys(self, key_array=None, offset=0, n_keys=None):
                      .view(dtype="uint8"))[-len(zeros):]
             key[zeros] = unwrapped_value
             key_array[value + offset] = \
-                numpy.packbits(key).view(dtype=">u4")[0]
+                numpy.packbits(key).view(dtype=">u4")[0].item()
         return key_array, n_keys
diff --git a/pacman/model/routing_info/subedge_routing_info.py b/pacman/model/routing_info/subedge_routing_info.py
@@ -50,7 +50,7 @@ def get_keys(self, n_keys=None):
             for key_and_mask in self._keys_and_masks:
                 n_keys += key_and_mask.n_keys
 
-        key_array = numpy.zeros(n_keys, dtype="<u4")
+        key_array = numpy.zeros(n_keys, dtype=">u4")
         offset = 0
         for key_and_mask in self._keys_and_masks:
             _, offset = key_and_mask.get_keys(

diff --git a/pacman/utilities/utility_calls.py b/pacman/utilities/utility_calls.py
@@ -208,7 +208,7 @@ def compress_from_bit_array(bit_array):
     :type bit_array: [uint8]
     :rtype: int
     """
-    return numpy.packbits(bit_array).view(dtype=">u4")[0]
+    return numpy.packbits(bit_array).view(dtype=">u4")[0].item()
 
 
 def compress_bits_from_bit_array(bit_array, bit_positions):

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="SpiNNaker_PACMAN",
-    version="2015.003-alpha-02",
+    version="2015.003-alpha-03",
     description="Partition and Configuration Manager",
     url="https://github.com/SpiNNakerManchester/PACMAN",
     license="GNU GPLv3.0",