Skip to content

Commit

Permalink
Merge pull request #4619 from Xarthisius/cython3_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@neutrinoceros
neutrinoceros authored Aug 4, 2023
2 parents 410618d + 907332e commit 19742f5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
28 changes: 14 additions & 14 deletions yt/utilities/lib/primitives.pxd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ cdef np.int64_t ray_triangle_intersect(const void* primitives,

cdef void triangle_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil
np.float64_t[3] centroid) noexcept nogil

cdef void triangle_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil
BBox* bbox) noexcept nogil

cdef struct Patch:
np.float64_t[8][3] v # 8 vertices per patch
Expand All @@ -54,65 +54,65 @@ cdef struct Patch:
cdef void patchSurfaceFunc(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] S) nogil
cython.floating[3] S) noexcept nogil

cdef void patchSurfaceDerivU(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Su) nogil
cython.floating[3] Su) noexcept nogil

cdef void patchSurfaceDerivV(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Sv) nogil
cython.floating[3] Sv) noexcept nogil

cdef RayHitData compute_patch_hit(cython.floating[8][3] verts,
cython.floating[3] ray_origin,
cython.floating[3] ray_direction) nogil
cython.floating[3] ray_direction) noexcept nogil

cdef np.int64_t ray_patch_intersect(const void* primitives,
const np.int64_t item,
Ray* ray) noexcept nogil

cdef void patch_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil
np.float64_t[3] centroid) noexcept nogil

cdef void patch_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil
BBox* bbox) noexcept nogil

cdef struct TetPatch:
np.float64_t[6][3] v # 6 vertices per patch
np.int64_t elem_id

cdef RayHitData compute_tet_patch_hit(cython.floating[6][3] verts,
cython.floating[3] ray_origin,
cython.floating[3] ray_direction) nogil
cython.floating[3] ray_direction) noexcept nogil

cdef void tet_patchSurfaceFunc(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] S) nogil
cython.floating[3] S) noexcept nogil

cdef void tet_patchSurfaceDerivU(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Su) nogil
cython.floating[3] Su) noexcept nogil

cdef void tet_patchSurfaceDerivV(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Sv) nogil
cython.floating[3] Sv) noexcept nogil

cdef np.int64_t ray_tet_patch_intersect(const void* primitives,
const np.int64_t item,
Ray* ray) noexcept nogil

cdef void tet_patch_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil
np.float64_t[3] centroid) noexcept nogil

cdef void tet_patch_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil
BBox* bbox) noexcept nogil
28 changes: 14 additions & 14 deletions yt/utilities/lib/primitives.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ cdef np.int64_t ray_triangle_intersect(const void* primitives,
@cython.cdivision(True)
cdef void triangle_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil:
np.float64_t[3] centroid) noexcept nogil:
'''
This computes the centroid of the input triangle. The triangle used
Expand All @@ -139,7 +139,7 @@ cdef void triangle_centroid(const void *primitives,
@cython.cdivision(True)
cdef void triangle_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil:
BBox* bbox) noexcept nogil:
'''
This computes the bounding box of the input triangle. The triangle used
Expand All @@ -161,7 +161,7 @@ cdef void triangle_bbox(const void *primitives,
cdef void patchSurfaceFunc(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] S) nogil:
cython.floating[3] S) noexcept nogil:
'''
This function is a parametric representation of the surface of a bi-quadratic
Expand Down Expand Up @@ -190,7 +190,7 @@ cdef void patchSurfaceFunc(const cython.floating[8][3] verts,
cdef void patchSurfaceDerivU(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Su) nogil:
cython.floating[3] Su) noexcept nogil:
'''
This function computes the derivative of the S(u, v) function w.r.t u.
Expand All @@ -212,7 +212,7 @@ cdef void patchSurfaceDerivU(const cython.floating[8][3] verts,
cdef void patchSurfaceDerivV(const cython.floating[8][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Sv) nogil:
cython.floating[3] Sv) noexcept nogil:
'''
This function computes the derivative of the S(u, v) function w.r.t v.
Expand All @@ -234,7 +234,7 @@ cdef void patchSurfaceDerivV(const cython.floating[8][3] verts,
@cython.cdivision(True)
cdef RayHitData compute_patch_hit(cython.floating[8][3] verts,
cython.floating[3] ray_origin,
cython.floating[3] ray_direction) nogil:
cython.floating[3] ray_direction) noexcept nogil:
"""
This function iteratively computes whether the bi-quadratic patch defined by the
Expand Down Expand Up @@ -347,7 +347,7 @@ cdef np.int64_t ray_patch_intersect(const void* primitives,
@cython.cdivision(True)
cdef void patch_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil:
np.float64_t[3] centroid) noexcept nogil:
'''
This computes the centroid of the input patch. The patch used
Expand Down Expand Up @@ -375,7 +375,7 @@ cdef void patch_centroid(const void *primitives,
@cython.cdivision(True)
cdef void patch_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil:
BBox* bbox) noexcept nogil:

'''
Expand Down Expand Up @@ -404,7 +404,7 @@ cdef void patch_bbox(const void *primitives,
cdef void tet_patchSurfaceFunc(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] S) nogil:
cython.floating[3] S) noexcept nogil:

cdef int i
# Computes for canonical triangle coordinates
Expand All @@ -422,7 +422,7 @@ cdef void tet_patchSurfaceFunc(const cython.floating[6][3] verts,
cdef void tet_patchSurfaceDerivU(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Su) nogil:
cython.floating[3] Su) noexcept nogil:
cdef int i
# Computes for canonical triangle coordinates
for i in range(3):
Expand All @@ -439,7 +439,7 @@ cdef void tet_patchSurfaceDerivU(const cython.floating[6][3] verts,
cdef void tet_patchSurfaceDerivV(const cython.floating[6][3] verts,
const cython.floating u,
const cython.floating v,
cython.floating[3] Sv) nogil:
cython.floating[3] Sv) noexcept nogil:

cdef int i
# Computes for canonical triangle coordinates
Expand All @@ -456,7 +456,7 @@ cdef void tet_patchSurfaceDerivV(const cython.floating[6][3] verts,
@cython.cdivision(True)
cdef RayHitData compute_tet_patch_hit(cython.floating[6][3] verts,
cython.floating[3] ray_origin,
cython.floating[3] ray_direction) nogil:
cython.floating[3] ray_direction) noexcept nogil:

# first we compute the two planes that define the ray.
cdef cython.floating[3] n, N1, N2
Expand Down Expand Up @@ -555,7 +555,7 @@ cdef np.int64_t ray_tet_patch_intersect(const void* primitives,
@cython.cdivision(True)
cdef void tet_patch_centroid(const void *primitives,
const np.int64_t item,
np.float64_t[3] centroid) nogil:
np.float64_t[3] centroid) noexcept nogil:

cdef np.int64_t i, j
cdef TetPatch tet_patch = (<TetPatch*> primitives)[item]
Expand All @@ -576,7 +576,7 @@ cdef void tet_patch_centroid(const void *primitives,
@cython.cdivision(True)
cdef void tet_patch_bbox(const void *primitives,
const np.int64_t item,
BBox* bbox) nogil:
BBox* bbox) noexcept nogil:

cdef np.int64_t i, j
cdef TetPatch tet_patch = (<TetPatch*> primitives)[item]
Expand Down

0 comments on commit 19742f5

Please sign in to comment.