diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/bento.info | 9 | ||||
| -rw-r--r-- | numpy/core/blasdot/_dotblas.c | 2 | ||||
| -rw-r--r-- | numpy/core/bscript | 8 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/private/ufunc_override.h | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/numpy/core/bento.info b/numpy/core/bento.info index bda64d474..cad7ffe8c 100644 --- a/numpy/core/bento.info +++ b/numpy/core/bento.info @@ -32,3 +32,12 @@ Library: Extension: _dotblas Sources: blasdot/_dotblas.c + Extension: test_rational + Sources: + src/umath/test_rational.c.src + Extension: struct_ufunc_test + Sources: + src/umath/struct_ufunc_test.c.src + Extension: operand_flag_tests + Sources: + src/umath/operand_flag_tests.c.src diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c index 7a9f858e3..9119ade14 100644 --- a/numpy/core/blasdot/_dotblas.c +++ b/numpy/core/blasdot/_dotblas.c @@ -9,7 +9,7 @@ #include "numpy/arrayobject.h" #include "npy_config.h" #include "npy_pycompat.h" -#include "private/ufunc_override.h" +#include "ufunc_override.h" #ifndef CBLAS_HEADER #define CBLAS_HEADER "cblas.h" #endif diff --git a/numpy/core/bscript b/numpy/core/bscript index ee5543354..ced37a530 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -234,6 +234,9 @@ def check_math_runtime(conf): features=features, mandatory=False, use="M") conf.check_functions_at_once(C99_FUNCS_EXTENDED, features=features, mandatory=False, use="M") + # TODO: add OPTIONAL_HEADERS, OPTIONAL_INTRINSICS and + # OPTIONAL_GCC_ATTRIBUTES (see setup.py and gh-3766). These are + # performance optimizations for GCC. for f in ["isnan", "isinf", "signbit", "isfinite"]: try: @@ -502,7 +505,7 @@ def pre_build(context): pattern="umath_generated", name="umath_gen") - includes = ["src/umath", "src/private"] + includes = ["src/umath", "src/multiarray", "src/private"] if ENABLE_SEPARATE_COMPILATION: sources = [ pjoin("src", "umath", "loops.c.src"), @@ -525,5 +528,6 @@ def pre_build(context): def build_dotblas(extension): if bld.env.HAS_CBLAS: - return context.default_builder(extension, use="CBLAS", includes=["src/private"]) + return context.default_builder(extension, use="CBLAS", + includes=["src/multiarray", "src/private"]) context.register_builder("_dotblas", build_dotblas) diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index f4ceecde9..d12b05d3d 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -53,7 +53,7 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0; #include "ctors.h" #include "array_assign.h" #include "common.h" -#include "private/ufunc_override.h" +#include "ufunc_override.h" /* Only here for API compatibility */ NPY_NO_EXPORT PyTypeObject PyBigArray_Type; diff --git a/numpy/core/src/private/ufunc_override.h b/numpy/core/src/private/ufunc_override.h index af7f6e46e..d445ac2b8 100644 --- a/numpy/core/src/private/ufunc_override.h +++ b/numpy/core/src/private/ufunc_override.h @@ -2,7 +2,7 @@ #define __UFUNC_OVERRIDE_H #include <npy_config.h> #include "numpy/arrayobject.h" -#include "multiarray/common.h" +#include "common.h" /* * Check a set of args for the `__numpy_ufunc__` method. If more than one of |