Skip to content

Remove inline declarations in pxd files #17277

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

Closed
wants to merge 1 commit into from
Closed

Remove inline declarations in pxd files #17277

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
4 changes: 2 additions & 2 deletions pandas/_libs/hashtable.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ cdef class MultiIndexHashTable(HashTable):

cpdef get_item(self, object val)
cpdef set_item(self, object key, Py_ssize_t val)
cdef inline void _check_for_collision(self, Py_ssize_t loc, object label)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this prob should be implemented in the .pxd file; its called a lot

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is just a matter of cut/pasting from the pxi file, you got it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it correct that _check_for_collisions is only used in hashtable.pyx itself? (or in the included template files)
If so, I think we can just remove it here from the pxd file altogether (it is already defined as inline in hashtable itself)

cdef void _check_for_collision(self, Py_ssize_t loc, object label)


cdef class StringHashTable(HashTable):
Expand All @@ -58,5 +58,5 @@ cdef class Int64Vector:

cdef resize(self)
cpdef to_array(self)
cdef inline void append(self, int64_t x)
cdef void append(self, int64_t x)
cdef extend(self, int64_t[:] x)
112 changes: 56 additions & 56 deletions pandas/_libs/src/khash.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ cdef extern from "khash_python.h":
PyObject **keys
size_t *vals

inline kh_pymap_t* kh_init_pymap()
inline void kh_destroy_pymap(kh_pymap_t*)
inline void kh_clear_pymap(kh_pymap_t*)
inline khint_t kh_get_pymap(kh_pymap_t*, PyObject*)
inline void kh_resize_pymap(kh_pymap_t*, khint_t)
inline khint_t kh_put_pymap(kh_pymap_t*, PyObject*, int*)
inline void kh_del_pymap(kh_pymap_t*, khint_t)
kh_pymap_t* kh_init_pymap()
void kh_destroy_pymap(kh_pymap_t*)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are c-functions

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But they still trigger the warning when building. So apparently that does not matter

Copy link
Member

@jorisvandenbossche jorisvandenbossche Aug 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the comment in the cython issues, I understand that those will not be inlined anyhow when used in another cython module (cython/cython#1706 (comment))

void kh_clear_pymap(kh_pymap_t*)
khint_t kh_get_pymap(kh_pymap_t*, PyObject*)
void kh_resize_pymap(kh_pymap_t*, khint_t)
khint_t kh_put_pymap(kh_pymap_t*, PyObject*, int*)
void kh_del_pymap(kh_pymap_t*, khint_t)

bint kh_exist_pymap(kh_pymap_t*, khiter_t)

Expand All @@ -27,13 +27,13 @@ cdef extern from "khash_python.h":
PyObject **keys
size_t *vals

inline kh_pyset_t* kh_init_pyset()
inline void kh_destroy_pyset(kh_pyset_t*)
inline void kh_clear_pyset(kh_pyset_t*)
inline khint_t kh_get_pyset(kh_pyset_t*, PyObject*)
inline void kh_resize_pyset(kh_pyset_t*, khint_t)
inline khint_t kh_put_pyset(kh_pyset_t*, PyObject*, int*)
inline void kh_del_pyset(kh_pyset_t*, khint_t)
kh_pyset_t* kh_init_pyset()
void kh_destroy_pyset(kh_pyset_t*)
void kh_clear_pyset(kh_pyset_t*)
khint_t kh_get_pyset(kh_pyset_t*, PyObject*)
void kh_resize_pyset(kh_pyset_t*, khint_t)
khint_t kh_put_pyset(kh_pyset_t*, PyObject*, int*)
void kh_del_pyset(kh_pyset_t*, khint_t)

bint kh_exist_pyset(kh_pyset_t*, khiter_t)

Expand All @@ -45,13 +45,13 @@ cdef extern from "khash_python.h":
kh_cstr_t *keys
size_t *vals

inline kh_str_t* kh_init_str() nogil
inline void kh_destroy_str(kh_str_t*) nogil
inline void kh_clear_str(kh_str_t*) nogil
inline khint_t kh_get_str(kh_str_t*, kh_cstr_t) nogil
inline void kh_resize_str(kh_str_t*, khint_t) nogil
inline khint_t kh_put_str(kh_str_t*, kh_cstr_t, int*) nogil
inline void kh_del_str(kh_str_t*, khint_t) nogil
kh_str_t* kh_init_str() nogil
void kh_destroy_str(kh_str_t*) nogil
void kh_clear_str(kh_str_t*) nogil
khint_t kh_get_str(kh_str_t*, kh_cstr_t) nogil
void kh_resize_str(kh_str_t*, khint_t) nogil
khint_t kh_put_str(kh_str_t*, kh_cstr_t, int*) nogil
void kh_del_str(kh_str_t*, khint_t) nogil

bint kh_exist_str(kh_str_t*, khiter_t) nogil

Expand All @@ -61,13 +61,13 @@ cdef extern from "khash_python.h":
int64_t *keys
size_t *vals

inline kh_int64_t* kh_init_int64() nogil
inline void kh_destroy_int64(kh_int64_t*) nogil
inline void kh_clear_int64(kh_int64_t*) nogil
inline khint_t kh_get_int64(kh_int64_t*, int64_t) nogil
inline void kh_resize_int64(kh_int64_t*, khint_t) nogil
inline khint_t kh_put_int64(kh_int64_t*, int64_t, int*) nogil
inline void kh_del_int64(kh_int64_t*, khint_t) nogil
kh_int64_t* kh_init_int64() nogil
void kh_destroy_int64(kh_int64_t*) nogil
void kh_clear_int64(kh_int64_t*) nogil
khint_t kh_get_int64(kh_int64_t*, int64_t) nogil
void kh_resize_int64(kh_int64_t*, khint_t) nogil
khint_t kh_put_int64(kh_int64_t*, int64_t, int*) nogil
void kh_del_int64(kh_int64_t*, khint_t) nogil

bint kh_exist_int64(kh_int64_t*, khiter_t) nogil

Expand All @@ -79,13 +79,13 @@ cdef extern from "khash_python.h":
khuint64_t *keys
size_t *vals

inline kh_uint64_t* kh_init_uint64() nogil
inline void kh_destroy_uint64(kh_uint64_t*) nogil
inline void kh_clear_uint64(kh_uint64_t*) nogil
inline khint_t kh_get_uint64(kh_uint64_t*, int64_t) nogil
inline void kh_resize_uint64(kh_uint64_t*, khint_t) nogil
inline khint_t kh_put_uint64(kh_uint64_t*, int64_t, int*) nogil
inline void kh_del_uint64(kh_uint64_t*, khint_t) nogil
kh_uint64_t* kh_init_uint64() nogil
void kh_destroy_uint64(kh_uint64_t*) nogil
void kh_clear_uint64(kh_uint64_t*) nogil
khint_t kh_get_uint64(kh_uint64_t*, int64_t) nogil
void kh_resize_uint64(kh_uint64_t*, khint_t) nogil
khint_t kh_put_uint64(kh_uint64_t*, int64_t, int*) nogil
void kh_del_uint64(kh_uint64_t*, khint_t) nogil

bint kh_exist_uint64(kh_uint64_t*, khiter_t) nogil

Expand All @@ -95,13 +95,13 @@ cdef extern from "khash_python.h":
float64_t *keys
size_t *vals

inline kh_float64_t* kh_init_float64() nogil
inline void kh_destroy_float64(kh_float64_t*) nogil
inline void kh_clear_float64(kh_float64_t*) nogil
inline khint_t kh_get_float64(kh_float64_t*, float64_t) nogil
inline void kh_resize_float64(kh_float64_t*, khint_t) nogil
inline khint_t kh_put_float64(kh_float64_t*, float64_t, int*) nogil
inline void kh_del_float64(kh_float64_t*, khint_t) nogil
kh_float64_t* kh_init_float64() nogil
void kh_destroy_float64(kh_float64_t*) nogil
void kh_clear_float64(kh_float64_t*) nogil
khint_t kh_get_float64(kh_float64_t*, float64_t) nogil
void kh_resize_float64(kh_float64_t*, khint_t) nogil
khint_t kh_put_float64(kh_float64_t*, float64_t, int*) nogil
void kh_del_float64(kh_float64_t*, khint_t) nogil

bint kh_exist_float64(kh_float64_t*, khiter_t) nogil

Expand All @@ -111,13 +111,13 @@ cdef extern from "khash_python.h":
int32_t *keys
size_t *vals

inline kh_int32_t* kh_init_int32() nogil
inline void kh_destroy_int32(kh_int32_t*) nogil
inline void kh_clear_int32(kh_int32_t*) nogil
inline khint_t kh_get_int32(kh_int32_t*, int32_t) nogil
inline void kh_resize_int32(kh_int32_t*, khint_t) nogil
inline khint_t kh_put_int32(kh_int32_t*, int32_t, int*) nogil
inline void kh_del_int32(kh_int32_t*, khint_t) nogil
kh_int32_t* kh_init_int32() nogil
void kh_destroy_int32(kh_int32_t*) nogil
void kh_clear_int32(kh_int32_t*) nogil
khint_t kh_get_int32(kh_int32_t*, int32_t) nogil
void kh_resize_int32(kh_int32_t*, khint_t) nogil
khint_t kh_put_int32(kh_int32_t*, int32_t, int*) nogil
void kh_del_int32(kh_int32_t*, khint_t) nogil

bint kh_exist_int32(kh_int32_t*, khiter_t) nogil

Expand All @@ -129,12 +129,12 @@ cdef extern from "khash_python.h":
kh_cstr_t *keys
PyObject **vals

inline kh_strbox_t* kh_init_strbox() nogil
inline void kh_destroy_strbox(kh_strbox_t*) nogil
inline void kh_clear_strbox(kh_strbox_t*) nogil
inline khint_t kh_get_strbox(kh_strbox_t*, kh_cstr_t) nogil
inline void kh_resize_strbox(kh_strbox_t*, khint_t) nogil
inline khint_t kh_put_strbox(kh_strbox_t*, kh_cstr_t, int*) nogil
inline void kh_del_strbox(kh_strbox_t*, khint_t) nogil
kh_strbox_t* kh_init_strbox() nogil
void kh_destroy_strbox(kh_strbox_t*) nogil
void kh_clear_strbox(kh_strbox_t*) nogil
khint_t kh_get_strbox(kh_strbox_t*, kh_cstr_t) nogil
void kh_resize_strbox(kh_strbox_t*, khint_t) nogil
khint_t kh_put_strbox(kh_strbox_t*, kh_cstr_t, int*) nogil
void kh_del_strbox(kh_strbox_t*, khint_t) nogil

bint kh_exist_strbox(kh_strbox_t*, khiter_t) nogil
10 changes: 5 additions & 5 deletions pandas/_libs/src/skiplist.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ cdef extern from "skiplist.h":
int size
int maxlevels

inline skiplist_t* skiplist_init(int) nogil
inline void skiplist_destroy(skiplist_t*) nogil
inline double skiplist_get(skiplist_t*, int, int*) nogil
inline int skiplist_insert(skiplist_t*, double) nogil
inline int skiplist_remove(skiplist_t*, double) nogil
skiplist_t* skiplist_init(int) nogil
void skiplist_destroy(skiplist_t*) nogil
double skiplist_get(skiplist_t*, int, int*) nogil
int skiplist_insert(skiplist_t*, double) nogil
int skiplist_remove(skiplist_t*, double) nogil

36 changes: 18 additions & 18 deletions pandas/_libs/src/util.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ cimport numpy as cnp
cimport cpython

cdef extern from "numpy_helper.h":
inline void set_array_owndata(ndarray ao)
inline void set_array_not_contiguous(ndarray ao)

inline int is_integer_object(object)
inline int is_float_object(object)
inline int is_complex_object(object)
inline int is_bool_object(object)
inline int is_string_object(object)
inline int is_datetime64_object(object)
inline int is_timedelta64_object(object)
inline int assign_value_1d(ndarray, Py_ssize_t, object) except -1
inline cnp.int64_t get_nat()
inline object get_value_1d(ndarray, Py_ssize_t)
inline int floatify(object, double*) except -1
inline char *get_c_string(object) except NULL
inline object char_to_string(char*)
inline void transfer_object_column(char *dst, char *src, size_t stride,
void set_array_owndata(ndarray ao)
void set_array_not_contiguous(ndarray ao)

int is_integer_object(object)
int is_float_object(object)
int is_complex_object(object)
int is_bool_object(object)
int is_string_object(object)
int is_datetime64_object(object)
int is_timedelta64_object(object)
int assign_value_1d(ndarray, Py_ssize_t, object) except -1
cnp.int64_t get_nat()
object get_value_1d(ndarray, Py_ssize_t)
int floatify(object, double*) except -1
char *get_c_string(object) except NULL
object char_to_string(char*)
void transfer_object_column(char *dst, char *src, size_t stride,
size_t length)
object sarr_from_data(cnp.dtype, int length, void* data)
inline object unbox_if_zerodim(object arr)
object unbox_if_zerodim(object arr)

ctypedef fused numeric:
cnp.int8_t
Expand Down