Add nmod_poly_ctx and nmod_mat_ctx

Author: oscarbenjamin

src/flint/types/nmod.pxd

@@ -1,20 +1,25 @@
+cimport cython
+
 from flint.flint_base.flint_base cimport flint_scalar
 from flint.flintlib.flint cimport mp_limb_t, ulong
 from flint.flintlib.nmod cimport nmod_t
 
 
+@cython.no_gc
 cdef class nmod_ctx:
     cdef nmod_t mod
     cdef bint _is_prime
 
     @staticmethod
-    cdef nmod_ctx any_as_nmod_ctx(obj)
+    cdef any_as_nmod_ctx(obj)
     @staticmethod
     cdef _get_ctx(int mod)
     @staticmethod
     cdef _new_ctx(ulong mod)
 
+    @cython.final
     cdef int any_as_nmod(self, mp_limb_t * val, obj) except -1
+    @cython.final
     cdef nmod new_nmod(self)
 
 

src/flint/types/nmod.pyx

@@ -48,7 +48,7 @@ cdef class nmod_ctx:
         return nmod_ctx._get_ctx(mod)
 
     @staticmethod
-    cdef nmod_ctx any_as_nmod_ctx(obj):
+    cdef any_as_nmod_ctx(obj):
         """Convert an ``nmod_ctx`` or ``int`` to an ``nmod_ctx``."""
         if typecheck(obj, nmod_ctx):
             return obj
@@ -163,7 +163,6 @@ cdef class nmod_ctx:
         return r
 
 
-@cython.no_gc
 cdef class nmod(flint_scalar):
     """
     The nmod type represents elements of Z/nZ for word-size n.
@@ -173,9 +172,11 @@ cdef class nmod(flint_scalar):
 
     """
     def __init__(self, val, mod):
-        ctx = nmod_ctx.any_as_nmod_ctx(mod)
-        if ctx is NotImplemented:
+        cdef nmod_ctx ctx
+        c = nmod_ctx.any_as_nmod_ctx(mod)
+        if c is NotImplemented:
             raise TypeError("Invalid context/modulus for nmod: %s" % mod)
+        ctx = c
         if not ctx.any_as_nmod(&self.val, val):
             raise TypeError("cannot create nmod from object of type %s" % type(val))
         self.ctx = ctx

src/flint/types/nmod_mat.pxd

@@ -1,14 +1,47 @@
+cimport cython
+
 from flint.flint_base.flint_base cimport flint_mat
 
+from flint.flintlib.nmod cimport nmod_t
 from flint.flintlib.nmod_mat cimport nmod_mat_t
-from flint.flintlib.flint cimport mp_limb_t
+from flint.flintlib.flint cimport mp_limb_t, ulong
+
+from flint.types.nmod cimport nmod_ctx, nmod
+from flint.types.nmod_poly cimport nmod_poly_ctx, nmod_poly
+
+
+@cython.no_gc
+cdef class nmod_mat_ctx:
+    cdef nmod_t mod
+    cdef bint _is_prime
+    cdef nmod_ctx scalar_ctx
+    cdef nmod_poly_ctx poly_ctx
+
+    @staticmethod
+    cdef any_as_nmod_mat_ctx(obj)
+    @staticmethod
+    cdef nmod_mat_ctx _get_ctx(int mod)
+    @staticmethod
+    cdef nmod_mat_ctx _new_ctx(ulong mod)
 
-from flint.types.nmod cimport nmod_ctx
+    @cython.final
+    cdef int any_as_nmod(self, mp_limb_t * val, obj) except -1
+    @cython.final
+    cdef any_as_nmod_mat(self, obj)
+    @cython.final
+    cdef nmod new_nmod(self)
+    @cython.final
+    cdef nmod_poly new_nmod_poly(self)
+    @cython.final
+    cdef nmod_mat new_nmod_mat(self, ulong m, ulong n)
+    @cython.final
+    cdef nmod_mat new_nmod_mat_copy(self, nmod_mat other)
 
 
+@cython.no_gc
 cdef class nmod_mat(flint_mat):
     cdef nmod_mat_t val
-    cdef nmod_ctx ctx
+    cdef nmod_mat_ctx ctx
 
     cpdef long nrows(self)
     cpdef long ncols(self)