more tests + reviews

Author: SwayamInSync

src/csrc/dtype.c

@@ -472,9 +472,10 @@ quadprec_argmax(char *data, npy_intp n, npy_intp *max_ind, void *arr)
     if (descr->backend == BACKEND_SLEEF) {
         // Find first non-NaN value as initial max
         npy_intp start = 0;
+        Sleef_quad max_val;
         for (start = 0; start < n; start++) {
-            Sleef_quad val = *(Sleef_quad *)(data + start * elsize);
-            if (!Sleef_iunordq1(val, val)) {
+            max_val = *(Sleef_quad *)(data + start * elsize);
+            if (!Sleef_iunordq1(max_val, max_val)) {
                 *max_ind = start;
                 break;
             }
@@ -489,24 +490,25 @@ quadprec_argmax(char *data, npy_intp n, npy_intp *max_ind, void *arr)
         // Find maximum
         for (npy_intp i = start + 1; i < n; i++) {
             Sleef_quad val = *(Sleef_quad *)(data + i * elsize);
-            Sleef_quad max_val = *(Sleef_quad *)(data + (*max_ind) * elsize);
 
             // Skip NaN values
             if (Sleef_iunordq1(val, val)) {
                 continue;
             }
 
             if (Sleef_icmpgtq1(val, max_val)) {
+                max_val = val;
                 *max_ind = i;
             }
         }
     }
     else {
         // Find first non-NaN value as initial max
         npy_intp start = 0;
+        long double max_val;
         for (start = 0; start < n; start++) {
-            long double val = *(long double *)(data + start * elsize);
-            if (!isnan(val)) {
+            max_val = *(long double *)(data + start * elsize);
+            if (!isnan(max_val)) {
                 *max_ind = start;
                 break;
             }
@@ -521,14 +523,14 @@ quadprec_argmax(char *data, npy_intp n, npy_intp *max_ind, void *arr)
         // Find maximum
         for (npy_intp i = start + 1; i < n; i++) {
             long double val = *(long double *)(data + i * elsize);
-            long double max_val = *(long double *)(data + (*max_ind) * elsize);
 
             // Skip NaN values
             if (isnan(val)) {
                 continue;
             }
 
             if (val > max_val) {
+                max_val = val;
                 *max_ind = i;
             }
         }
@@ -554,9 +556,10 @@ quadprec_argmin(char *data, npy_intp n, npy_intp *min_ind, void *arr)
     if (descr->backend == BACKEND_SLEEF) {
         // Find first non-NaN value as initial min
         npy_intp start = 0;
+        Sleef_quad min_val;
         for (start = 0; start < n; start++) {
-            Sleef_quad val = *(Sleef_quad *)(data + start * elsize);
-            if (!Sleef_iunordq1(val, val)) {
+            min_val = *(Sleef_quad *)(data + start * elsize);
+            if (!Sleef_iunordq1(min_val, min_val)) {
                 *min_ind = start;
                 break;
             }
@@ -571,24 +574,25 @@ quadprec_argmin(char *data, npy_intp n, npy_intp *min_ind, void *arr)
         // Find minimum
         for (npy_intp i = start + 1; i < n; i++) {
             Sleef_quad val = *(Sleef_quad *)(data + i * elsize);
-            Sleef_quad min_val = *(Sleef_quad *)(data + (*min_ind) * elsize);
 
             // Skip NaN values
             if (Sleef_iunordq1(val, val)) {
                 continue;
             }
 
             if (Sleef_icmpltq1(val, min_val)) {
+                min_val = val;
                 *min_ind = i;
             }
         }
     }
     else {
         // Find first non-NaN value as initial min
         npy_intp start = 0;
+        long double min_val;
         for (start = 0; start < n; start++) {
-            long double val = *(long double *)(data + start * elsize);
-            if (!isnan(val)) {
+            min_val = *(long double *)(data + start * elsize);
+            if (!isnan(min_val)) {
                 *min_ind = start;
                 break;
             }
@@ -603,14 +607,14 @@ quadprec_argmin(char *data, npy_intp n, npy_intp *min_ind, void *arr)
         // Find minimum
         for (npy_intp i = start + 1; i < n; i++) {
             long double val = *(long double *)(data + i * elsize);
-            long double min_val = *(long double *)(data + (*min_ind) * elsize);
 
             // Skip NaN values
             if (isnan(val)) {
                 continue;
             }
 
             if (val < min_val) {
+                min_val = val;
                 *min_ind = i;
             }
         }

tests/test_quaddtype.py

@@ -5772,5 +5772,15 @@ def test_argmax_argmin(backend):
     # 2D with axis
     x = np.array([[1, 5, 3], [4, 2, 6]], dtype=QuadPrecDType(backend=backend))
     assert np.argmax(x) == 5  # flattened
+    assert np.argmin(x) == 0  # flattened
     np.testing.assert_array_equal(np.argmax(x, axis=0), [1, 0, 1])
-    np.testing.assert_array_equal(np.argmax(x, axis=1), [1, 2])
+    np.testing.assert_array_equal(np.argmin(x, axis=0), [0, 1, 0])
+    np.testing.assert_array_equal(np.argmax(x, axis=1), [1, 2])
+    np.testing.assert_array_equal(np.argmin(x, axis=1), [0, 1])
+    
+    # Empty array raises ValueError
+    x = np.array([], dtype=QuadPrecDType(backend=backend))
+    with pytest.raises(ValueError):
+        np.argmax(x)
+    with pytest.raises(ValueError):
+        np.argmin(x)