diff options
| author | mattip <matti.picus@gmail.com> | 2022-08-07 22:24:56 +0300 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2022-08-21 18:26:10 +0300 |
| commit | e9e8cee18ad6aa0b500a0188e239f260b71dfb78 (patch) | |
| tree | 4fdc812dba57e56be643a043be9cd000da738187 /numpy/core | |
| parent | f33e5790ee7fa338208749a052f129ff73e12404 (diff) | |
| download | numpy-e9e8cee18ad6aa0b500a0188e239f260b71dfb78.tar.gz | |
rearrange headers to make npy_config.h only about config
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/_simd/_simd.h | 3 | ||||
| -rw-r--r-- | numpy/core/src/common/npy_config.h | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/common.h | 4 | ||||
| -rw-r--r-- | numpy/core/src/umath/_umath_tests.c.src | 3 | ||||
| -rw-r--r-- | numpy/core/src/umath/umathmodule.c | 3 |
5 files changed, 14 insertions, 3 deletions
diff --git a/numpy/core/src/_simd/_simd.h b/numpy/core/src/_simd/_simd.h index d9905c801..dfe4d6bb4 100644 --- a/numpy/core/src/_simd/_simd.h +++ b/numpy/core/src/_simd/_simd.h @@ -17,6 +17,9 @@ #ifndef NPY_DISABLE_OPTIMIZATION // autogenerated, required for CPU dispatch macros +#include "npy_cpu_features.h" +#include "npy_cpu_dispatch.h" +#include "numpy/npy_cpu.h" #include "_simd.dispatch.h" #endif /** diff --git a/numpy/core/src/common/npy_config.h b/numpy/core/src/common/npy_config.h index cca809c7f..610216a34 100644 --- a/numpy/core/src/common/npy_config.h +++ b/numpy/core/src/common/npy_config.h @@ -2,10 +2,8 @@ #define NUMPY_CORE_SRC_COMMON_NPY_CONFIG_H_ #include "config.h" -#include "npy_cpu_features.h" -#include "npy_cpu_dispatch.h" #include "numpy/numpyconfig.h" -#include "numpy/npy_cpu.h" +#include "numpy/utils.h" #include "numpy/npy_os.h" /* blocklist */ diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h index a6c117745..3de8c842d 100644 --- a/numpy/core/src/multiarray/common.h +++ b/numpy/core/src/multiarray/common.h @@ -4,6 +4,10 @@ #include <structmember.h> #include "numpy/npy_common.h" #include "numpy/ndarraytypes.h" +#include "npy_cpu_features.h" +#include "npy_cpu_dispatch.h" +#include "numpy/npy_cpu.h" + #include "npy_import.h" #include <limits.h> diff --git a/numpy/core/src/umath/_umath_tests.c.src b/numpy/core/src/umath/_umath_tests.c.src index ce42fc271..1bf459ce6 100644 --- a/numpy/core/src/umath/_umath_tests.c.src +++ b/numpy/core/src/umath/_umath_tests.c.src @@ -16,6 +16,9 @@ #include "npy_pycompat.h" #include "npy_config.h" +#include "npy_cpu_features.h" +#include "npy_cpu_dispatch.h" +#include "numpy/npy_cpu.h" /* ***************************************************************************** diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c index 17fedec6f..0aa32820d 100644 --- a/numpy/core/src/umath/umathmodule.c +++ b/numpy/core/src/umath/umathmodule.c @@ -14,6 +14,9 @@ #include <Python.h> #include "npy_config.h" +#include "npy_cpu_features.h" +#include "npy_cpu_dispatch.h" +#include "numpy/npy_cpu.h" #include "numpy/arrayobject.h" #include "numpy/ufuncobject.h" |