Intermediate changes

commit_hash:bfeccc45169aaaa9244d52ddd63e29fa086dd051

68 files changed, 48 insertions, 179 deletions

diff --git a/contrib/python/numpy/include/numpy/core/include/numpy/__multiarray_api.c b/contrib/python/numpy/include/numpy/core/include/numpy/__multiarray_api.c
deleted file mode 100644
index 3161f254526..00000000000
--- a/contrib/python/numpy/include/numpy/core/include/numpy/__multiarray_api.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/include/numpy/__multiarray_api.c>
-#else
-#include <contrib/python/numpy/py2/numpy/core/include/numpy/__multiarray_api.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/include/numpy/__ufunc_api.c b/contrib/python/numpy/include/numpy/core/include/numpy/__ufunc_api.c
deleted file mode 100644
index 72f68f21425..00000000000
--- a/contrib/python/numpy/include/numpy/core/include/numpy/__ufunc_api.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/include/numpy/__ufunc_api.c>
-#else
-#include <contrib/python/numpy/py2/numpy/core/include/numpy/__ufunc_api.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/include/numpy/__umath_generated.c b/contrib/python/numpy/include/numpy/core/include/numpy/__umath_generated.c
deleted file mode 100644
index 2a234f05c3a..00000000000
--- a/contrib/python/numpy/include/numpy/core/include/numpy/__umath_generated.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/include/numpy/__umath_generated.c>
-#else
-#include <contrib/python/numpy/py2/numpy/core/include/numpy/__umath_generated.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/_simd/_simd.dispatch.c b/contrib/python/numpy/include/numpy/core/src/_simd/_simd.dispatch.c
deleted file mode 100644
index 3bdc80df9ed..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/_simd/_simd.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/_simd/_simd.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/multiarray/argfunc.dispatch.c b/contrib/python/numpy/include/numpy/core/src/multiarray/argfunc.dispatch.c
deleted file mode 100644
index b36d88d1078..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/multiarray/argfunc.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/multiarray/argfunc.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort.dispatch.cpp b/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort.dispatch.cpp
deleted file mode 100644
index 4e158241680..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort.dispatch.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.cpp>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/npysort/simd_qsort.dispatch.cpp>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp b/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp
deleted file mode 100644
index 0e352add70f..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/_umath_tests.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/_umath_tests.dispatch.c
deleted file mode 100644
index 9ab0560fa34..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/_umath_tests.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/_umath_tests.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/funcs.inc b/contrib/python/numpy/include/numpy/core/src/umath/funcs.inc
deleted file mode 100644
index 14171b0f734..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/funcs.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/funcs.inc>
-#else
-#include <contrib/python/numpy/py2/numpy/core/src/umath/funcs.inc>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_arithm_fp.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_arithm_fp.dispatch.c
deleted file mode 100644
index 18c63002c46..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_arithm_fp.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_arithm_fp.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_arithmetic.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_arithmetic.dispatch.c
deleted file mode 100644
index 33f425e557d..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_arithmetic.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_arithmetic.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_autovec.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_autovec.dispatch.c
deleted file mode 100644
index 6a72ddbf7a7..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_autovec.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_autovec.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_comparison.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_comparison.dispatch.c
deleted file mode 100644
index 15dcaa7be82..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_comparison.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_comparison.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_exponent_log.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_exponent_log.dispatch.c
deleted file mode 100644
index fb783e199ba..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_exponent_log.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_exponent_log.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_hyperbolic.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_hyperbolic.dispatch.c
deleted file mode 100644
index 98302daf706..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_hyperbolic.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_hyperbolic.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_logical.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_logical.dispatch.c
deleted file mode 100644
index 0ede76f59e9..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_logical.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_logical.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_minmax.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_minmax.dispatch.c
deleted file mode 100644
index 256928f19aa..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_minmax.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_minmax.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_modulo.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_modulo.dispatch.c
deleted file mode 100644
index cbc902510f3..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_modulo.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_modulo.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_modulo.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_trigonometric.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_trigonometric.dispatch.c
deleted file mode 100644
index fe0c3745012..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_trigonometric.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_trigonometric.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_umath_fp.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_umath_fp.dispatch.c
deleted file mode 100644
index 7f64b07760c..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_umath_fp.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_umath_fp.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_unary.dispatch.c
deleted file mode 100644
index c04c6104bdf..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_unary.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_complex.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_complex.dispatch.c
deleted file mode 100644
index 22b14d773c9..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_complex.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_unary_complex.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp.dispatch.c
deleted file mode 100644
index 72e24e1e233..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_unary_fp.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp_le.dispatch.c b/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp_le.dispatch.c
deleted file mode 100644
index c565f7b638c..00000000000
--- a/contrib/python/numpy/include/numpy/core/src/umath/loops_unary_fp_le.dispatch.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef USE_PYTHON3
-#include <contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.c>
-#else
-#error #include <contrib/python/numpy/py2/numpy/core/src/umath/loops_unary_fp_le.dispatch.c>
-#endif
diff --git a/contrib/python/numpy/include_gen.py b/contrib/python/numpy/include_gen.py
index 60d187f8142..09392d6c791 100755
--- a/contrib/python/numpy/include_gen.py
+++ b/contrib/python/numpy/include_gen.py
@@ -24,7 +24,7 @@ def include_gen(root, subpaths):
         out = join('include', path)
         py2 = join('py2', path)
         py3 = join('py3', path)
-        makedir(dirname(out))
+        os.makedirs(dirname(out), exist_ok=True)
         with open(out, 'w') as f:
             f.write(template.format(
                 '' if exists(py3) else 'error #',
@@ -47,19 +47,8 @@ def list_subpaths(subpaths, roots=('py2', 'py3'), test=is_header):
                 for filename in filenames:
                     if test(filename):
                         seen.add(join(rootrel, filename))
-                    if dirpath.endswith('numpy/core/src/umath') and filename == 'funcs.inc':
-                        seen.add(join(rootrel, filename))
-                    if dirpath.endswith('numpy/core/include/numpy') and filename in ('__multiarray_api.c', '__ufunc_api.c', '__umath_generated.c'):
-                        seen.add(join(rootrel, filename))
-                    if filename.endswith(('.dispatch.c', '.dispatch.cpp')):
-                        seen.add(join(rootrel, filename))
     return seen
 
 
-def makedir(path):
-    if not exists(path):
-        os.makedirs(path)
-
-
 if __name__ == '__main__':
     main()
diff --git a/contrib/python/numpy/py2/numpy/core/src/common/umathmodule.h b/contrib/python/numpy/py2/numpy/core/src/common/umathmodule.h
index 6998596ee72..7dd6ff9bc4a 100644
--- a/contrib/python/numpy/py2/numpy/core/src/common/umathmodule.h
+++ b/contrib/python/numpy/py2/numpy/core/src/common/umathmodule.h
@@ -1,5 +1,5 @@
-#include "__umath_generated.c"
-#include "__ufunc_api.c"
+#include "contrib/python/numpy/py2/numpy/core/include/numpy/__umath_generated.c"
+#include "contrib/python/numpy/py2/numpy/core/include/numpy/__ufunc_api.c"
 
 PyObject * add_newdoc_ufunc(PyObject *NPY_UNUSED(dummy), PyObject *args);
 PyObject * ufunc_frompyfunc(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kwds));
diff --git a/contrib/python/numpy/py2/numpy/core/src/multiarray/multiarraymodule.c b/contrib/python/numpy/py2/numpy/core/src/multiarray/multiarraymodule.c
index 88ed4664ab8..14f6f54b604 100644
--- a/contrib/python/numpy/py2/numpy/core/src/multiarray/multiarraymodule.c
+++ b/contrib/python/numpy/py2/numpy/core/src/multiarray/multiarraymodule.c
@@ -72,7 +72,7 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0;
  **                    INCLUDE GENERATED CODE                               **
  *****************************************************************************
  */
-#include "funcs.inc"
+#include "contrib/python/numpy/py2/numpy/core/src/umath/funcs.inc"
 #include "umathmodule.h"
 
 NPY_NO_EXPORT int initscalarmath(PyObject *);
@@ -4272,7 +4272,7 @@ static struct PyMethodDef array_module_methods[] = {
     {NULL, NULL, 0, NULL}                /* sentinel */
 };
 
-#include "__multiarray_api.c"
+#include "contrib/python/numpy/py2/numpy/core/include/numpy/__multiarray_api.c"
 
 /* Establish scalar-type hierarchy
  *
diff --git a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512_skx.c
index d8d42f62c93..9b9d7b7f42a 100644
--- a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/_simd/_simd.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512f.c
index c78f068d3b5..b17423eac20 100644
--- a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/_simd/_simd.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.fma3.avx2.c
index c3b8fcc5649..68226627e11 100644
--- a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/_simd/_simd.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.sse42.c b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.sse42.c
index 02d0cd0522f..f0213b87d9d 100644
--- a/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.sse42.c
+++ b/contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.sse42.c
@@ -11,4 +11,4 @@
 #define NPY__CPU_TARGET_SSE41
 #define NPY__CPU_TARGET_POPCNT
 #define NPY__CPU_TARGET_SSE42
-#include "numpy/core/src/_simd/_simd.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/_simd/_simd.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx2.c
index a9bd428f2f5..a0dc6ee9b5d 100644
--- a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/multiarray/argfunc.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx512_skx.c
index 9bc61758a74..e79d403e7d7 100644
--- a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/multiarray/argfunc.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.sse42.c b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.sse42.c
index 56ae72e4113..dc909fd0596 100644
--- a/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.sse42.c
+++ b/contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.sse42.c
@@ -11,4 +11,4 @@
 #define NPY__CPU_TARGET_SSE41
 #define NPY__CPU_TARGET_POPCNT
 #define NPY__CPU_TARGET_SSE42
-#include "numpy/core/src/multiarray/argfunc.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/multiarray/argfunc.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/multiarray/multiarraymodule.c b/contrib/python/numpy/py3/numpy/core/src/multiarray/multiarraymodule.c
index 66305722d14..a9821148b71 100644
--- a/contrib/python/numpy/py3/numpy/core/src/multiarray/multiarraymodule.c
+++ b/contrib/python/numpy/py3/numpy/core/src/multiarray/multiarraymodule.c
@@ -86,7 +86,7 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0;
  *****************************************************************************
  */
 /* __ufunc_api.c define is the PyUFunc_API table: */
-#include "__ufunc_api.c"
+#include "contrib/python/numpy/py3/numpy/core/include/numpy/__ufunc_api.c"
 
 NPY_NO_EXPORT int initscalarmath(PyObject *);
 NPY_NO_EXPORT int set_matmul_flags(PyObject *d); /* in ufunc_object.c */
@@ -4772,7 +4772,7 @@ static struct PyMethodDef array_module_methods[] = {
     {NULL, NULL, 0, NULL}                /* sentinel */
 };
 
-#include "__multiarray_api.c"
+#include "contrib/python/numpy/py3/numpy/core/include/numpy/__multiarray_api.c"
 #include "array_method.h"
 
 /* Establish scalar-type hierarchy
diff --git a/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.avx512_skx.cpp b/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.avx512_skx.cpp
index 8f86eb2aa8b..a6bee384703 100644
--- a/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.avx512_skx.cpp
+++ b/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.avx512_skx.cpp
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/npysort/simd_qsort.dispatch.cpp"
+#include "contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort.dispatch.cpp"
diff --git a/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.avx512_icl.cpp b/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.avx512_icl.cpp
index 3863e07035d..e1ab7f95df0 100644
--- a/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.avx512_icl.cpp
+++ b/contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.avx512_icl.cpp
@@ -21,4 +21,4 @@
 #define NPY__CPU_TARGET_AVX512_CLX
 #define NPY__CPU_TARGET_AVX512_CNL
 #define NPY__CPU_TARGET_AVX512_ICL
-#include "numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp"
+#include "contrib/python/numpy/py3/numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.avx2.c
index cf251f436c6..dbf6d64b4d1 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/_umath_tests.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.sse41.c b/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.sse41.c
index e5474e779a9..7a76eb2de22 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.sse41.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.sse41.c
@@ -9,4 +9,4 @@
 #define NPY__CPU_TARGET_SSE3
 #define NPY__CPU_TARGET_SSSE3
 #define NPY__CPU_TARGET_SSE41
-#include "numpy/core/src/umath/_umath_tests.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/_umath_tests.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.fma3.avx2.c
index 96b2cdc2593..eafb26c8e45 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_arithm_fp.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_arithm_fp.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx2.c
index 0efe78d1328..837db62653e 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_arithmetic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512_skx.c
index 85342598081..b96b9ae6849 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_arithmetic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512f.c
index c682f3b37fb..f0d86b69c04 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/umath/loops_arithmetic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.sse41.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.sse41.c
index 7c7a887082e..ceef6f66d27 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.sse41.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.sse41.c
@@ -9,4 +9,4 @@
 #define NPY__CPU_TARGET_SSE3
 #define NPY__CPU_TARGET_SSSE3
 #define NPY__CPU_TARGET_SSE41
-#include "numpy/core/src/umath/loops_arithmetic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_arithmetic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.avx2.c
index d94ca1f3215..6327c7ba0ce 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_autovec.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_autovec.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx2.c
index 28d2da5e690..622a8d73ba0 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_comparison.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512_skx.c
index 392934b8dfc..fcad9d90b16 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_comparison.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512f.c
index e4996533c2d..7356062494d 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/umath/loops_comparison.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.sse42.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.sse42.c
index 1f0a1debcc0..6d8a45c2ca7 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.sse42.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.sse42.c
@@ -11,4 +11,4 @@
 #define NPY__CPU_TARGET_SSE41
 #define NPY__CPU_TARGET_POPCNT
 #define NPY__CPU_TARGET_SSE42
-#include "numpy/core/src/umath/loops_comparison.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_comparison.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512_skx.c
index 1a160721a6f..9de74a53315 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_exponent_log.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512f.c
index d5890d1222f..06e285747d3 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/umath/loops_exponent_log.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.fma3.avx2.c
index 44599b9e41a..50b98551906 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_exponent_log.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_exponent_log.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.avx512_skx.c
index a7b179eed7d..638f29b9438 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_hyperbolic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.fma3.avx2.c
index ded86014af3..8c26d8b19bd 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_hyperbolic.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_hyperbolic.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx2.c
index 9f5b3f17367..9f87707cb96 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_logical.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx512_skx.c
index 5987a2dbde9..879c6b4bec2 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_logical.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_logical.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx2.c
index 27f85ddfc1d..d8d17824235 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_minmax.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx512_skx.c
index b507df0bd14..87d45754cbe 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_minmax.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_minmax.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.avx512f.c
index a725c7e5987..0c9becb5861 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/umath/loops_trigonometric.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.fma3.avx2.c
index cd28fd87df1..a8dbe33741f 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_trigonometric.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_trigonometric.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.avx512_skx.c
index 22f4cdc1202..2ccc0559c58 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_umath_fp.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_umath_fp.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx2.c
index 7e8a7043586..d8dcaae6dbc 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx2.c
@@ -14,4 +14,4 @@
 #define NPY__CPU_TARGET_AVX
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_unary.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx512_skx.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx512_skx.c
index d741e4a6910..c44e660482e 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx512_skx.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.avx512_skx.c
@@ -18,4 +18,4 @@
 #define NPY__CPU_TARGET_AVX512F
 #define NPY__CPU_TARGET_AVX512CD
 #define NPY__CPU_TARGET_AVX512_SKX
-#include "numpy/core/src/umath/loops_unary.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.avx512f.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.avx512f.c
index 070dd62ecd7..7fecf6f73f8 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.avx512f.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.avx512f.c
@@ -16,4 +16,4 @@
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
 #define NPY__CPU_TARGET_AVX512F
-#include "numpy/core/src/umath/loops_unary_complex.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.fma3.avx2.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.fma3.avx2.c
index f5873849c67..d366b0ee0a4 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.fma3.avx2.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.fma3.avx2.c
@@ -15,4 +15,4 @@
 #define NPY__CPU_TARGET_F16C
 #define NPY__CPU_TARGET_FMA3
 #define NPY__CPU_TARGET_AVX2
-#include "numpy/core/src/umath/loops_unary_complex.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_complex.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.sse41.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.sse41.c
index ef2c1b15e67..6d377dd6571 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.sse41.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.sse41.c
@@ -9,4 +9,4 @@
 #define NPY__CPU_TARGET_SSE3
 #define NPY__CPU_TARGET_SSSE3
 #define NPY__CPU_TARGET_SSE41
-#include "numpy/core/src/umath/loops_unary_fp.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.sse41.c b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.sse41.c
index 4cbe55e1386..2695af95381 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.sse41.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.sse41.c
@@ -9,4 +9,4 @@
 #define NPY__CPU_TARGET_SSE3
 #define NPY__CPU_TARGET_SSSE3
 #define NPY__CPU_TARGET_SSE41
-#include "numpy/core/src/umath/loops_unary_fp_le.dispatch.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/loops_unary_fp_le.dispatch.c"
diff --git a/contrib/python/numpy/py3/numpy/core/src/umath/umathmodule.c b/contrib/python/numpy/py3/numpy/core/src/umath/umathmodule.c
index 0aa32820d0a..caad126172f 100644
--- a/contrib/python/numpy/py3/numpy/core/src/umath/umathmodule.c
+++ b/contrib/python/numpy/py3/numpy/core/src/umath/umathmodule.c
@@ -29,8 +29,8 @@
 #include "string_ufuncs.h"
 
 /* Automatically generated code to define all ufuncs: */
-#include "funcs.inc"
-#include "__umath_generated.c"
+#include "contrib/python/numpy/py3/numpy/core/src/umath/funcs.inc"
+#include "contrib/python/numpy/py3/numpy/core/include/numpy/__umath_generated.c"
 
 
 static PyUFuncGenericFunction pyfunc_functions[] = {PyUFunc_On_Om};