MAINT: (mpfdtype) fix some compiler warnings and hopefully error

On CI gcc, remove the static assert for the alignment, since the
alignment of the `mpf_field` is correct in the current storage
scheme.  Hopefully the static_assert was the problem on gcc?

Author: seberg

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
         working-directory: mpfdtype
         run: |
           sudo apt install libmpfr-dev -y
-          python -m pip install . --no-build-isolation
+          CFLAGS="-Werror" python -m pip install . --no-build-isolation
       - name: Run mpfdtype tests
         working-directory: mpfdtype
         run: |

mpfdtype/mpfdtype/src/casts.cpp

@@ -182,8 +182,9 @@ numpy_to_mpf_strided_loop(PyArrayMethod_Context *context,
         T *in = (T *)in_ptr;
         mpf_load(out, out_ptr, prec_out);
 
-        int res = C_to_mpfr<conv_T, T>(*in, out);
-        // TODO: At least for ints, could flag out of bounds...
+        C_to_mpfr<conv_T, T>(*in, out);
+        // TODO: At least for ints, could flag out of bounds, the return value
+        //       of C_to_mpfr may help with that (it flags imprecisions).
         mpf_store(out_ptr, out);
 
         in_ptr += strides[0];

mpfdtype/mpfdtype/src/dtype.c

@@ -46,7 +46,7 @@ new_MPFDType_instance(mpfr_prec_t precision)
                 "storage of single float would be too large for precision.");
     }
     new->base.elsize = sizeof(mpf_storage) + size;
-    new->base.alignment = _Alignof(mpf_storage);
+    new->base.alignment = _Alignof(mpf_field);
     new->base.flags |= NPY_NEEDS_INIT;
 
     return new;
@@ -242,7 +242,7 @@ PyArray_DTypeMeta MPFDType = {{{
         .tp_new = MPFDType_new,
         .tp_repr = (reprfunc)MPFDType_repr,
         .tp_str = (reprfunc)MPFDType_repr,
-        .tp_getset = &mpfdtype_getsetlist,
+        .tp_getset = mpfdtype_getsetlist,
     }},
     /* rest, filled in during DTypeMeta initialization */
 };

mpfdtype/mpfdtype/src/dtype.h

@@ -23,8 +23,6 @@ typedef struct {
  * So not storeing only those (saving 16 bytes of 48 for a 128 bit number)
  * removes the need to worry about this.
  */
-static_assert(_Alignof(mpfr_t) >= _Alignof(mp_limb_t),
-              "mpfr_t storage not aligned as much as limb_t?!");
 typedef mpfr_t mpf_storage;
 
 extern PyArray_DTypeMeta MPFDType;

mpfdtype/mpfdtype/src/scalar.c

@@ -209,8 +209,8 @@ PyTypeObject MPFloat_Type = {
     .tp_repr = (reprfunc)MPFloat_repr,
     .tp_str = (reprfunc)MPFloat_str,
     .tp_as_number = &mpf_as_number,
-    .tp_richcompare = &mpf_richcompare,
-    .tp_getset = &mpfloat_getsetlist,
+    .tp_richcompare = (richcmpfunc)mpf_richcompare,
+    .tp_getset = mpfloat_getsetlist,
 };
 
 

mpfdtype/mpfdtype/src/terrible_hacks.c

@@ -22,9 +22,10 @@
  * (for larger itemsizes at least).
  */
 static void
-copyswap_mpf(char *dst, char *src, int swap, PyArrayObject *arr)
+copyswap_mpf(char *dst, char *src, int swap, PyArrayObject *ap)
 {
-    PyArray_Descr *descr = PyArray_DESCR(arr);
+    /* Note that it is probably better to only get the descr from `ap` */
+    PyArray_Descr *descr = PyArray_DESCR(ap);
 
     memcpy(dst, src, descr->elsize);
 }
@@ -33,9 +34,10 @@ copyswap_mpf(char *dst, char *src, int swap, PyArrayObject *arr)
 /* Should only be used for sorting, so more complex than necessary, probably */
 int compare_mpf(char *in1_ptr, char *in2_ptr, int swap, PyArrayObject *ap)
 {
+    /* Note that it is probably better to only get the descr from `ap` */
     mpfr_prec_t precision = ((MPFDTypeObject *)PyArray_DESCR(ap))->precision;
 
-    mpfr_t in1, in2;
+    mpfr_ptr in1, in2;
 
     mpf_load(in1, in1_ptr, precision);
     mpf_load(in2, in2_ptr, precision);
@@ -63,8 +65,8 @@ init_terrible_hacks(void) {
         return -1;
     }
     /* ->f slots are the same for all instances (currently). */
-    descr->base.f->copyswap = &copyswap_mpf;
-    descr->base.f->compare = &compare_mpf;
+    descr->base.f->copyswap = (PyArray_CopySwapFunc *)&copyswap_mpf;
+    descr->base.f->compare = (PyArray_CompareFunc *)&compare_mpf;
     Py_DECREF(descr);
 
     return 0;