Try str(arg) when inferring dtype

Author: honno

torch_np/_dtypes.py

@@ -231,8 +231,12 @@ class bool_(generic):
 }
 
 
-def sctype_from_string(s):
+def sctype_from_string(s: str):
     """Normalize a string value: a type 'name' or a typecode or a width alias."""
+    # Normalise "bool_" (i.e. from NumPy) as "bool"
+    if s == "bool_":
+        s = "bool"
+
     if s in _names:
         return _names[s]
     if s in _name_aliases.keys():
@@ -273,10 +277,12 @@ def __init__(self, arg):
         elif isinstance(arg, DType):
             sctype = arg._scalar_type
         # a has a right attribute?
-        elif hasattr(arg, "dtype"):
+        elif hasattr(arg, "dtype") and hasattr(arg.dtype, "_scalar_type"):
             sctype = arg.dtype._scalar_type
-        else:
+        elif isinstance(arg, str):
             sctype = sctype_from_string(arg)
+        else:
+            sctype = sctype_from_string(str(arg))
         self._scalar_type = sctype
 
     @property

torch_np/tests/test_dtype.py

@@ -15,16 +15,23 @@
 np_dtype_params.append(pytest.param("bool", np.dtype("bool"), id=f"np.dtype('bool')"))
 for name in dtype_names:
     np_dtype_params.append(pytest.param(name, name, id=repr(name)))
-    np_dtype_params.append(pytest.param(name, getattr(np, name), id=f"np.{name}"))
+    np_dtype_params.append(
+        pytest.param(
+            name,
+            getattr(np, name),
+            id=f"np.{name}",
+            marks=pytest.mark.xfail(reason="XXX: namespaced dtypes not supported"),
+        )
+    )
     np_dtype_params.append(pytest.param(name, np.dtype(name), id=f"np.dtype({name!r})"))
 
 
 @pytest.mark.parametrize("name, np_dtype", np_dtype_params)
 def test_convert_np_dtypes(name, np_dtype):
     tnp_dtype = tnp.dtype(np_dtype)
     if name == "bool_":
-        assert tnp_dtype == tnp.bool
+        assert tnp_dtype == tnp.bool_
     elif tnp_dtype.name == "bool_":
-        assert np_dtype.startswith("bool")
+        assert name.startswith("bool")
     else:
         assert tnp_dtype.name == name

torch_np/tests/test_xps.py

@@ -146,6 +146,7 @@ def test_put(np_x, data):
     assert_array_equal(tnp_x, tnp.asarray(np_x).astype(tnp_x.dtype))
 
 
+@pytest.mark.xfail(reason="XXX: support converting namespaced dtypes")
 @given(a=nps.arrays(dtype=nps.scalar_dtypes(), shape=nps.array_shapes()))
 def test_asarray_np_arrays(a):
     x = tnp.asarray(a)