8000 [CLN] More cython cleanups, with bonus type annotations by jbrockmendel · Pull Request #22283 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

[CLN] More cython cleanups, with bonus type annotations #22283

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
merged 14 commits into from
Sep 8, 2018
Merged

[CLN] More cython cleanups, with bonus type annotations #22283

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0410aed
remove cython:profile annotations
jbrockmendel Aug 11, 2018
7f77137
uncdef functions not used from within cython
jbrockmendel Aug 11, 2018
b999b53
un-cpdef functions that dont need to be
jbrockmendel Aug 11, 2018
38cd31f
change fickle syntax
jbrockmendel Aug 11, 2018
74df6b9
modernize string formatting
jbrockmendel Aug 11, 2018
e0a19ad
typo fixup
jbrockmendel Aug 11, 2018
5dfb648
flake8 fixup
jbrockmendel Aug 11, 2018
d70c6ed
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Aug 16, 2018
d31be36
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Aug 20, 2018
20cf63d
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Aug 21, 2018
71fccd5
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Aug 22, 2018
72b38cd
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Sep 1, 2018
e799458
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Sep 4, 2018
3300de1
Merge branch 'master' of https://github.com/pandas-dev/pandas into un…
jbrockmendel Sep 5, 2018
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/pandas-dev/pandas into un… 
…cdef
  • Loading branch information
@jbrockmendel
jbrockmendel committed Aug 20, 2018
commit d31be369fec5c8d53efdf31120fcdefc05f701e4
2 changes: 2 additions & 0 deletions pandas/_libs/algos_common_helper.pxi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ def put2d_{{name}}_{{dest_type}}(ndarray[{{c_type}}, ndim=2, cast=True] values,

cdef int PLATFORM_INT = (<ndarray> np.arange(0, dtype=np.intp)).descr.type_num


def ensure_platform_int(object arr):
# GH3033, GH1392
# platform int is the size of the int pointer, e.g. np.intp
Expand All @@ -552,6 +553,7 @@ def ensure_platform_int(object arr):
else:
return np.array(arr, dtype=np.intp)


def ensure_object(object arr):
if util.is_array(arr):
if (<ndarray> arr).descr.type_num == NPY_OBJECT:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0