fix: add __rdunder__ fmpz_mat, fmpq_mat and nmp_mat

Author: oscarbenjamin

setup.py

@@ -45,7 +45,7 @@
 
 
 define_macros = []
-compiler_directives = {'language_level':3}
+compiler_directives = {'language_level':3, 'binding':False}
 
 
 # Enable coverage tracing

src/flint/fmpq_mat.pyx

@@ -145,9 +145,6 @@ cdef class fmpq_mat(flint_mat):
         cdef fmpq_mat u
         cdef fmpq_mat_struct *sval
         cdef fmpq_mat_struct *tval
-        s = any_as_fmpq_mat(s)
-        if s is NotImplemented:
-            return s
         t = any_as_fmpq_mat(t)
         if t is NotImplemented:
             return t
@@ -165,9 +162,6 @@ cdef class fmpq_mat(flint_mat):
         cdef fmpq_mat u
         cdef fmpq_mat_struct *sval
         cdef fmpq_mat_struct *tval
-        s = any_as_fmpq_mat(s)
-        if s is NotImplemented:
-            return s
         t = any_as_fmpq_mat(t)
         if t is NotImplemented:
             return t
@@ -225,30 +219,31 @@ cdef class fmpq_mat(flint_mat):
 
     def __mul__(s, t):
         cdef fmpz_mat u
-        if typecheck(s, fmpq_mat):
-            if typecheck(t, fmpq_mat):
-                return (<fmpq_mat>s).__mul_fmpq_mat(t)
-            elif typecheck(t, fmpz_mat):
-                return (<fmpq_mat>s).__mul_fmpz_mat(t)
-            else:
-                c = any_as_fmpz(t)
-                if c is not NotImplemented:
-                    return (<fmpq_mat>s).__mul_fmpz(c)
-                c = any_as_fmpq(t)
-                if c is not NotImplemented:
-                    return (<fmpq_mat>s).__mul_fmpq(c)
-                return NotImplemented
+        if typecheck(t, fmpq_mat):
+            return (<fmpq_mat>s).__mul_fmpq_mat(t)
+        elif typecheck(t, fmpz_mat):
+            return (<fmpq_mat>s).__mul_fmpz_mat(t)
         else:
-            if typecheck(s, fmpz_mat):
-                return (<fmpq_mat>t).__mul_r_fmpz_mat(s)
-            else:
-                c = any_as_fmpz(s)
-                if c is not NotImplemented:
-                    return (<fmpq_mat>t).__mul_fmpz(c)
-                c = any_as_fmpq(s)
-                if c is not NotImplemented:
-                    return (<fmpq_mat>t).__mul_fmpq(c)
-                return NotImplemented
+            c = any_as_fmpz(t)
+            if c is not NotImplemented:
+                return (<fmpq_mat>s).__mul_fmpz(c)
+            c = any_as_fmpq(t)
+            if c is not NotImplemented:
+                return (<fmpq_mat>s).__mul_fmpq(c)
+            return NotImplemented
+
+    def __rmul__(s, t):
+        cdef fmpz_mat u
+        if typecheck(t, fmpz_mat):
+            return (<fmpq_mat>s).__mul_r_fmpz_mat(t)
+        else:
+            c = any_as_fmpz(t)
+            if c is not NotImplemented:
+                return (<fmpq_mat>s).__mul_fmpz(c)
+            c = any_as_fmpq(t)
+            if c is not NotImplemented:
+                return (<fmpq_mat>s).__mul_fmpq(c)
+            return NotImplemented
 
     @staticmethod
     def _div_(fmpq_mat s, t):

src/flint/fmpz_mat.pyx

@@ -190,9 +190,6 @@ cdef class fmpz_mat(flint_mat):
         cdef fmpz_mat u
         cdef fmpz_mat_struct *sval
         cdef fmpz_mat_struct *tval
-        sm = any_as_fmpz_mat(s)
-        if sm is NotImplemented:
-            return sm
         tm = any_as_fmpz_mat(t)
         if tm is NotImplemented:
             return tm
@@ -210,9 +207,6 @@ cdef class fmpz_mat(flint_mat):
         cdef fmpz_mat u
         cdef fmpz_mat_struct *sval
         cdef fmpz_mat_struct *tval
-        sm = any_as_fmpz_mat(s)
-        if sm is NotImplemented:
-            return sm
         tm = any_as_fmpz_mat(t)
         if tm is NotImplemented:
             return tm
@@ -238,7 +232,7 @@ cdef class fmpz_mat(flint_mat):
         cdef fmpz_mat_struct *sval
         cdef fmpz_mat_struct *tval
         cdef int ttype
-        if typecheck(s, fmpz_mat) and typecheck(t, fmpz_mat):
+        if typecheck(t, fmpz_mat):
             sval = &(<fmpz_mat>s).val[0]
             tval = &(<fmpz_mat>t).val[0]
             if fmpz_mat_ncols(sval) != fmpz_mat_nrows(tval):
@@ -248,8 +242,6 @@ cdef class fmpz_mat(flint_mat):
             fmpz_mat_mul(u.val, sval, tval)
             return u
         else:
-            if typecheck(t, fmpz_mat):
-                s, t = t, s
             c = any_as_fmpz(t)
             if c is not NotImplemented:
                 return (<fmpz_mat>s).__mul_fmpz(c)
@@ -259,6 +251,16 @@ cdef class fmpz_mat(flint_mat):
                 return fmpq_mat(s) * t
         return NotImplemented
 
+    def __rmul__(s, t):
+        c = any_as_fmpz(t)
+        if c is not NotImplemented:
+            return (<fmpz_mat>s).__mul_fmpz(c)
+        c = any_as_fmpq(t)
+        if c is not NotImplemented:
+            # XXX: improve this
+            return fmpq_mat(s) * t
+        return NotImplemented
+
     @staticmethod
     def _div_(fmpz_mat s, t):
         return s * (1 / fmpq(t))

src/flint/nmod_mat.pyx

@@ -190,18 +190,29 @@ cdef class nmod_mat:
         cdef nmod_mat r
         cdef nmod_mat_struct *sv
         cdef nmod_mat_struct *tv
-        if typecheck(s, nmod_mat):
-            sv = &(<nmod_mat>s).val[0]
-            t = any_as_nmod_mat(t, sv.mod)
-            if t is NotImplemented:
-                return t
-            tv = &(<nmod_mat>t).val[0]
-        else:
-            tv = &(<nmod_mat>t).val[0]
-            s = any_as_nmod_mat(s, tv.mod)
-            if s is NotImplemented:
-                return s
-            sv = &(<nmod_mat>s).val[0]
+        sv = &(<nmod_mat>s).val[0]
+        t = any_as_nmod_mat(t, sv.mod)
+        if t is NotImplemented:
+            return t
+        tv = &(<nmod_mat>t).val[0]
+        if sv.mod.n != tv.mod.n:
+            raise ValueError("cannot add nmod_mats with different moduli")
+        if sv.r != tv.r or sv.c != tv.c:
+            raise ValueError("incompatible shapes for matrix addition")
+        r = nmod_mat.__new__(nmod_mat)
+        nmod_mat_init(r.val, sv.r, sv.c, sv.mod.n)
+        nmod_mat_add(r.val, sv, tv)
+        return r
+
+    def __radd__(s, t):
+        cdef nmod_mat r
+        cdef nmod_mat_struct *sv
+        cdef nmod_mat_struct *tv
+        sv = &(<nmod_mat>s).val[0]
+        t = any_as_nmod_mat(t, sv.mod)
+        if t is NotImplemented:
+            return t
+        tv = &(<nmod_mat>t).val[0]
         if sv.mod.n != tv.mod.n:
             raise ValueError("cannot add nmod_mats with different moduli")
         if sv.r != tv.r or sv.c != tv.c:
@@ -215,18 +226,11 @@ cdef class nmod_mat:
         cdef nmod_mat r
         cdef nmod_mat_struct *sv
         cdef nmod_mat_struct *tv
-        if typecheck(s, nmod_mat):
-            sv = &(<nmod_mat>s).val[0]
-            t = any_as_nmod_mat(t, sv.mod)
-            if t is NotImplemented:
-                return t
-            tv = &(<nmod_mat>t).val[0]
-        else:
-            tv = &(<nmod_mat>t).val[0]
-            s = any_as_nmod_mat(s, tv.mod)
-            if s is NotImplemented:
-                return s
-            sv = &(<nmod_mat>s).val[0]
+        sv = &(<nmod_mat>s).val[0]
+        t = any_as_nmod_mat(t, sv.mod)
+        if t is NotImplemented:
+            return t
+        tv = &(<nmod_mat>t).val[0]
         if sv.mod.n != tv.mod.n:
             raise ValueError("cannot subtract nmod_mats with different moduli")
         if sv.r != tv.r or sv.c != tv.c:
@@ -236,6 +240,24 @@ cdef class nmod_mat:
         nmod_mat_sub(r.val, sv, tv)
         return r
 
+    def __rsub__(s, t):
+        cdef nmod_mat r
+        cdef nmod_mat_struct *sv
+        cdef nmod_mat_struct *tv
+        sv = &(<nmod_mat>s).val[0]
+        t = any_as_nmod_mat(t, sv.mod)
+        if t is NotImplemented:
+            return t
+        tv = &(<nmod_mat>t).val[0]
+        if sv.mod.n != tv.mod.n:
+            raise ValueError("cannot subtract nmod_mats with different moduli")
+        if sv.r != tv.r or sv.c != tv.c:
+            raise ValueError("incompatible shapes for matrix subtraction")
+        r = nmod_mat.__new__(nmod_mat)
+        nmod_mat_init(r.val, sv.r, sv.c, sv.mod.n)
+        nmod_mat_sub(r.val, tv, sv)
+        return r
+
     cdef __mul_nmod(self, mp_limb_t c):
         cdef nmod_mat r = nmod_mat.__new__(nmod_mat)
         nmod_mat_init(r.val, self.val.r, self.val.c, self.val.mod.n)
@@ -247,22 +269,13 @@ cdef class nmod_mat:
         cdef nmod_mat_struct *sv
         cdef nmod_mat_struct *tv
         cdef mp_limb_t c
-        if typecheck(s, nmod_mat):
-            sv = &(<nmod_mat>s).val[0]
-            u = any_as_nmod_mat(t, sv.mod)
-            if u is NotImplemented:
-                if any_as_nmod(&c, t, sv.mod):
-                    return (<nmod_mat>s).__mul_nmod(c)
-                return NotImplemented
-            tv = &(<nmod_mat>u).val[0]
-        else:
-            tv = &(<nmod_mat>t).val[0]
-            u = any_as_nmod_mat(s, tv.mod)
-            if u is NotImplemented:
-                if any_as_nmod(&c, s, tv.mod):
-                    return (<nmod_mat>t).__mul_nmod(c)
-                return NotImplemented
-            sv = &(<nmod_mat>u).val[0]
+        sv = &(<nmod_mat>s).val[0]
+        u = any_as_nmod_mat(t, sv.mod)
+        if u is NotImplemented:
+            if any_as_nmod(&c, t, sv.mod):
+                return (<nmod_mat>s).__mul_nmod(c)
+            return NotImplemented
+        tv = &(<nmod_mat>u).val[0]
         if sv.mod.n != tv.mod.n:
             raise ValueError("cannot multiply nmod_mats with different moduli")
         if sv.c != tv.r:
@@ -272,6 +285,14 @@ cdef class nmod_mat:
         nmod_mat_mul(r.val, sv, tv)
         return r
 
+    def __rmul__(s, t):
+        cdef nmod_mat_struct *sv
+        cdef mp_limb_t c
+        sv = &(<nmod_mat>s).val[0]
+        if any_as_nmod(&c, t, sv.mod):
+            return (<nmod_mat>s).__mul_nmod(c)
+        return NotImplemented
+
     @staticmethod
     def _div_(nmod_mat s, t):
         cdef mp_limb_t v