Merge pull request #74 from ngoldbaum/float-casts

Add casts between string and float dtypes

Author: ngoldbaum

asciidtype/asciidtype/src/asciidtype_main.c

@@ -22,7 +22,7 @@ PyInit__asciidtype_main(void)
         return NULL;
     }
 
-    if (import_experimental_dtype_api(12) < 0) {
+    if (import_experimental_dtype_api(13) < 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(12) < 0) {
+    if (import_experimental_dtype_api(13) < 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(12) < 0) {
+    if (import_experimental_dtype_api(13) < 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(12) < 0) {
+    if (import_experimental_dtype_api(13) < 0) {
         PyErr_SetString(PyExc_ImportError,
                         "Error encountered importing the experimental dtype API.");
         return NULL;

stringdtype/meson.build

@@ -14,6 +14,13 @@ incdir_numpy = run_command(py,
   check: true
 ).stdout().strip()
 
+cc = meson.get_compiler('c')
+
+npymath_path = incdir_numpy / '..' / 'lib'
+npymath_lib = cc.find_library('npymath', dirs: npymath_path)
+inc_np = include_directories(incdir_numpy)
+np_dep = declare_dependency(include_directories: inc_np)
+
 includes = include_directories(
   [
     incdir_numpy,
@@ -47,5 +54,6 @@ py.extension_module(
   srcs,
   install: true,
   subdir: 'stringdtype',
-  include_directories: includes
+  include_directories: includes,
+  dependencies: [np_dep, npymath_lib]
 )

stringdtype/stringdtype/src/casts.c

@@ -8,6 +8,7 @@
 #define NO_IMPORT_ARRAY
 #include "numpy/arrayobject.h"
 #include "numpy/experimental_dtype_api.h"
+#include "numpy/halffloat.h"
 #include "numpy/ndarraytypes.h"
 
 PyArrayMethod_Spec **

stringdtype/stringdtype/src/casts.h

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

stringdtype/stringdtype/src/main.c

@@ -408,6 +408,25 @@ def test_unsized_integer_casts(dtype, typename, signed):
     np.testing.assert_array_equal(ainp, ainp.astype(dtype).astype(idtype))
 
 
+@pytest.mark.parametrize("typename", ["float64", "float32", "float16"])
+def test_float_casts(dtype, typename):
+    inp = [1.1, 2.8, -3.2, 2.7e4]
+    ainp = np.array(inp, dtype=typename)
+    np.testing.assert_array_equal(ainp, ainp.astype(dtype).astype(typename))
+
+    fi = np.finfo(typename)
+
+    inp = [1e-324, fi.smallest_subnormal, -1e-324, -fi.smallest_subnormal]
+    eres = [0, fi.smallest_subnormal, -0, -fi.smallest_subnormal]
+    res = np.array(inp, dtype=typename).astype(dtype).astype(typename)
+    np.testing.assert_array_equal(eres, res)
+
+    inp = [2e308, fi.max, -2e308, fi.min]
+    eres = [np.inf, fi.max, -np.inf, fi.min]
+    res = np.array(inp, dtype=typename).astype(dtype).astype(typename)
+    np.testing.assert_array_equal(eres, res)
+
+
 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(12) < 0) {
+    if (import_experimental_dtype_api(13) < 0) {
         return NULL;
     }