Correctly check for nested tuple in map_func_over_tuple_of_tuples

Author: Michael-T-McCann

scico/numpy/_wrappers.py

@@ -17,6 +17,8 @@
 
 import jax.numpy as jnp
 
+import scico.numpy as snp
+
 from ._blockarray import BlockArray
 
 
@@ -83,9 +85,7 @@ def mapped(*args, **kwargs):
 
         map_arg_val = bound_args.arguments.pop(map_arg_name)
 
-        if not isinstance(map_arg_val, tuple) or not all(
-            isinstance(x, tuple) for x in map_arg_val
-        ):  # not nested tuple
+        if not snp.util.is_nested(map_arg_val):  # not nested tuple
             return func(*args, **kwargs)  # no mapping
 
         # map

scico/test/numpy/test_numpy.py

@@ -248,9 +248,17 @@ def test_ufunc_conj():
 def test_create_zeros():
     A = snp.zeros(2)
     assert np.all(A == 0)
+    assert isinstance(A, jax.Array)
+
+    A = snp.zeros((2,))
+    assert isinstance(A, jax.Array)
 
     A = snp.zeros(((2,), (2,)))
     assert all(snp.all(A == 0))
+    assert isinstance(A, snp.BlockArray)
+
+    A = snp.zeros(())
+    assert isinstance(A, jax.Array)  # from issue 499
 
 
 def test_create_ones():
@@ -261,7 +269,7 @@ def test_create_ones():
     assert all(snp.all(A == 1))
 
 
-def test_create_zeros():
+def test_create_empty():
     A = snp.empty(2)
     assert np.all(A == 0)