[Numpy] Update fallback.py

python/mxnet/numpy/fallback.py

@@ -19,6 +19,7 @@
 """Operators that fallback to official NumPy implementation."""
 
 import sys
+from functools import wraps
 import numpy as onp
 
 fallbacks = [
@@ -114,11 +115,17 @@
 
 fallback_mod = sys.modules[__name__]
 
+def get_func(obj, doc):
+    """Get new numpy function with object and doc"""
+    @wraps(obj)
+    def wrapper(*args, **kwargs):
+        return obj(*args, **kwargs)
+    wrapper.__doc__ = doc
+    return wrapper
+
 for obj_name in fallbacks:
     onp_obj = getattr(onp, obj_name)
     if callable(onp_obj):
-        def fn(*args, **kwargs):
-            return onp_obj(*args, **kwargs)
         new_fn_doc = onp_obj.__doc__
         if obj_name in {'divmod', 'float_power', 'frexp', 'heaviside', 'modf', 'signbit', 'spacing'}:
             # remove reference of kwargs doc and the reference to ufuncs
@@ -128,8 +135,7 @@ def fn(*args, **kwargs):
             # remove unused reference
             new_fn_doc = new_fn_doc.replace(
                 '.. [1] Wikipedia page: https://en.wikipedia.org/wiki/Trapezoidal_rule', '')
-        fn.__doc__ = new_fn_doc
-        setattr(fallback_mod, obj_name, fn)
+        setattr(fallback_mod, obj_name, get_func(onp_obj, new_fn_doc))
     else:
         setattr(fallback_mod, obj_name, onp_obj)
 

python/mxnet/numpy/multiarray.py

@@ -11382,7 +11382,12 @@ def atleast_1d(*arys):
     >>> np.atleast_1d(np.array(1), np.array([3, 4]))
     [array([1.]), array([3., 4.])]
     """
-    return _mx_nd_np.atleast_1d(*arys)
+    res = []
+    for ary in arys:
+        if not isinstance(ary, NDArray):
+            ary = array(ary)
+        res.append(ary)
+    return _mx_nd_np.atleast_1d(*res)
 
 
 @set_module('mxnet.numpy')
@@ -11414,7 +11419,12 @@ def atleast_2d(*arys):
     >>> np.atleast_2d(np.array(1), np.array([1, 2]), np.array([[1, 2]]))
     [array([[1.]]), array([[1., 2.]]), array([[1., 2.]])]
     """
-    return _mx_nd_np.atleast_2d(*arys)
+    res = []
+    for ary in arys:
+        if not isinstance(ary, NDArray):
+            ary = array(ary)
+        res.append(ary)
+    return _mx_nd_np.atleast_2d(*res)
 
 
 @set_module('mxnet.numpy')
@@ -11457,7 +11467,12 @@ def atleast_3d(*arys):
       [2.]]] (1, 2, 1)
     [[[1. 2.]]] (1, 1, 2)
     """
-    return _mx_nd_np.atleast_3d(*arys)
+    res = []
+    for ary in arys:
+        if not isinstance(ary, NDArray):
+            ary = array(ary)
+        res.append(ary)
+    return _mx_nd_np.atleast_3d(*res)
 
 
 @set_module('mxnet.numpy')

tests/python/unittest/test_numpy_interoperability.py

@@ -3255,13 +3255,15 @@ def _check_interoperability_helper(op_name, rel_tol, abs_tol, *args, **kwargs):
     strs = op_name.split('.')
     if len(strs) == 1:
         onp_op = getattr(_np, op_name)
+        mxnp_op = getattr(np, op_name)
     elif len(strs) == 2:
         onp_op = getattr(getattr(_np, strs[0]), strs[1])
+        mxnp_op = getattr(getattr(np, strs[0]), strs[1])
     else:
         assert False
     if not is_op_runnable():
         return
-    out = onp_op(*args, **kwargs)
+    out = mxnp_op(*args, **kwargs)
     expected_out = _get_numpy_op_output(onp_op, *args, **kwargs)
     if isinstance(out, (tuple, list)):
         assert type(out) == type(expected_out)