From: Debian Astronomy Team <debian-astro-maintainers@lists.alioth.debian.org>
Date: Tue, 24 Oct 2017 16:11:30 +0000 (+0100)
Subject: fix_32bit_ftbfs
X-Git-Tag: archive/raspbian/3.4.0-3+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2000ad9c37b9a436396b8155ebea8f6fa02e9392;p=yt.git

fix_32bit_ftbfs


Gbp-Pq: Name fix_32bit_ftbfs.patch
---

diff --git a/yt/utilities/lib/alt_ray_tracers.pyx b/yt/utilities/lib/alt_ray_tracers.pyx
index d59e524..26eafb8 100644
--- a/yt/utilities/lib/alt_ray_tracers.pyx
+++ b/yt/utilities/lib/alt_ray_tracers.pyx
@@ -101,7 +101,7 @@ def cylindrical_ray_trace(np.ndarray[np.float64_t, ndim=1] p1,
                                           rleft, rright, zleft, zright, \
                                           cleft, cright, thetaleft, thetaright, \
                                           tmleft, tpleft, tmright, tpright, tsect
-    cdef np.ndarray[np.int64_t, ndim=1, cast=True] inds, tinds, sinds
+    cdef np.ndarray[np.int_t, ndim=1, cast=True] inds, tinds, sinds
     cdef np.ndarray[np.float64_t, ndim=2] xyz, rztheta, ptemp, b1, b2, dsect
 
     # set up  points
@@ -201,12 +201,12 @@ def cylindrical_ray_trace(np.ndarray[np.float64_t, ndim=1] p1,
     tsect, dsect = _cart_intersect(p1cart, p2cart, _cyl2cart(b1), _cyl2cart(b2))
     tmask = np.logical_and(0.0<=tsect, tsect<=1.0)
     ret = np.unique(tsect[tmask], return_index=True)
-    tsect, tinds = ret[0], ret[1].astype('int64')
+    tsect, tinds = ret[0], ret[1].astype('int')
     inds = inds[tmask][tinds]
     xyz = dsect[tmask][tinds]
     s = np.sqrt(((xyz - p1cart) * (xyz - p1cart)).sum(axis=1))
     ret = np.unique(s, return_index=True)
-    s, sinds = ret[0], ret[1].astype('int64')
+    s, sinds = ret[0], ret[1].astype('int')
     inds = inds[sinds]
     xyz = xyz[sinds]
     t = s/np.sqrt((dpcart*dpcart).sum())
diff --git a/yt/utilities/lib/misc_utilities.pyx b/yt/utilities/lib/misc_utilities.pyx
index a15b413..d7b10d0 100644
--- a/yt/utilities/lib/misc_utilities.pyx
+++ b/yt/utilities/lib/misc_utilities.pyx
@@ -437,7 +437,7 @@ def zpoints(np.ndarray[np.float64_t, ndim=3] image,
     cdef np.float64_t z0
     alpha = np.zeros(4)
     #the sources must be ordered along z to avoid edges when two overlap
-    idx = np.argsort(zs)
+    idx = np.asarray(np.argsort(zs), dtype='int64')
     for j in idx:
         r = radii[j]
         r2 = int((r+0.3)*(r+0.3))  #0.3 to get nicer shape