pyquadp 2.0.2__tar.gz → 2.0.3__tar.gz

{pyquadp-2.0.2 → pyquadp-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquadp
-Version: 2.0.2
+Version: 2.0.3
 Summary: Python's bindings for gcc's libquadmath
 Author-email: Robert Farmer <robert.j.farmer37@gmail.com>
 License-Expression: GPL-2.0-or-later

{pyquadp-2.0.2 → pyquadp-2.0.3}/pyquadp/constant.py

@@ -51,6 +51,7 @@ nanj = qcmplx(0.0, qfloat("nan"))
 
 # Ctype data
 c_qfloat = _ctypes.c_byte * 16
+c_qint = _ctypes.c_byte * 16
 
 
 class c_qcmplx(_ctypes.Structure):

{pyquadp-2.0.2 → pyquadp-2.0.3}/pyquadp/qiarray.c

@@ -1573,18 +1573,41 @@ static int
 QuadIArray_setitem(PyObject *item, __int128 *data, void *array)
 {
   QuadIObject tmp;
+  PyObject *index_obj = NULL;
 
   (void)array;
 
   if (PyObject_to_QuadIObject(item, &tmp, false)) {
     *data = tmp.value;
-  } else {
-    if (!PyErr_Occurred()) {
-      PyErr_SetString(PyExc_TypeError, "Failed to setitem in QuadIArray");
+    return 0;
+  }
+
+  if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+    PyErr_Clear();
+  } else if (PyErr_Occurred()) {
+    return -1;
+  }
+
+  index_obj = PyNumber_Index(item);
+  if (index_obj != NULL) {
+    if (PyObject_to_QuadIObject(index_obj, &tmp, false)) {
+      *data = tmp.value;
+      Py_DECREF(index_obj);
+      return 0;
     }
+
+    Py_DECREF(index_obj);
     return -1;
   }
-  return 0;
+
+  if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+    PyErr_Clear();
+    PyErr_SetString(PyExc_TypeError, "Failed to setitem in QuadIArray");
+  } else if (!PyErr_Occurred()) {
+    PyErr_SetString(PyExc_TypeError, "Failed to setitem in QuadIArray");
+  }
+
+  return -1;
 }
 
 static PyObject *

{pyquadp-2.0.2 → pyquadp-2.0.3}/pyquadp/qint.c

@@ -1049,6 +1049,8 @@ static __int128 QuadIObject_int128(QuadIObject * out) {
 bool
 PyObject_to_QuadIObject(PyObject * in, QuadIObject * out, const bool alloc)
 {
+    PyObject *int_obj;
+
     (void)alloc;
 
     if(QuadIObject_Check(in)){
@@ -1073,32 +1075,41 @@ PyObject_to_QuadIObject(PyObject * in, QuadIObject * out, const bool alloc)
         return true;
     }
 
-    if(PyNumber_Check(in)) {
-        // Is a number
-        if(PyLong_Check(in)){
-            // int
-            // Convert to string as we may be to big for PyLong
-            PyObject * str = PyUnicode_FromFormat("%S",in);
-            if (str == NULL) {
-                return false;
-            }
-            Py_ssize_t len;
-            const char *buf = PyUnicode_AsUTF8AndSize(str, &len);
-            if (buf==NULL){
-                Py_DECREF(str);
-                return false;
-            }
-
-            if(!str_to_int128(buf,len,&out->value)){
-                Py_DECREF(str);
-                PyErr_SetString(PyExc_TypeError, "Could not convert int to integer quad precision.");
-                return false;
-            }
+    int_obj = PyNumber_Index(in);
+    if (int_obj != NULL) {
+        // Convert integer-like values (including numpy integer scalars)
+        // to string first so values outside C long long still parse correctly.
+        PyObject *str = PyUnicode_FromFormat("%S", int_obj);
+        if (str == NULL) {
+            Py_DECREF(int_obj);
+            return false;
+        }
 
+        Py_ssize_t len;
+        const char *buf = PyUnicode_AsUTF8AndSize(str, &len);
+        if (buf == NULL) {
             Py_DECREF(str);
+            Py_DECREF(int_obj);
+            return false;
+        }
 
-            return true;
+        if (!str_to_int128(buf, len, &out->value)) {
+            Py_DECREF(str);
+            Py_DECREF(int_obj);
+            PyErr_SetString(PyExc_TypeError, "Could not convert int to integer quad precision.");
+            return false;
         }
+
+        Py_DECREF(str);
+        Py_DECREF(int_obj);
+        return true;
+    }
+
+    // Non-integral numerics (e.g., float, numpy floating scalars) are not valid qint inputs.
+    if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+        PyErr_Clear();
+    } else if (PyErr_Occurred()) {
+        return false;
     }
 
     return false;

{pyquadp-2.0.2 → pyquadp-2.0.3}/pyquadp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquadp
-Version: 2.0.2
+Version: 2.0.3
 Summary: Python's bindings for gcc's libquadmath
 Author-email: Robert Farmer <robert.j.farmer37@gmail.com>
 License-Expression: GPL-2.0-or-later

{pyquadp-2.0.2 → pyquadp-2.0.3}/tests/qiarray_test.py

@@ -100,6 +100,28 @@ class TestQIArrayConstructors:
             np.asarray(arr, dtype=np.int64), np.array([1, 2, -3], dtype=np.int64)
         )
 
+    def test_from_list_accepts_numpy_integer_scalars(self):
+        qiarray = pytest.importorskip("pyquadp.qiarray")
+        arr = qiarray.from_list([np.int64(1), np.int32(-2), np.int64(3)])
+
+        assert isinstance(arr, np.ndarray)
+        assert arr.dtype == qiarray.dtype
+        np.testing.assert_array_equal(
+            np.asarray(arr, dtype=np.int64), np.array([1, -2, 3], dtype=np.int64)
+        )
+
+    def test_setitem_accepts_numpy_integer_scalars(self):
+        qiarray = pytest.importorskip("pyquadp.qiarray")
+        arr = qiarray.zeros(3)
+
+        arr[0] = np.int64(9)
+        arr[1] = np.int32(-4)
+        arr[2] = np.int64(7)
+
+        np.testing.assert_array_equal(
+            np.asarray(arr, dtype=np.int64), np.array([9, -4, 7], dtype=np.int64)
+        )
+
     def test_from_array_constructor(self):
         qiarray = pytest.importorskip("pyquadp.qiarray")
         src = np.array([[1, 2], [3, 4]], dtype=np.int64)

{pyquadp-2.0.2 → pyquadp-2.0.3}/tests/qint_test.py

@@ -319,3 +319,13 @@ class Testqint:
     def test_index_method(self):
         q1 = pq.qint(7)
         assert q1.__index__() == 7
+
+    def test_np_types(self):
+        q1 = pq.qint(1234567890)
+        q3 = np.int64(1234567890)
+        assert q1 == q3
+        assert hash(q1) == hash(q3)
+
+        assert pq.qint(q3) == q3
+
+        assert pq.qint(np.int32(1234567890)) == q3