[yt-svn] commit/yt: atmyers: remove inline keywords from intersection functions
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon May 16 14:34:14 PDT 2016
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/06b1bf872faa/
Changeset: 06b1bf872faa
Branch: yt
User: atmyers
Date: 2016-05-16 18:02:07+00:00
Summary: remove inline keywords from intersection functions
Affected #: 2 files
diff -r 8d076b60c7dacde1de17041f79ff1a6bd0c3ea8e -r 06b1bf872faa352183a5f8ec91d72937b9c43523 yt/utilities/lib/primitives.pxd
--- a/yt/utilities/lib/primitives.pxd
+++ b/yt/utilities/lib/primitives.pxd
@@ -32,17 +32,17 @@
cdef np.int64_t ray_bbox_intersect(Ray* ray, const BBox bbox) nogil
-cdef inline np.int64_t ray_triangle_intersect(const void* primitives,
- const np.int64_t item,
- Ray* ray) nogil
+cdef np.int64_t ray_triangle_intersect(const void* primitives,
+ const np.int64_t item,
+ Ray* ray) nogil
-cdef inline void triangle_centroid(const void *primitives,
- const np.int64_t item,
- np.float64_t[3] centroid) nogil
+cdef void triangle_centroid(const void *primitives,
+ const np.int64_t item,
+ np.float64_t[3] centroid) nogil
-cdef inline void triangle_bbox(const void *primitives,
- const np.int64_t item,
- BBox* bbox) nogil
+cdef void triangle_bbox(const void *primitives,
+ const np.int64_t item,
+ BBox* bbox) nogil
cdef struct Patch:
np.float64_t[8][3] v # 8 vertices per patch
@@ -67,14 +67,14 @@
cython.floating[3] ray_origin,
cython.floating[3] ray_direction) nogil
-cdef inline np.int64_t ray_patch_intersect(const void* primitives,
- const np.int64_t item,
- Ray* ray) nogil
+cdef np.int64_t ray_patch_intersect(const void* primitives,
+ const np.int64_t item,
+ Ray* ray) nogil
-cdef inline void patch_centroid(const void *primitives,
- const np.int64_t item,
- np.float64_t[3] centroid) nogil
+cdef void patch_centroid(const void *primitives,
+ const np.int64_t item,
+ np.float64_t[3] centroid) nogil
-cdef inline void patch_bbox(const void *primitives,
- const np.int64_t item,
- BBox* bbox) nogil
+cdef void patch_bbox(const void *primitives,
+ const np.int64_t item,
+ BBox* bbox) nogil
diff -r 8d076b60c7dacde1de17041f79ff1a6bd0c3ea8e -r 06b1bf872faa352183a5f8ec91d72937b9c43523 yt/utilities/lib/primitives.pyx
--- a/yt/utilities/lib/primitives.pyx
+++ b/yt/utilities/lib/primitives.pyx
@@ -35,9 +35,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline np.int64_t ray_triangle_intersect(const void* primitives,
- const np.int64_t item,
- Ray* ray) nogil:
+cdef np.int64_t ray_triangle_intersect(const void* primitives,
+ const np.int64_t item,
+ Ray* ray) nogil:
# https://en.wikipedia.org/wiki/M%C3%B6ller%E2%80%93Trumbore_intersection_algorithm
cdef Triangle tri = (<Triangle*> primitives)[item]
@@ -84,9 +84,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline void triangle_centroid(const void *primitives,
- const np.int64_t item,
- np.float64_t[3] centroid) nogil:
+cdef void triangle_centroid(const void *primitives,
+ const np.int64_t item,
+ np.float64_t[3] centroid) nogil:
cdef Triangle tri = (<Triangle*> primitives)[item]
cdef np.int64_t i
@@ -97,9 +97,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline void triangle_bbox(const void *primitives,
- const np.int64_t item,
- BBox* bbox) nogil:
+cdef void triangle_bbox(const void *primitives,
+ const np.int64_t item,
+ BBox* bbox) nogil:
cdef Triangle tri = (<Triangle*> primitives)[item]
cdef np.int64_t i
@@ -240,9 +240,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline np.int64_t ray_patch_intersect(const void* primitives,
- const np.int64_t item,
- Ray* ray) nogil:
+cdef np.int64_t ray_patch_intersect(const void* primitives,
+ const np.int64_t item,
+ Ray* ray) nogil:
cdef Patch patch = (<Patch*> primitives)[item]
@@ -264,9 +264,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline void patch_centroid(const void *primitives,
- const np.int64_t item,
- np.float64_t[3] centroid) nogil:
+cdef void patch_centroid(const void *primitives,
+ const np.int64_t item,
+ np.float64_t[3] centroid) nogil:
cdef np.int64_t i, j
cdef Patch patch = (<Patch*> primitives)[item]
@@ -285,9 +285,9 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
-cdef inline void patch_bbox(const void *primitives,
- const np.int64_t item,
- BBox* bbox) nogil:
+cdef void patch_bbox(const void *primitives,
+ const np.int64_t item,
+ BBox* bbox) nogil:
cdef np.int64_t i, j
cdef Patch patch = (<Patch*> primitives)[item]
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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160516/e46aaa9c/attachment-0001.html>
More information about the yt-svn
mailing list