Skip to content

Commit

Permalink
BUG: use memory view for indexer in take_2d / tests (GH10043)
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback committed May 7, 2015
1 parent e1f1251 commit ca55818
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 41 deletions.
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.16.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ Bug Fixes
- Bug where ``TimdeltaIndex`` were not properly serialized in fixed ``HDFStore`` (:issue:`9635`)
- Bug with ``TimedeltaIndex`` constructor ignoring ``name`` when given another ``TimedeltaIndex`` as data (:issue:`10025`).
- Bug in ``DataFrameFormatter._get_formatted_index`` with not applying ``max_colwidth`` to the ``DataFrame`` index (:issue:`7856`)

- Bug in ``.loc`` with a read-only ndarray data source (:issue:`10043`)
- Bug in ``groupby.apply()`` that would raise if a passed user defined function either returned only ``None`` (for all input). (:issue:`9685`)

- Bug in plotting continuously using ``secondary_y`` may not show legend properly. (:issue:`9610`, :issue:`9779`)
Expand Down
4 changes: 2 additions & 2 deletions pandas/src/generate_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def take_1d_%(name)s_%(dest)s(ndarray[%(c_type_in)s] values,
@cython.wraparound(False)
@cython.boundscheck(False)
cdef inline take_2d_axis0_%(name)s_%(dest)s_memview(%(c_type_in)s[:, :] values,
ndarray[int64_t] indexer,
int64_t[:] indexer,
%(c_type_out)s[:, :] out,
fill_value=np.nan):
""" + inner_take_2d_axis0_template + """
Expand Down Expand Up @@ -188,7 +188,7 @@ def take_2d_axis0_%(name)s_%(dest)s(ndarray[%(c_type_in)s, ndim=2] values,
@cython.wraparound(False)
@cython.boundscheck(False)
cdef inline take_2d_axis1_%(name)s_%(dest)s_memview(%(c_type_in)s[:, :] values,
ndarray[int64_t] indexer,
int64_t[:] indexer,
%(c_type_out)s[:, :] out,
fill_value=np.nan):
""" + inner_take_2d_axis1_template + """
Expand Down
Loading

0 comments on commit ca55818

Please sign in to comment.