Merge pull request #246 from SwayamInSync/same-value

SwayamInSync · web-flow · commit c182ddb64450 · 2026-01-15T02:24:27.000+05:30
FEAT: Implementing `same_value` casting rule in quaddtype
diff --git a/quaddtype/numpy_quaddtype/src/casts.cpp b/quaddtype/numpy_quaddtype/src/casts.cpp
diff --git a/quaddtype/numpy_quaddtype/src/dragon4.c b/quaddtype/numpy_quaddtype/src/dragon4.c
@@ -17,7 +17,7 @@ Modifications are specific to support the SLEEF_QUAD
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/dtype.c b/quaddtype/numpy_quaddtype/src/dtype.c
@@ -7,7 +7,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 #include "numpy/arrayobject.h"
diff --git a/quaddtype/numpy_quaddtype/src/ops.hpp b/quaddtype/numpy_quaddtype/src/ops.hpp
@@ -1669,4 +1669,4 @@ cast_sleef_to_double(const Sleef_quad in)
         return quad_signbit(&in) ? -0.0 : 0.0;
     }
     return Sleef_cast_to_doubleq1(in);
-}
+}
diff --git a/quaddtype/numpy_quaddtype/src/quaddtype_main.c b/quaddtype/numpy_quaddtype/src/quaddtype_main.c
@@ -6,7 +6,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 
 #include "numpy/arrayobject.h"
 #include "numpy/dtype_api.h"
diff --git a/quaddtype/numpy_quaddtype/src/scalar.c b/quaddtype/numpy_quaddtype/src/scalar.c
@@ -104,7 +104,6 @@ QuadPrecision_from_object(PyObject *value, QuadBackendType backend)
             }
             double dval = PyFloat_AsDouble(py_float);
             Py_DECREF(py_float);
-            
             if (backend == BACKEND_SLEEF) {
                 self->value.sleef_value = Sleef_cast_from_doubleq1(dval);
             }
@@ -484,14 +483,9 @@ PyObject* quad_to_pylong(Sleef_quad value)
         PyErr_SetString(PyExc_RuntimeError, "Failed to convert quad to string");
         return NULL;
     }
-
-    PyObject *result = PyLong_FromString(buffer, NULL, 10);
-    
-    if (result == NULL) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to parse integer string");
-        return NULL;
-    }
     
+    // Already raises ValueError and returns NULL on failure
+    PyObject *result = PyLong_FromString(buffer, NULL, 10);
     return result;
 }
 
diff --git a/quaddtype/numpy_quaddtype/src/scalar_ops.cpp b/quaddtype/numpy_quaddtype/src/scalar_ops.cpp
@@ -1,6 +1,6 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 
 extern "C" {
@@ -134,6 +134,9 @@ quad_richcompare(QuadPrecisionObject *self, PyObject *other, int cmp_op)
         Py_INCREF(other);
         other_quad = (QuadPrecisionObject *)other;
         if (other_quad->backend != backend) {
+            // we could allow, but this will be bad
+            // Two values that are different in quad precision, 
+            // might appear equal when converted to double.
             PyErr_SetString(PyExc_TypeError,
                             "Cannot compare QuadPrecision objects with different backends");
             Py_DECREF(other_quad);
diff --git a/quaddtype/numpy_quaddtype/src/umath/binary_ops.cpp b/quaddtype/numpy_quaddtype/src/umath/binary_ops.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/umath/comparison_ops.cpp b/quaddtype/numpy_quaddtype/src/umath/comparison_ops.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/umath/matmul.cpp b/quaddtype/numpy_quaddtype/src/umath/matmul.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/umath/umath.cpp b/quaddtype/numpy_quaddtype/src/umath/umath.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
@@ -35,34 +35,30 @@ init_quad_umath(void)
     }
 
     if (init_quad_unary_ops(numpy) < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to initialize quad unary operations");
         goto err;
     }
 
     if (init_quad_unary_props(numpy) < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to initialize quad unary properties");
         goto err;
     }
 
     if (init_quad_binary_ops(numpy) < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to initialize quad binary operations");
         goto err;
     }
 
     if (init_quad_comps(numpy) < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to initialize quad comparison operations");
         goto err;
     }
 
     if (init_matmul_ops(numpy) < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to initialize quad matrix multiplication operations");
         goto err;
     }
 
     Py_DECREF(numpy);
     return 0;
 
 err:
+    // Already raises appropriate error
     Py_DECREF(numpy);
     return -1;
 }
diff --git a/quaddtype/numpy_quaddtype/src/umath/unary_ops.cpp b/quaddtype/numpy_quaddtype/src/umath/unary_ops.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/umath/unary_props.cpp b/quaddtype/numpy_quaddtype/src/umath/unary_props.cpp
@@ -1,7 +1,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL QuadPrecType_ARRAY_API
 #define PY_UFUNC_UNIQUE_SYMBOL QuadPrecType_UFUNC_API
 #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
-#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_4_API_VERSION
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC
 
diff --git a/quaddtype/numpy_quaddtype/src/utilities.h b/quaddtype/numpy_quaddtype/src/utilities.h
@@ -63,7 +63,6 @@ template <bool Aligned>
 static inline void
 load_quad(const char *ptr, QuadBackendType backend, quad_value *out)
 {
-    quad_value val;
     if (backend == BACKEND_SLEEF) {
         out->sleef_value = load<Aligned, Sleef_quad>(ptr);
     }
diff --git a/quaddtype/tests/test_quaddtype.py b/quaddtype/tests/test_quaddtype.py

Original file line number	Diff line number	Diff line change
`@@ -1669,4 +1669,4 @@ cast_sleef_to_double(const Sleef_quad in)`
`1669`	`1669`	`return quad_signbit(&in) ? -0.0 : 0.0;`
`1670`	`1670`	`}`
`1671`	`1671`	`return Sleef_cast_to_doubleq1(in);`
`1672`		`-}`
	`1672`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ QuadPrecision_from_object(PyObject *value, QuadBackendType backend)`
`104`	`104`	`}`
`105`	`105`	`double dval = PyFloat_AsDouble(py_float);`
`106`	`106`	`Py_DECREF(py_float);`
`107`		`-`
`108`	`107`	`if (backend == BACKEND_SLEEF) {`
`109`	`108`	`self->value.sleef_value = Sleef_cast_from_doubleq1(dval);`
`110`	`109`	`}`
`@@ -484,14 +483,9 @@ PyObject* quad_to_pylong(Sleef_quad value)`
`484`	`483`	`PyErr_SetString(PyExc_RuntimeError, "Failed to convert quad to string");`
`485`	`484`	`return NULL;`
`486`	`485`	`}`
`487`		`-`
`488`		`- PyObject *result = PyLong_FromString(buffer, NULL, 10);`
`489`		`-`
`490`		`- if (result == NULL) {`
`491`		`- PyErr_SetString(PyExc_RuntimeError, "Failed to parse integer string");`
`492`		`- return NULL;`
`493`		`- }`
`494`	`486`
	`487`	`+ // Already raises ValueError and returns NULL on failure`
	`488`	`+ PyObject *result = PyLong_FromString(buffer, NULL, 10);`
`495`	`489`	`return result;`
`496`	`490`	`}`
`497`	`491`