From 93feabba42a6c18a66224dae170ecee08e0f10f9 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sun, 17 Aug 2014 15:10:08 -0600 Subject: 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. --- numpy/core/numeric.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'numpy/core/numeric.py') 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) -- cgit v1.2.1