Skip to content

Add a noexcept clause to the wrapper function #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcapriot merged 2 commits into from
Jul 17, 2023
Merged

Add a noexcept clause to the wrapper function #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb17678
Add a noexcept clause to the wrapper function
jcapriot Jul 17, 2023
8acb337
`noexcept` clause added in v0.29.31
jcapriot Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions discretize/_extensions/tree_ext.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ cdef class TreeCell:
def _level(self):
return self._cell.level

cdef int _evaluate_func(void* function, c_Cell* cell) with gil:
cdef int _evaluate_func(void* function, c_Cell* cell) noexcept with gil:
# Wraps a function to be called in C++
func = <object> function
pycell = TreeCell()
Expand Down Expand Up @@ -750,6 +750,7 @@ cdef class _TreeMesh:

cdef int l
cdef int max_level = self.max_level
cdef int i
for i in range(n_segments):
l = ls[i]
if l < 0:
Expand Down Expand Up @@ -5354,8 +5355,16 @@ cdef class _TreeMesh:

int_t ii, i, j, offset
c_Cell *cell
c_Cell *i0, *i1
Edge *i000, *i001, *i010, *i011, *i100, *i101, *i110, *i111
c_Cell *i0
c_Cell *i1
Edge *i000
Edge *i001
Edge *i010
Edge *i011
Edge *i100
Edge *i101
Edge *i110
Edge *i111
double x, y, z
double w1, w2, w3
double eps = 100*np.finfo(float).eps
Expand Down Expand Up @@ -5485,9 +5494,22 @@ cdef class _TreeMesh:

int_t ii, i, offset
c_Cell *cell
c_Cell *i00, *i01, *i10, *i11
Face *f000, *f001, *f010, *f011, *f100, *f101, *f110, *f111
Edge *e00, *e01, *e10, *e11
c_Cell *i00
c_Cell *i01
c_Cell *i10
c_Cell *i11
Face *f000
Face *f001
Face *f010
Face *f011
Face *f100
Face *f101
Face *f110
Face *f111
Edge *e00
Edge *e01
Edge *e10
Edge *e11
double x, y, z
double w1, w2, w3
double eps = 100*np.finfo(float).eps
Expand Down Expand Up @@ -5749,7 +5771,14 @@ cdef class _TreeMesh:
np.float64_t w0, w1, w2

int_t ii, i
c_Cell *i000, *i001, *i010, *i011, *i100, *i101, *i110, *i111
c_Cell *i000
c_Cell *i001
c_Cell *i010
c_Cell *i011
c_Cell *i100
c_Cell *i101
c_Cell *i110
c_Cell *i111
c_Cell *cell
double x, y, z
double eps = 100*np.finfo(float).eps
Expand Down
2 changes: 1 addition & 1 deletion environment_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- numpy>=1.20
- scipy>=1.8
- cython>=0.29
- cython>=0.29.31
- setuptools_scm
- pymatsolver>=0.1.2
- matplotlib
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

build_requires = [
"numpy>=1.20",
"cython>=0.29",
"cython>=0.29.31",
"setuptools_scm",
]

Expand Down