release-script: Merge branch 'release/v1.13.2'

PyCOMPLETE · Jul 5, 2019 · 63a7235 · 63a7235
2 parents bfb793e + 70dcb2e
commit 63a7235
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/PyHEADTAIL/_version.py b/PyHEADTAIL/_version.py
@@ -1 +1 @@
-__version__ = '1.13.1'
+__version__ = '1.13.2'
diff --git a/PyHEADTAIL/aperture/aperture.py b/PyHEADTAIL/aperture/aperture.py
@@ -19,7 +19,6 @@
 import numpy as np
 
 def make_int32(array):
-    # return np.array(array, dtype=np.int32)
     return array.astype(np.int32)
 
 
@@ -89,8 +88,9 @@ def relocate_lost_particles(beam, alive):
 
         beam.reorder(perm)
 
-        n_alive = make_int32(pm.sum(alive))
-        return n_alive
+        # on CPU: (even if pm.device == 'GPU', as pm.sum returns np.ndarray)
+        n_alive = pm.sum(alive)
+        return np.int32(n_alive)
 
 
 class RectangularApertureX(Aperture):