MAINT: merge umath, multiarray into _multiarray, add python wrappers

12 files changed, 126 insertions, 84 deletions

diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py
index b4aeaa277..7f2541667 100644
--- a/numpy/core/code_generators/generate_numpy_api.py
+++ b/numpy/core/code_generators/generate_numpy_api.py
@@ -46,11 +46,11 @@ static int
 _import_array(void)
 {
   int st;
-  PyObject *numpy = PyImport_ImportModule("numpy.core.multiarray");
+  PyObject *numpy = PyImport_ImportModule("numpy.core._multiarray_umath");
   PyObject *c_api = NULL;
 
   if (numpy == NULL) {
-      PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
+      PyErr_SetString(PyExc_ImportError, "numpy.core._multiarray_umath failed to import");
       return -1;
   }
   c_api = PyObject_GetAttrString(numpy, "_ARRAY_API");
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py
index 3bcf137f7..508c9524f 100644
--- a/numpy/core/code_generators/generate_ufunc_api.py
+++ b/numpy/core/code_generators/generate_ufunc_api.py
@@ -36,11 +36,14 @@ static void **PyUFunc_API=NULL;
 static NPY_INLINE int
 _import_umath(void)
 {
-  PyObject *numpy = PyImport_ImportModule("numpy.core.umath");
+  PyObject *numpy = PyImport_ImportModule("numpy.core._multiarray_umath");
   PyObject *c_api = NULL;
 
   if (numpy == NULL) {
-      PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import");
+      numpy = PyImport_ImportModule("_multiarray");
+  }
+  if (numpy == NULL) {
+      PyErr_SetString(PyExc_ImportError, "numpy.core._multiarray_umath failed to import (tried also as '_multiarray'");
       return -1;
   }
   c_api = PyObject_GetAttrString(numpy, "_UFUNC_API");
diff --git a/numpy/core/multiarray.py b/numpy/core/multiarray.py
new file mode 100644
index 000000000..89759458b
--- /dev/null
+++ b/numpy/core/multiarray.py
@@ -0,0 +1,27 @@
+from . import _multiarray_umath
+from numpy.core._multiarray_umath import *
+from numpy.core._multiarray_umath import (_fastCopyAndTranspose, _flagdict, _insert,
+     _reconstruct, _vec_string)
+
+__all__ = ['ALLOW_THREADS', 'BUFSIZE', 'CLIP', 'DATETIMEUNITS',
+    'ITEM_HASOBJECT', 'ITEM_IS_POINTER', 'LIST_PICKLE', 'MAXDIMS',
+    'MAY_SHARE_BOUNDS', 'MAY_SHARE_EXACT', 'NEEDS_INIT', 'NEEDS_PYAPI',
+    'RAISE', 'USE_GETITEM', 'USE_SETITEM', 'WRAP',
+    '_fastCopyAndTranspose', '_flagdict', '_insert', '_reconstruct',
+    '_vec_string',
+    'add_docstring', 'arange', 'array', 'bincount', 'broadcast', 'busday_count',
+    'busday_offset', 'busdaycalendar', 'can_cast', 'compare_chararrays',
+    'concatenate', 'copyto', 'correlate', 'correlate2', 'count_nonzero',
+    'c_einsum', 'datetime_as_string', 'datetime_data', 'digitize', 'dot',
+    'dragon4_positional', 'dragon4_scientific', 'dtype', 'empty', 'empty_like',
+    'error', 'flagsobj', 'flatiter', 'format_longfloat', 'frombuffer',
+    'fromfile', 'fromiter', 'fromstring', 'getbuffer', 'inner', 'int_asbuffer',
+    'interp', 'interp_complex', 'is_busday', 'lexsort', 'matmul',
+    'may_share_memory', 'min_scalar_type', 'ndarray', 'nditer', 'nested_iters',
+    'newbuffer', 'normalize_axis_index', 'packbits', 'promote_types',
+    'putmask', 'ravel_multi_index', 'result_type', 'scalar',
+    'set_datetimeparse_function', 'set_legacy_print_mode', 'set_numeric_ops',
+    'set_string_function', 'set_typeDict', 'shares_memory', 'test_interrupt',
+    'tracemalloc_domain', 'typeinfo', 'unpackbits', 'unravel_index', 'vdot',
+    'where', 'zeros']
+
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index f826b278f..d450d27db 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -710,7 +710,7 @@ def configuration(parent_package='',top_path=None):
                        include_dirs=[])
 
     #######################################################################
-    #                        multiarray module                            #
+    #             _multiarray_umath module - multiarray part              #
     #######################################################################
 
     multiarray_deps = [
@@ -842,19 +842,8 @@ def configuration(parent_package='',top_path=None):
     else:
         extra_info = {}
 
-    config.add_extension('multiarray',
-                         sources=multiarray_src +
-                                 [generate_config_h,
-                                  generate_numpyconfig_h,
-                                  generate_numpy_api,
-                                  join(codegen_dir, 'generate_numpy_api.py'),
-                                  join('*.py')],
-                         depends=deps + multiarray_deps,
-                         libraries=['npymath', 'npysort'],
-                         extra_info=extra_info)
-
     #######################################################################
-    #                           umath module                              #
+    #             _multiarray_umath module - umath part                   #
     #######################################################################
 
     def generate_umath_c(ext, build_dir):
@@ -883,9 +872,10 @@ def configuration(parent_package='',top_path=None):
             join('src', 'umath', 'scalarmath.c.src'),
             join('src', 'umath', 'ufunc_type_resolution.c'),
             join('src', 'umath', 'override.c'),
-            join('src', 'private', 'mem_overlap.c'),
-            join('src', 'private', 'npy_longdouble.c'),
-            join('src', 'private', 'ufunc_override.c')]
+            # join('src', 'private', 'mem_overlap.c'),
+            # join('src', 'private', 'npy_longdouble.c'),
+            # join('src', 'private', 'ufunc_override.c'),
+            ]
 
     umath_deps = [
             generate_umath_py,
@@ -902,15 +892,19 @@ def configuration(parent_package='',top_path=None):
             join('src', 'private', 'ufunc_override.h'),
             join('src', 'private', 'binop_override.h')] + npymath_sources
 
-    config.add_extension('umath',
-                         sources=umath_src +
+    config.add_extension('_multiarray_umath',
+                         sources=multiarray_src + umath_src +
                                  [generate_config_h,
-                                 generate_numpyconfig_h,
-                                 generate_umath_c,
-                                 generate_ufunc_api],
-                         depends=deps + umath_deps,
-                         libraries=['npymath'],
-                         )
+                                  generate_numpyconfig_h,
+                                  generate_numpy_api,
+                                  join(codegen_dir, 'generate_numpy_api.py'),
+                                  join('*.py'),
+                                  generate_umath_c,
+                                  generate_ufunc_api,
+                                 ],
+                         depends=deps + multiarray_deps + umath_deps,
+                         libraries=['npymath', 'npysort'],
+                         extra_info=extra_info)
 
     #######################################################################
     #                        umath_tests module                           #
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index a0dc98f0e..a393cf603 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -2401,7 +2401,7 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *NPY_UNUSED(args))
     if (ret == NULL) {
         return NULL;
     }
-    mod = PyImport_ImportModule("numpy.core.multiarray");
+    mod = PyImport_ImportModule("numpy.core._multiarray");
     if (mod == NULL) {
         Py_DECREF(ret);
         return NULL;
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index 2e836d1d0..dc74c9d17 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -1566,7 +1566,7 @@ array_reduce(PyArrayObject *self, PyObject *NPY_UNUSED(args))
     if (ret == NULL) {
         return NULL;
     }
-    mod = PyImport_ImportModule("numpy.core.multiarray");
+    mod = PyImport_ImportModule("numpy.core._multiarray");
     if (mod == NULL) {
         Py_DECREF(ret);
         return NULL;
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index dc571dfcb..ddce9936a 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -66,6 +66,9 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0;
 
 #include "get_attr_string.h"
 
+#include "numpy/ufuncobject.h"
+#include "ufunc_object.h"
+
 /*
  * global variable to determine if legacy printing is enabled, accessible from
  * C. For simplicity the mode is encoded as an integer where '0' means no
@@ -4181,6 +4184,11 @@ normalize_axis_index(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwds)
     return PyInt_FromLong(axis);
 }
 
+/* declarations from umathmodule.c */
+PyObject * add_newdoc_ufunc(PyObject *NPY_UNUSED(dummy), PyObject *args);
+PyObject * ufunc_frompyfunc(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kwds));
+int initumath(PyObject *m);
+
 static struct PyMethodDef array_module_methods[] = {
     {"_get_ndarray_c_version",
         (PyCFunction)array__get_ndarray_c_version,
@@ -4365,6 +4373,18 @@ static struct PyMethodDef array_module_methods[] = {
         METH_VARARGS | METH_KEYWORDS, NULL},
     {"set_legacy_print_mode", (PyCFunction)set_legacy_print_mode,
         METH_VARARGS, NULL},
+    /* from umath */
+    {"frompyfunc",
+        (PyCFunction) ufunc_frompyfunc,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"seterrobj",
+        (PyCFunction) ufunc_seterr,
+        METH_VARARGS, NULL},
+    {"geterrobj",
+        (PyCFunction) ufunc_geterr,
+        METH_VARARGS, NULL},
+    {"_add_newdoc_ufunc", (PyCFunction)add_newdoc_ufunc,
+        METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}                /* sentinel */
 };
 
@@ -4624,7 +4644,7 @@ intern_strings(void)
 #if defined(NPY_PY3K)
 static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
-        "multiarray",
+        "_multiarray_umath",
         NULL,
         -1,
         array_module_methods,
@@ -4638,10 +4658,10 @@ static struct PyModuleDef moduledef = {
 /* Initialization function for the module */
 #if defined(NPY_PY3K)
 #define RETVAL(x) x
-PyMODINIT_FUNC PyInit_multiarray(void) {
+PyMODINIT_FUNC PyInit__multiarray_umath(void) {
 #else
 #define RETVAL(x)
-PyMODINIT_FUNC initmultiarray(void) {
+PyMODINIT_FUNC init_multiarray_umath(void) {
 #endif
     PyObject *m, *d, *s;
     PyObject *c_api;
@@ -4650,7 +4670,7 @@ PyMODINIT_FUNC initmultiarray(void) {
 #if defined(NPY_PY3K)
     m = PyModule_Create(&moduledef);
 #else
-    m = Py_InitModule("multiarray", array_module_methods);
+    m = Py_InitModule("_multiarray_umath", array_module_methods);
 #endif
     if (!m) {
         goto err;
@@ -4806,7 +4826,9 @@ PyMODINIT_FUNC initmultiarray(void) {
     if (set_typeinfo(d) != 0) {
         goto err;
     }
-
+    if (initumath(m) != 0) {
+        goto err;
+    }
     return RETVAL(m);
 
  err:
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
index a32aa47ab..c6b2c99f2 100644
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -1875,7 +1875,7 @@ gentype_reduce(PyObject *self, PyObject *NPY_UNUSED(args))
     }
 #endif
 
-    mod = PyImport_ImportModule("numpy.core.multiarray");
+    mod = PyImport_ImportModule("numpy.core._multiarray");
     if (mod == NULL) {
         return NULL;
     }
diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c
index 9291a5138..69bedc737 100644
--- a/numpy/core/src/umath/umathmodule.c
+++ b/numpy/core/src/umath/umathmodule.c
@@ -82,7 +82,7 @@ object_ufunc_loop_selector(PyUFuncObject *ufunc,
     return 0;
 }
 
-static PyObject *
+PyObject *
 ufunc_frompyfunc(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kwds)) {
     /* Keywords are ignored for now */
 
@@ -179,7 +179,7 @@ ufunc_frompyfunc(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUS
 }
 
 /* docstring in numpy.add_newdocs.py */
-static PyObject *
+PyObject *
 add_newdoc_ufunc(PyObject *NPY_UNUSED(dummy), PyObject *args)
 {
     PyUFuncObject *ufunc;
@@ -273,7 +273,7 @@ intern_strings(void)
 /* Setup the umath module */
 /* Remove for time being, it is declared in __ufunc_api.h */
 /*static PyTypeObject PyUFunc_Type;*/
-
+/*
 static struct PyMethodDef methods[] = {
     {"frompyfunc",
         (PyCFunction) ufunc_frompyfunc,
@@ -286,62 +286,33 @@ static struct PyMethodDef methods[] = {
         METH_VARARGS, NULL},
     {"_add_newdoc_ufunc", (PyCFunction)add_newdoc_ufunc,
         METH_VARARGS, NULL},
-    {NULL, NULL, 0, NULL}                /* sentinel */
+    {NULL, NULL, 0, NULL}
 };
-
-
-#if defined(NPY_PY3K)
-static struct PyModuleDef moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "umath",
-        NULL,
-        -1,
-        methods,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-#endif
+*/
 
 #include <stdio.h>
 
-#if defined(NPY_PY3K)
-#define RETVAL(x) x
-PyMODINIT_FUNC PyInit_umath(void)
-#else
-#define RETVAL(x)
-PyMODINIT_FUNC initumath(void)
-#endif
+int initumath(PyObject *m)
 {
-    PyObject *m, *d, *s, *s2, *c_api;
+    PyObject *d, *s, *s2, *c_api;
     int UFUNC_FLOATING_POINT_SUPPORT = 1;
 
 #ifdef NO_UFUNC_FLOATING_POINT_SUPPORT
     UFUNC_FLOATING_POINT_SUPPORT = 0;
 #endif
-    /* Create the module and add the functions */
-#if defined(NPY_PY3K)
-    m = PyModule_Create(&moduledef);
-#else
-    m = Py_InitModule("umath", methods);
-#endif
-    if (!m) {
-        goto err;
-    }
-
-    /* Import the array */
+    /* No need to import the array, only called via import in the first place
     if (_import_array() < 0) {
         if (!PyErr_Occurred()) {
             PyErr_SetString(PyExc_ImportError,
                             "umath failed: Could not import array core.");
         }
-        goto err;
+        return -1;
     }
+    */
 
     /* Initialize the types */
     if (PyType_Ready(&PyUFunc_Type) < 0)
-        goto err;
+        return -1;
 
     /* Add some symbolic constants to the module */
     d = PyModule_GetDict(m);
@@ -423,13 +394,13 @@ PyMODINIT_FUNC initumath(void)
         goto err;
     }
 
-    return RETVAL(m);
+    return 0;
 
  err:
     /* Check for errors */
     if (!PyErr_Occurred()) {
         PyErr_SetString(PyExc_RuntimeError,
-                        "cannot load umath module.");
+                        "cannot load umath part of _multiarray_umath.");
     }
-    return RETVAL(NULL);
+    return -1;
 }
diff --git a/numpy/core/umath.py b/numpy/core/umath.py
new file mode 100644
index 000000000..6a08bbe15
--- /dev/null
+++ b/numpy/core/umath.py
@@ -0,0 +1,25 @@
+from . import _multiarray_umath
+from numpy.core._multiarray_umath import *
+from numpy.core._multiarray_umath import _add_newdoc_ufunc, _arg
+
+__all__ = ['ERR_CALL', 'ERR_DEFAULT', 'ERR_IGNORE', 'ERR_LOG', 'ERR_PRINT',
+    'ERR_RAISE', 'ERR_WARN', 'FLOATING_POINT_SUPPORT', 'FPE_DIVIDEBYZERO',
+    'FPE_INVALID', 'FPE_OVERFLOW', 'FPE_UNDERFLOW', 'NAN', 'NINF', 'NZERO',
+    'PINF', 'PZERO', 'SHIFT_DIVIDEBYZERO', 'SHIFT_INVALID', 'SHIFT_OVERFLOW',
+    'SHIFT_UNDERFLOW', 'UFUNC_BUFSIZE_DEFAULT', 'UFUNC_PYVALS_NAME',
+    '_add_newdoc_ufunc', '_arg',
+    'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan',
+    'arctan2', 'arctanh', 'bitwise_and', 'bitwise_or', 'bitwise_xor', 'cbrt',
+    'ceil', 'conj', 'conjugate', 'copysign', 'cos', 'cosh', 'deg2rad',
+    'degrees', 'divide', 'divmod', 'e', 'equal', 'euler_gamma', 'exp', 'exp2',
+    'expm1', 'fabs', 'floor', 'floor_divide', 'float_power', 'fmax', 'fmin',
+    'fmod', 'frexp', 'frompyfunc', 'gcd', 'geterrobj', 'greater',
+    'greater_equal', 'heaviside', 'hypot', 'invert', 'isfinite', 'isinf',
+    'isnan', 'isnat', 'lcm', 'ldexp', 'left_shift', 'less', 'less_equal',
+    'log', 'log10', 'log1p', 'log2', 'logaddexp', 'logaddexp2', 'logical_and',
+    'logical_not', 'logical_or', 'logical_xor', 'maximum', 'minimum', 'mod',
+    'modf', 'multiply', 'negative', 'nextafter', 'not_equal', 'pi', 'positive',
+    'power', 'rad2deg', 'radians', 'reciprocal', 'remainder', 'right_shift',
+    'rint', 'seterrobj', 'sign', 'signbit', 'sin', 'sinh', 'spacing', 'sqrt',
+    'square', 'subtract', 'tan', 'tanh', 'true_divide', 'trunc']
+
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
index dc40ac67b..c1757150e 100644
--- a/numpy/lib/__init__.py
+++ b/numpy/lib/__init__.py
@@ -26,7 +26,7 @@ from .financial import *
 from .arrayterator import Arrayterator
 from .arraypad import *
 from ._version import *
-from numpy.core.multiarray import tracemalloc_domain
+from numpy.core._multiarray_umath import tracemalloc_domain
 
 __all__ = ['emath', 'math', 'tracemalloc_domain']
 __all__ += type_check.__all__
diff --git a/numpy/tests/test_ctypeslib.py b/numpy/tests/test_ctypeslib.py
index 62793a9d6..675f8d242 100644
--- a/numpy/tests/test_ctypeslib.py
+++ b/numpy/tests/test_ctypeslib.py
@@ -12,11 +12,11 @@ try:
     cdll = None
     if hasattr(sys, 'gettotalrefcount'):
         try:
-            cdll = load_library('multiarray_d', np.core.multiarray.__file__)
+            cdll = load_library('_multiarray_umath_d', np.core._multiarray_umath.__file__)
         except OSError:
             pass
     if cdll is None:
-        cdll = load_library('multiarray', np.core.multiarray.__file__)
+        cdll = load_library('_multiarray_umath', np.core._multiarray_umath.__file__)
     _HAS_CTYPE = True
 except ImportError:
     _HAS_CTYPE = False
@@ -30,7 +30,7 @@ class TestLoadLibrary(object):
     def test_basic(self):
         try:
             # Should succeed
-            load_library('multiarray', np.core.multiarray.__file__)
+            load_library('_multiarray_umath', np.core._multiarray_umath.__file__)
         except ImportError as e:
             msg = ("ctypes is not available on this python: skipping the test"
                    " (import error was: %s)" % str(e))
@@ -43,7 +43,7 @@ class TestLoadLibrary(object):
             try:
                 so = get_shared_lib_extension(is_python_ext=True)
                 # Should succeed
-                load_library('multiarray%s' % so, np.core.multiarray.__file__)
+                load_library('_multiarray_umath%s' % so, np.core._multiarray_umath.__file__)
             except ImportError:
                 print("No distutils available, skipping test.")
         except ImportError as e: