Skip to content
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

Jump to bottom

common_defs.pxd: remove inline modifier #105

Merged
merged 1 commit into from
Aug 29, 2019
Merged

common_defs.pxd: remove inline modifier #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions scikits/odes/sundials/common_defs.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ ELIF SUNDIALS_INDEX_TYPE == "int64":
ELSE:
ctypedef np.int64_t INDEX_TYPE_t

cdef inline int nv_s2ndarray(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1
cdef inline int ndarray2nv_s(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1
cdef int nv_s2ndarray(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1
cdef int ndarray2nv_s(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1

cdef inline int SUNMatrix2ndarray(SUNMatrix m, np.ndarray a) except? -1
cdef inline int ndarray2SUNMatrix(SUNMatrix m, np.ndarray a) except? -1
cdef int SUNMatrix2ndarray(SUNMatrix m, np.ndarray a) except? -1
cdef int ndarray2SUNMatrix(SUNMatrix m, np.ndarray a) except? -1

cdef ensure_numpy_float_array(object value)
8 changes: 4 additions & 4 deletions scikits/odes/sundials/common_defs.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ cdef inline N_Vector spfgmr_vtemp(SpfgmrMem mem):
return mem.vtemp

# Public functions
cdef inline int nv_s2ndarray(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1:
cdef int nv_s2ndarray(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1:
""" copy a serial N_Vector v to a numpy array a """
cdef sunindextype N, i
N = nv_length_s(v)
Expand All @@ -127,7 +127,7 @@ cdef inline int nv_s2ndarray(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except?
for i in range(N):
a[i] = get_nv_ith_s(v_data, i)

cdef inline int ndarray2nv_s(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1:
cdef int ndarray2nv_s(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except? -1:
""" copy a numpy array a to a serial N_Vector v t"""
cdef unsigned int N, i
N = nv_length_s(v)
Expand All @@ -136,7 +136,7 @@ cdef inline int ndarray2nv_s(N_Vector v, np.ndarray[DTYPE_t, ndim=1] a) except?
for i in range(N):
set_nv_ith_s(v_data, i, a[i])

cdef inline int SUNMatrix2ndarray(SUNMatrix m, np.ndarray a) except? -1:
cdef int SUNMatrix2ndarray(SUNMatrix m, np.ndarray a) except? -1:
""" copy a SUNMatrix m to a numpy array a """
cdef sunindextype N, M, i, j, ml, mu, stride
cdef nv_content_data_s v_col
Expand All @@ -163,7 +163,7 @@ cdef inline int SUNMatrix2ndarray(SUNMatrix m, np.ndarray a) except? -1:
else:
raise NotImplementedError("SUNMatrix type not supported")

cdef inline int ndarray2SUNMatrix(SUNMatrix m, np.ndarray a) except? -1:
cdef int ndarray2SUNMatrix(SUNMatrix m, np.ndarray a) except? -1:
""" copy a numpy array a to a SUNMatrix m"""
cdef sunindextype N, M, i, j, ml, mu, stride
cdef nv_content_data_s v_col
Expand Down