8000 Move dotblas to multiarray by charris · Pull Request #4969 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Move dotblas to multiarray #4969

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

Move dotblas to multiarray #4969

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2f6da63
ENH: optimize STRING_compare by using memcmp
juliantaylor Mar 31, 2014
f615c6c
ENH: Add 'HAVE_CBLAS' macro for build purposes.
charris Aug 11, 2014
ace49c2
ENH: When cblas is available use it in descr->f->dot.
charris Aug 14, 2014
efd023f
MAINT, STY: Remove use of alterdot, restoredot in _dotblas.c.
charris Aug 15, 2014
4e6066b
ENH: Move dotblas_matrixproduct down into multiarray.
charris Aug 16, 2014
028d2de
MAINT: Update waf to 1.7.16
charris Aug 17, 2014
52b8ab3
ENH: Move dotblas_innerproduct down into multiarray.
charris Aug 17, 2014
df0b65c
MAINT: Refactor ndarray.dot method to call PyArray_MatrixProduct2.
charris Aug 17, 2014
63cc74e
ENH: Move vdot to multiarray.
charris Aug 20, 2014
fad1377
DOC: Update docs to reflect deprecation of alterdot and restoredot.
charris Aug 22, 2014
f6ab313
TST: Add vdot tests, move tests from test_blasdot to test_multiarray.
charris Aug 22, 2014
d8af083
ENH: np.dot: better "matrices not aligned" message
larsmans Aug 23, 2014
a746e3a
BUG: Capitalize environmental variables in numpy/core/__init__.py.
charris Aug 23, 2014
d07c4c7
ENH: include shapes in "matrices not aligned" msg
larsmans Aug 23, 2014
ce32d9e
BLD: check for CBLAS header in "unoptimized" blas
juliantaylor Aug 24, 2014
91f89e4
Merge pull request #3 from juliantaylor/system-blas
charris Aug 24, 2014
ec5ef40
Merge branch 'dot-errmsg' into pr/4969
larsmans Aug 24, 2014
cfd462e
Merge pull request #2 from larsmans/dot-errmsg-no-dotblas
charris Aug 25, 2014
a3c70cc
STY: Add spaces around '-'.
charris Aug 25, 2014
affeaf5
TST: Silence some warning that turns up on OpenBSD.
charris Aug 29, 2014
4097ec3
BUG: fix percentage reporting when testing.assert_allclose fails.
pp-mo Aug 31, 2014
ea32c90
Use more portable test methods.
pp-mo Sep 1, 2014
138b3bf
Merge pull request #5031 from charris/speedup-old-polynomial-functions
seberg Sep 2, 2014
4a501a0
Merge pull request #5025 from pp-mo/assert_allclose_percent
juliantaylor Sep 2, 2014
588bcc4
Merge pull request #5020 from charris/disable-some-test-warnings
juliantaylor Sep 2, 2014
0f0575c
Merge pull request #4572 from juliantaylor/string-cmp
juliantaylor Sep 2, 2014
889821a
Merge branch 'old-move-dotblas' into move-dotblas-to-multiarray
charris Sep 2, 2014
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
10000
Diff view
14 changes: 6 additions & 8 deletions numpy/core/src/multiarray/cblasfuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#include <Python.h>
#include <assert.h>
#include <limits.h>
#include <cblas.h>
#include <numpy/arrayobject.h>
#include "arraytypes.h"
#include "common.h"


/*
Expand Down Expand Up @@ -250,8 +250,7 @@ cblas_matrixproduct(int typenum, PyArrayObject *ap1, PyArrayObject *ap2,
l = PyArray_DIM(oap1, PyArray_NDIM(oap1) - 1);

if (PyArray_DIM(oap2, 0) != l) {
PyErr_SetString(PyExc_ValueError,
"matrices are not aligned");
dot_alignment_error(oap1, PyArray_NDIM(oap1) - 1, oap2, 0);
goto fail;
}
nd = PyArray_NDIM(ap1) + PyArray_NDIM(ap2) - 2;
Expand Down Expand Up @@ -302,8 +301,7 @@ cblas_matrixproduct(int typenum, PyArrayObject *ap1, PyArrayObject *ap2,
l = PyArray_DIM(ap1, PyArray_NDIM(ap1) - 1);

if (PyArray_DIM(ap2, 0) != l) {
PyErr_SetString(PyExc_ValueError,
"matrices are not aligned");
dot_alignment_error(ap1, PyArray_NDIM(ap1) - 1, ap2, 0);
goto fail;
}
nd = PyArray_NDIM(ap1) + PyArray_NDIM(ap2) - 2;
Expand Down Expand Up @@ -712,9 +710,9 @@ cblas_innerproduct(int typenum, PyArrayObject *ap1, PyArrayObject *ap2)
*/
l = PyArray_DIM(ap1, PyArray_NDIM(ap1) - 1);

if (PyArray_DIM(ap2, PyArray_NDIM(ap2) - 1) != l) {
PyErr_SetString(PyExc_ValueError,
"matrices are not aligned");
if (PyArray_DIM(ap2, PyArray_NDIM(ap2)-1) != l) {
dot_alignment_error(ap1, PyArray_NDIM(ap1) - 1,
ap2, PyArray_NDIM(ap2) - 1);
goto fail;
}
nd = PyArray_NDIM(ap1) + PyArray_NDIM(ap2) - 2;
Expand Down
56 changes: 54 additions & 2 deletions numpy/core/src/multiarray/common.c
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ offset_bounds_from_strides(const int itemsize, const int nd,
* @param Dimensionality of the shape
* @param npy_intp pointer to shape array
* @param String to append after the shape `(1, 2)%s`.
*
*
* @return Python unicode string
*/
NPY_NO_EXPORT PyObject *
Expand Down Expand Up @@ -836,7 +836,59 @@ convert_shape_to_string(npy_intp n, npy_intp *vals, char *ending)
}
else {
tmp = PyUString_FromFormat(")%s", ending);
}
}
PyUString_ConcatAndDel(&ret, tmp);
return ret;
}


NPY_NO_EXPORT void
dot_alignment_error(PyArrayObject *a, int i, PyArrayObject *b, int j)
{
PyObject *errmsg = NULL, *format = NULL, *fmt_args = NULL,
*i_obj = NULL, *j_obj = NULL,
*shape1 = NULL, *shape2 = NULL,
*shape1_i = NULL, *shape2_j = NULL;

format = PyUString_FromString("shapes %s and %s not aligned:"
" %d (dim %d) != %d (dim %d)");

shape1 = convert_shape_to_string(PyArray_NDIM(a), PyArray_DIMS(a), "");
shape2 = convert_shape_to_string(PyArray_NDIM(b), PyArray_DIMS(b), "");

i_obj = PyLong_FromLong(i);
j_obj = PyLong_FromLong(j);

shape1_i = PyLong_FromSsize_t(PyArray_DIM(a, i));
shape2_j = PyLong_FromSsize_t(PyArray_DIM(b, j));

if (!format || !shape1 || !shape2 || !i_obj || !j_obj ||
!shape1_i || !shape2_j) {
goto end;
}

fmt_args = PyTuple_Pack(6, shape1, shape2,
shape1_i, i_obj, shape2_j, j_obj);
if (fmt_args == NULL) {
goto end;
}

errmsg = PyUString_Format(format, fmt_args);
if (errmsg != NULL) {
PyErr_SetObject(PyExc_ValueError, errmsg);
}
else {
PyErr_SetString(PyExc_ValueError, "shapes are not aligned");
}

end:
Py_XDECREF(errmsg);
Py_XDECREF(fmt_args);
Py_XDECREF(format);
Py_XDECREF(i_obj);
Py_XDECREF(j_obj);
Py_XDECREF(shape1);
Py_XDECREF(shape2);
Py_XDECREF(shape1_i);
Py_XDECREF(shape2_j);
}
7 changes: 7 additions & 0 deletions numpy/core/src/multiarray/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ offset_bounds_from_strides(const int itemsize, const int nd,
NPY_NO_EXPORT PyObject *
convert_shape_to_string(npy_intp n, npy_intp *vals, char *ending);

/*
* Sets ValueError with "matrices not aligned" message for np.dot and friends
* when a.shape[i] should match b.shape[j], but doesn't.
*/
NPY_NO_EXPORT void
dot_alignment_error(PyArrayObject *a, int i, PyArrayObject *b, int j);


/*
* Returns -1 and sets an exception if *index is an invalid index for
Expand Down
5 changes: 3 additions & 2 deletions numpy/core/src/multiarray/multiarraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,8 @@ PyArray_InnerProduct(PyObject *op1, PyObject *op2)

l = PyArray_DIMS(ap1)[PyArray_NDIM(ap1) - 1];
if (PyArray_DIMS(ap2)[PyArray_NDIM(ap2) - 1] != l) {
PyErr_SetString(PyExc_ValueError, "matrices are not aligned");
dot_alignment_error(ap1, PyArray_NDIM(ap1) - 1,
ap2, PyArray_NDIM(ap2) - 1);
goto fail;
}

Expand Down Expand Up @@ -1001,7 +1002,7 @@ PyArray_MatrixProduct2(PyObject *op1, PyObject *op2, PyArrayObject* out)
matchDim = 0;
}
if (PyArray_DIMS(ap2)[matchDim] != l) {
PyErr_SetString(PyExc_ValueError, "objects are not aligned");
dot_alignment_error(ap1, PyArray_NDIM(ap1) - 1, ap2, matchDim);
goto fail;
}
nd = PyArray_NDIM(ap1) + PyArray_NDIM(ap2) - 2;
Expand Down
0