diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-08-17 15:10:08 -0600 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-09-04 21:45:48 +0200 |
| commit | 93feabba42a6c18a66224dae170ecee08e0f10f9 (patch) | |
| tree | 01d327659e1f20c1a29fcbb8b55a194662228cb9 /numpy/core/numeric.py | |
| parent | fee3c926fbd48f477121e95b86ede32fcdb30ea9 (diff) | |
| download | numpy-93feabba42a6c18a66224dae170ecee08e0f10f9.tar.gz | |
ENH: Move dotblas_innerproduct down into multiarray.
Move the dotblas_innerproduct function from the _dotblas.c file to a new
cblasfuncs.c file in multiarray and rename it cblas_innerproduct.
Modify it so that it can called directly from PyArray_InnerProduct and
do so. Fix up numeric.py and the tests to reflect these changes.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index af53ac417..8db3705f7 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -4,7 +4,7 @@ import os import sys import warnings import collections -from . import multiarray +from numpy.core import multiarray from . import umath from .umath import (invert, sin, UFUNC_BUFSIZE_DEFAULT, ERR_IGNORE, ERR_WARN, ERR_RAISE, ERR_CALL, ERR_PRINT, ERR_LOG, @@ -1084,7 +1084,7 @@ try: os.environ['openblas_main_free'] = '1' if 'gotoblas_main_free' not in os.environ: os.environ['gotoblas_main_free'] = '1' - from ._dotblas import vdot, inner + from ._dotblas import vdot except ImportError: # docstrings are in add_newdocs.py inner = multiarray.inner @@ -1096,6 +1096,7 @@ finally: del envbak dot = multiarray.dot +inner = multiarray.inner def alterdot(): warnings.warn("alterdot no longer does anything.", DeprecationWarning) |