Merge pull request #72 from ngoldbaum/add-more-casts

Add round-trip casts between string and (u)int dtypes

Author: ngoldbaum

asciidtype/asciidtype/src/asciidtype_main.c

@@ -22,7 +22,7 @@ PyInit__asciidtype_main(void)
         return NULL;
     }
 
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         return NULL;
     }
 

metadatadtype/metadatadtype/src/metadatadtype_main.c

@@ -21,7 +21,7 @@ PyInit__metadatadtype_main(void)
     if (_import_array() < 0) {
         return NULL;
     }
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         return NULL;
     }
 

mpfdtype/mpfdtype/src/mpfdtype_main.c

@@ -22,7 +22,7 @@ PyInit__mpfdtype_main(void)
     if (_import_array() < 0) {
         return NULL;
     }
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         return NULL;
     }
 

quaddtype/quaddtype/src/quaddtype_main.c

@@ -23,7 +23,7 @@ PyInit__quaddtype_main(void)
         return NULL;
 
     // Fail to init if the experimental DType API version 5 isn't supported
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         PyErr_SetString(PyExc_ImportError,
                         "Error encountered importing the experimental dtype API.");
         return NULL;

stringdtype/stringdtype/src/casts.c

@@ -92,7 +92,7 @@ PyInit__main(void)
     if (_import_array() < 0) {
         return NULL;
     }
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         return NULL;
     }
 

stringdtype/stringdtype/src/main.c

@@ -350,14 +350,54 @@ def test_arrfuncs_zeros(dtype, arrfunc, expected):
         [["", "world"], [False, True], True, False],
     ],
 )
-def test_bool_cast(dtype, strings, cast_answer, any_answer, all_answer):
+def test_cast_to_bool(dtype, strings, cast_answer, any_answer, all_answer):
     sarr = np.array(strings, dtype=dtype)
     np.testing.assert_array_equal(sarr.astype("bool"), cast_answer)
 
     assert np.any(sarr) == any_answer
     assert np.all(sarr) == all_answer
 
 
+@pytest.mark.parametrize(
+    ("strings", "cast_answer"),
+    [
+        [[True, True], ["True", "True"]],
+        [[False, False], ["False", "False"]],
+        [[True, False], ["True", "False"]],
+        [[False, True], ["False", "True"]],
+    ],
+)
+def test_cast_from_bool(dtype, strings, cast_answer):
+    barr = np.array(strings, dtype=bool)
+    np.testing.assert_array_equal(
+        barr.astype(dtype), np.array(cast_answer, dtype=dtype)
+    )
+
+
+@pytest.mark.parametrize("bitsize", [8, 16, 32, 64])
+@pytest.mark.parametrize("signed", [True, False])
+def test_integer_casts(dtype, bitsize, signed):
+    idtype = f"int{bitsize}"
+    if signed:
+        inp = [-(2**p - 1) for p in reversed(range(bitsize - 1))]
+        inp += [2**p - 1 for p in range(1, bitsize - 1)]
+    else:
+        idtype = "u" + idtype
+        inp = [2**p - 1 for p in range(bitsize)]
+    ainp = np.array(inp, dtype=idtype)
+    np.testing.assert_array_equal(ainp, ainp.astype(dtype).astype(idtype))
+
+    with pytest.raises(TypeError):
+        ainp.astype(dtype, casting="safe")
+
+    with pytest.raises(TypeError):
+        ainp.astype(dtype).astype(idtype, casting="safe")
+
+    oob = [str(2**bitsize), str(-(2**bitsize))]
+    with pytest.raises(OverflowError):
+        np.array(oob, dtype=dtype).astype(idtype)
+
+
 def test_take(dtype, string_list):
     sarr = np.array(string_list, dtype=dtype)
     out = np.empty(len(string_list), dtype=dtype)

stringdtype/tests/test_stringdtype.py

@@ -21,7 +21,7 @@ PyInit__unytdtype_main(void)
     if (_import_array() < 0) {
         return NULL;
     }
-    if (import_experimental_dtype_api(11) < 0) {
+    if (import_experimental_dtype_api(12) < 0) {
         return NULL;
     }