8000 Throw errors when indexing into empty array_view objects by jkseppan · Pull Request #5247 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Throw errors when indexing into empty array_view objects #5247

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 4 commits into from
Closed

Throw errors when indexing into empty array_view objects #5247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed134d5
Throw errors when indexing into empty array_view objects
jkseppan Oct 15, 2015
aa38c5b
Use null data instead of a separate flag
jkseppan Oct 15, 2015
cae71f6
Make array_view.size return 0 for empty arrays
jkseppan Oct 15, 2015
8698b5e
Use m_data==NULL as the condition in size()
jkseppan Oct 15, 2015
File filter

Filter by extension

Filter by extension
< 8000 /div>
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
Next Next commit
Throw errors when indexing into empty array_view objects 
Should catch issues like #5185 while not adding a big perf penalty
  • Loading branch information
@jkseppan
jkseppan committed Oct 15, 2015
commit ed134d5ada340613988184906e77f07e6ea2d241
65 changes: 61 additions & 4 deletions src/numpy_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@

#include <Python.h>
#include <numpy/ndarrayobject.h>
#include <stdexcept>

#if defined(__GNUC__) || defined(__clang__)
#define unlikely(x) __builtin_expect(!!(x), 0)
#else
#define unlikely(x) (x)
#endif

namespace numpy
{
Expand Down Expand Up @@ -235,27 +242,39 @@ class array_view_accessors<AV, T, 1>
T &operator()(npy_intp i)
{
AVC *self = static_cast<AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<T *>(self->m_data + self->m_strides[0] * i);
}

const T &operator()(npy_intp i) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<const T *>(self->m_data + self->m_strides[0] * i);
}

T &operator[](npy_intp i)
{
AVC *self = static_cast<AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<T *>(self->m_data + self->m_strides[0] * i);
}

const T &operator[](npy_intp i) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<const T *>(self->m_data + self->m_strides[0] * i);
}
Expand All @@ -271,6 +290,9 @@ class array_view_accessors<AV, T, 2>
T &operator()(npy_intp i, npy_intp j)
{
AVC *self = static_cast<AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<T *>(self->m_data + self->m_strides[0] * i +
self->m_strides[1] * j);
Expand All @@ -279,6 +301,9 @@ class array_view_accessors<AV, T, 2>
const T &operator()(npy_intp i, npy_intp j) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<const T *>(self->m_data + self->m_strides[0] * i +
self->m_strides[1] * j);
Expand All @@ -287,6 +312,9 @@ class array_view_accessors<AV, T, 2>
sub_t operator[](npy_intp i) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return sub_t(self->m_arr,
self->m_data + self->m_strides[0] * i,
Expand All @@ -305,6 +333,9 @@ class array_view_accessors<AV, T, 3>
T &operator()(npy_intp i, npy_intp j, npy_intp k)
{
AVC *self = static_cast<AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<T *>(self->m_data + self->m_strides[0] * i +
self->m_strides[1] * j + self->m_strides[2] * k);
Expand All @@ -313,6 +344,9 @@ class array_view_accessors<AV, T, 3>
const T &operator()(npy_intp i, npy_intp j, npy_intp k) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return *reinterpret_cast<const T *>(self->m_data + self->m_strides[0] * i +
self->m_strides[1] * j + self->m_strides[2] * k);
Expand All @@ -321,6 +355,9 @@ class array_view_accessors<AV, T, 3>
sub_t operator[](npy_intp i) const
{
const AVC *self = static_cast<const AVC *>(this);
if (unlikely(self->m_empty)) {
throw std::out_of_range("indexing into an array_view with no data");
}

return sub_t(self->m_arr,
self->m_data + self->m_strides[0] * i,
Expand Down Expand Up @@ -349,6 +386,9 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
npy_intp *m_shape;
npy_intp *m_strides;
char *m_data;
// Flag for a limited kind of bounds checking,
// not the same as the empty() method which checks the outer dimension
bool m_empty;

public:
typedef T value_type;
Expand All @@ -361,6 +401,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
{
m_shape = zeros;
m_strides = zeros;
m_empty = true;
}

array_view(PyObject *arr, bool contiguous = false) : m_arr(NULL), m_data(NULL)
Expand All @@ -377,6 +418,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_data = other.m_data;
m_shape = other.m_shape;
m_strides = other.m_strides;
m_empty = other.m_empty;
}

array_view(PyArrayObject *arr, char *data, npy_intp *shape, npy_intp *strides)
Expand All @@ -386,6 +428,12 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_data = data;
m_shape = shape;
m_strides = strides;
m_empty = (ND == 0);
for (size_t i = 0; i < ND; i++) {
if (shape[i] == 0) {
m_empty = true;
}
}
}

array_view(npy_intp shape[ND]) : m_arr(NULL), m_shape(NULL), m_strides(NULL), m_data(NULL)
Expand Down Expand Up @@ -416,6 +464,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_data = other.m_data;
m_shape = other.m_shape;
m_strides = other.m_strides;
m_empty = other.m_empty;
}
return *this;
}
Expand All @@ -430,6 +479,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_data = NULL;
m_shape = zeros;
m_strides = zeros;
m_empty = true;
} else {
if (contiguous) {
tmp = (PyArrayObject *)PyArray_ContiguousFromAny(arr, type_num_of<T>::value, 0, ND);
Expand All @@ -446,10 +496,11 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_data = NULL;
m_shape = zeros;
m_strides = zeros;
if (PyArray_NDIM(tmp) == 0 && ND == 0) {
m_arr = tmp;
return 1;
}
if (PyArray_NDIM(tmp) == 0 && ND == 0) {
m_arr = tmp;
m_empty = true;
return 1;
}
}
if (PyArray_NDIM(tmp) != ND) {
PyErr_Format(PyExc_ValueError,
Expand All @@ -466,6 +517,12 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
m_shape = PyArray_DIMS(m_arr);
m_strides = PyArray_STRIDES(m_arr);
m_data = (char *)PyArray_BYTES(tmp);
m_empty = (ND == 0);
for (size_t i = 0; i < ND; i++) {
if (m_shape[i] == 0) {
m_empty = true;
}
}
}

return 1;
Expand Down
14 changes: 11 additions & 3 deletions src/py_exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,31 @@ class exception : public std::exception
} \
catch (const std::bad_alloc) \
{ \
PyErr_Format(PyExc_MemoryError, "In %s: Out of memory", (name)); \
PyErr_Format(PyExc_MemoryError, "In %s: Out of memory", (name)); \
{ \
cleanup; \
} \
return (errorcode); \
} \
catch (const std::overflow_error &e) \
{ \
PyErr_Format(PyExc_OverflowError, "In %s: %s", (name), e.what()); \
PyErr_Format(PyExc_OverflowError, "In %s: %s", (name), e.what()); \
{ \
cleanup; \
} \
return (errorcode); \
} \
catch (const std::out_of_range &e) \
{ \
PyErr_Format(PyExc_IndexError, "In %s: %s", (name), e.what()); \
{ \
cleanup; \
} \
return (errorcode); \
} \
catch (char const *e) \
{ \
PyErr_Format(PyExc_RuntimeError, "In %s: %s", (name), e); \
PyErr_Format(PyExc_RuntimeError, "In %s: %s", (name), e); \
{ \
cleanup; \
} \
Expand Down
0