[yt-svn] commit/yt: ngoldbaum: Merged in bwkeller/yt (pull request #2509)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/af611d562391/
Changeset:   af611d562391
Branch:      yt
User:        ngoldbaum
Date:        2017-03-16 21:01:15+00:00
Summary:     Merged in bwkeller/yt (pull request #2509)

32 bit build issues

Approved-by: yt-fido
Approved-by: Nathan Goldbaum
Approved-by: Kacper Kowalik
Affected #:  5 files

diff -r 43cf425039774e6d6997022a8eaeef86358df77d -r af611d5623911feff3d7c03e72ff5f5163f2497b yt/geometry/grid_container.pyx
--- a/yt/geometry/grid_container.pyx
+++ b/yt/geometry/grid_container.pyx
@@ -63,9 +63,9 @@
                   np.ndarray[np.int64_t, ndim=1] num_children):
 
         cdef int i, j, k
-        cdef np.ndarray[np.int64_t, ndim=1] child_ptr
+        cdef np.ndarray[np.int_t, ndim=1] child_ptr
 
-        child_ptr = np.zeros(num_grids, dtype='int64')
+        child_ptr = np.zeros(num_grids, dtype='int')
 
         self.num_grids = num_grids
         self.num_root_grids = 0

diff -r 43cf425039774e6d6997022a8eaeef86358df77d -r af611d5623911feff3d7c03e72ff5f5163f2497b yt/geometry/grid_visitors.pxd
--- a/yt/geometry/grid_visitors.pxd
+++ b/yt/geometry/grid_visitors.pxd
@@ -37,7 +37,7 @@
     np.float64_t right_edge_x
     np.float64_t right_edge_y
     np.float64_t right_edge_z
-    np.int64_t children_pointers
+    np.int_t children_pointers
     np.int64_t start_index_x
     np.int64_t start_index_y
     np.int64_t start_index_z

diff -r 43cf425039774e6d6997022a8eaeef86358df77d -r af611d5623911feff3d7c03e72ff5f5163f2497b yt/geometry/particle_smooth.pyx
--- a/yt/geometry/particle_smooth.pyx
+++ b/yt/geometry/particle_smooth.pyx
@@ -314,8 +314,7 @@
         # Note that what we will be providing to our processing functions will
         # actually be indirectly-sorted fields.  This preserves memory at the
         # expense of additional pointer lookups.
-        pind = np.argsort(pdoms)
-        pind = np.asarray(pind, dtype='int64', order='C')
+        pind = np.asarray(np.argsort(pdoms), dtype='int64', order='C')
         # So what this means is that we now have all the oct-0 particle indices
         # in order, then the oct-1, etc etc.
         # This now gives us the indices to the particles for each domain.

diff -r 43cf425039774e6d6997022a8eaeef86358df77d -r af611d5623911feff3d7c03e72ff5f5163f2497b yt/utilities/lib/alt_ray_tracers.pyx
--- a/yt/utilities/lib/alt_ray_tracers.pyx
+++ b/yt/utilities/lib/alt_ray_tracers.pyx
@@ -101,7 +101,7 @@
                                           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

diff -r 43cf425039774e6d6997022a8eaeef86358df77d -r af611d5623911feff3d7c03e72ff5f5163f2497b yt/utilities/lib/pixelization_routines.pyx
--- a/yt/utilities/lib/pixelization_routines.pyx
+++ b/yt/utilities/lib/pixelization_routines.pyx
@@ -244,7 +244,7 @@
                        np.float64_t[:] pdz,
                        np.float64_t[:] center,
                        np.float64_t[:,:] inv_mat,
-                       np.int64_t[:] indices,
+                       np.int_t[:] indices,
                        np.float64_t[:] data,
                        bounds):
     cdef np.float64_t x_min, x_max, y_min, y_max

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.