[yt-svn] commit/yt: xarthisius: Get rid of cython warnings
Bitbucket
commits-noreply at bitbucket.org
Thu Jul 12 14:16:33 PDT 2012
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/changeset/d2fc7a6bd11a/
changeset: d2fc7a6bd11a
branch: yt
user: xarthisius
date: 2012-07-12 22:55:09
summary: Get rid of cython warnings
affected #: 15 files
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
@@ -27,7 +27,7 @@
import os, sys
cimport numpy as np
cimport cython
-from stdlib cimport malloc
+from libc.stdlib cimport malloc
cdef import from "particle.h":
struct particle:
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/CICDeposit.pyx
--- a/yt/utilities/lib/CICDeposit.pyx
+++ b/yt/utilities/lib/CICDeposit.pyx
@@ -206,11 +206,12 @@
if i== -1: continue
#assigned to this subgrid
assigned = np.zeros(npart,dtype='int32')
- if (left_edges[i,0] <= pos_x[j] <= right_edges[i,0]):
- if (left_edges[i,1] <= pos_y[j] <= right_edges[i,1]):
- if (left_edges[i,2] <= pos_z[j] <= right_edges[i,2]):
- assigned[j]=1
- never_assigned[j]=0
+ for j in range(npart):
+ if (left_edges[i,0] <= pos_x[j] <= right_edges[i,0]):
+ if (left_edges[i,1] <= pos_y[j] <= right_edges[i,1]):
+ if (left_edges[i,2] <= pos_z[j] <= right_edges[i,2]):
+ assigned[j]=1
+ never_assigned[j]=0
if np.sum(assigned)>0:
recursive_particle_assignment(grids,grid,left_edges,right_edges,
pos_x[assigned],pos_y[assigned],pos_z[assigned])
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/ContourFinding.pyx
--- a/yt/utilities/lib/ContourFinding.pyx
+++ b/yt/utilities/lib/ContourFinding.pyx
@@ -26,7 +26,7 @@
import numpy as np
cimport numpy as np
cimport cython
-from stdlib cimport malloc, free
+from libc.stdlib cimport malloc, free
cdef extern from "math.h":
double fabs(double x)
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/Octree.pyx
--- a/yt/utilities/lib/Octree.pyx
+++ b/yt/utilities/lib/Octree.pyx
@@ -31,7 +31,7 @@
cimport cython
from fp_utils cimport imax, fmax, imin, fmin, iclip, fclip
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
import sys, time
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/QuadTree.pyx
--- a/yt/utilities/lib/QuadTree.pyx
+++ b/yt/utilities/lib/QuadTree.pyx
@@ -30,7 +30,7 @@
cimport numpy as cnp
cimport cython
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
from cython.operator cimport dereference as deref, preincrement as inc
from fp_utils cimport fmax
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/RayIntegrators.pyx
--- a/yt/utilities/lib/RayIntegrators.pyx
+++ b/yt/utilities/lib/RayIntegrators.pyx
@@ -26,7 +26,7 @@
import numpy as np
cimport numpy as np
cimport cython
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
cdef extern from "math.h":
double exp(double x)
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/VolumeIntegrator.pyx
--- a/yt/utilities/lib/VolumeIntegrator.pyx
+++ b/yt/utilities/lib/VolumeIntegrator.pyx
@@ -28,7 +28,7 @@
cimport cython
cimport kdtree_utils
cimport healpix_interface
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
cdef inline int imax(int i0, int i1):
if i0 > i1: return i0
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/fortran_reader.pyx
--- a/yt/utilities/lib/fortran_reader.pyx
+++ b/yt/utilities/lib/fortran_reader.pyx
@@ -27,7 +27,7 @@
cimport numpy as np
cimport cython
-from stdio cimport fopen, fclose, FILE
+from libc.stdio cimport fopen, fclose, FILE
cimport libc.stdlib as stdlib
#cdef inline int imax(int i0, int i1):
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/freetype_writer.pyx
--- a/yt/utilities/lib/freetype_writer.pyx
+++ b/yt/utilities/lib/freetype_writer.pyx
@@ -29,7 +29,7 @@
cdef int initialized = 0
-from stdio cimport fopen, fclose, FILE
+from libc.stdio cimport fopen, fclose, FILE
cdef extern from "freetype_includes.h":
# NOTE that size_t might not be int
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/geometry_utils.pyx
--- a/yt/utilities/lib/geometry_utils.pyx
+++ b/yt/utilities/lib/geometry_utils.pyx
@@ -26,7 +26,7 @@
import numpy as np
cimport numpy as np
cimport cython
-from stdlib cimport malloc, free
+from libc.stdlib cimport malloc, free
cdef extern from "math.h":
double exp(double x) nogil
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/grid_traversal.pyx
--- a/yt/utilities/lib/grid_traversal.pyx
+++ b/yt/utilities/lib/grid_traversal.pyx
@@ -28,7 +28,7 @@
cimport cython
cimport kdtree_utils
cimport healpix_interface
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
from fp_utils cimport imax, fmax, imin, fmin, iclip, fclip, i64clip
from field_interpolation_tables cimport \
FieldInterpolationTable, FIT_initialize_table, FIT_eval_transfer,\
@@ -725,8 +725,8 @@
def __dealloc__(self):
return
- free(self.vra.fits)
- free(self.vra)
+ #free(self.vra.fits)
+ #free(self.vra)
cdef class LightSourceRenderSampler(ImageSampler):
cdef VolumeRenderAccumulator *vra
@@ -784,10 +784,10 @@
def __dealloc__(self):
return
- free(self.vra.fits)
- free(self.vra)
- free(self.light_dir)
- free(self.light_rgba)
+ #free(self.vra.fits)
+ #free(self.vra)
+ #free(self.light_dir)
+ #free(self.light_rgba)
cdef class GridFace:
@@ -1136,11 +1136,11 @@
results[thetai, phii] = values[ipix]
count[i, j] += 1
return results, count
- for i in range(ntheta):
- for j in range(nphi):
- if count[i,j] > 0:
- results[i,j] /= count[i,j]
- return results, count
+ #for i in range(ntheta):
+ # for j in range(nphi):
+ # if count[i,j] > 0:
+ # results[i,j] /= count[i,j]
+ #return results, count
def healpix_aitoff_proj(np.ndarray[np.float64_t, ndim=1] pix_image,
long nside,
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/healpix_interface.pxd
--- a/yt/utilities/lib/healpix_interface.pxd
+++ b/yt/utilities/lib/healpix_interface.pxd
@@ -27,7 +27,7 @@
cimport numpy as np
cimport cython
-from stdio cimport fopen, fclose, FILE
+from libc.stdio cimport fopen, fclose, FILE
cdef extern from "healpix_vectors.h":
int pix2vec_nest(long nside, long ipix, double *v)
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/marching_cubes.pyx
--- a/yt/utilities/lib/marching_cubes.pyx
+++ b/yt/utilities/lib/marching_cubes.pyx
@@ -27,7 +27,7 @@
cimport cython
import numpy as np
from fp_utils cimport imax, fmax, imin, fmin, iclip, fclip
-from stdlib cimport malloc, free, abs
+from libc.stdlib cimport malloc, free, abs
from fixed_interpolator cimport *
cdef struct Triangle:
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/lib/png_writer.pyx
--- a/yt/utilities/lib/png_writer.pyx
+++ b/yt/utilities/lib/png_writer.pyx
@@ -31,7 +31,7 @@
from cpython.string cimport PyString_FromStringAndSize
from fp_utils cimport imax, fmax, imin, fmin, iclip, fclip
-from stdio cimport fopen, fclose, FILE
+from libc.stdio cimport fopen, fclose, FILE
cdef extern from "stdlib.h":
# NOTE that size_t might not be int
@@ -299,7 +299,7 @@
cdef int np = px.shape[0]
cdef int xs = buffer.shape[0]
cdef int ys = buffer.shape[1]
- cdef int v
+ cdef int v
v = iclip(<int>(pv * 255), 0, 255)
for pi in range(np):
j = <int> (xs * px[pi])
@@ -307,8 +307,8 @@
for k in range(3):
buffer[i, j, k] = 0
return
- for i in range(xs):
- for j in range(ys):
- for k in range(3):
- v = buffer[i, j, k]
- buffer[i, j, k] = iclip(v, 0, 255)
+ #for i in range(xs):
+ # for j in range(ys):
+ # for k in range(3):
+ # v = buffer[i, j, k]
+ # buffer[i, j, k] = iclip(v, 0, 255)
diff -r 0237664d430eb03b485c5157d7e25da0244a6fa6 -r d2fc7a6bd11a4d0a2fb930cf79b6125225beb595 yt/utilities/libconfig_wrapper.pyx
--- a/yt/utilities/libconfig_wrapper.pyx
+++ b/yt/utilities/libconfig_wrapper.pyx
@@ -24,7 +24,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from stdio cimport fopen, fclose, FILE
+from libc.stdio cimport fopen, fclose, FILE
cdef extern from "libconfig.h":
cdef struct config_t:
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.
More information about the yt-svn
mailing list