Fmpz mod mpoly and nmod mpoly

setup.py

@@ -97,9 +97,11 @@
     ("flint.types.nmod_poly", ["src/flint/types/nmod_poly.pyx"]),
     ("flint.types.nmod_mat", ["src/flint/types/nmod_mat.pyx"]),
     ("flint.types.nmod_series", ["src/flint/types/nmod_series.pyx"]),
+    ("flint.types.nmod_mpoly", ["src/flint/types/nmod_mpoly.pyx"]),
 
     ("flint.types.fmpz_mod", ["src/flint/types/fmpz_mod.pyx"]),
     ("flint.types.fmpz_mod_poly", ["src/flint/types/fmpz_mod_poly.pyx"]),
+    ("flint.types.fmpz_mod_mpoly", ["src/flint/types/fmpz_mod_mpoly.pyx"]),
     ("flint.types.fmpz_mod_mat", ["src/flint/types/fmpz_mod_mat.pyx"]),
 
     ("flint.types.fmpq_mpoly", ["src/flint/types/fmpq_mpoly.pyx"]),

src/flint/__init__.py

@@ -14,12 +14,14 @@
 
 from .types.nmod import *
 from .types.nmod_poly import *
+from .types.nmod_mpoly import nmod_mpoly_ctx, nmod_mpoly, nmod_mpoly_vec
 from .types.nmod_mat import *
 from .types.nmod_series import *
 
 from .types.fmpz_mpoly import fmpz_mpoly_ctx, fmpz_mpoly, fmpz_mpoly_vec
 from .types.fmpz_mod import *
 from .types.fmpz_mod_poly import *
+from .types.fmpz_mod_mpoly import fmpz_mod_mpoly_ctx, fmpz_mod_mpoly, fmpz_mod_mpoly_vec
 from .types.fmpz_mod_mat import fmpz_mod_mat
 
 from .types.fmpq_mpoly import fmpq_mpoly_ctx, fmpq_mpoly, fmpq_mpoly_vec

src/flint/flint_base/flint_base.pyx

@@ -38,7 +38,7 @@ cdef class flint_scalar(flint_elem):
     def is_zero(self):
         return False
 
-    def _any_as_self(self):
+    def _any_as_self(self, other):
         return NotImplemented
 
     def _neg_(self):
@@ -329,14 +329,13 @@ cdef class flint_mpoly_context(flint_elem):
         return nametup
 
     @classmethod
-    def get_context(cls, slong nvars=1, ordering=Ordering.lex, names: Optional[str] = "x", nametup: Optional[tuple] = None):
+    def create_context_key(cls, slong nvars=1, ordering=Ordering.lex, names: Optional[str] = "x", nametup: Optional[tuple] = None):
         """
-        Retrieve a context via the number of variables, `nvars`, the ordering, `ordering`, and either a variable
-        name string, `names`, or a tuple of variable names, `nametup`.
+        Create a key for the context cache via the number of variables, the ordering, and
+        either a variable name string, or a tuple of variable names.
         """
-
         # A type hint of `ordering: Ordering` results in the error "TypeError: an integer is required" if a Ordering
-        # object is not provided. This is pretty obtuse so we check it's type ourselves
+        # object is not provided. This is pretty obtuse so we check its type ourselves
         if not isinstance(ordering, Ordering):
             raise TypeError(f"`ordering` ('{ordering}') is not an instance of flint.Ordering")
 
@@ -346,6 +345,15 @@ cdef class flint_mpoly_context(flint_elem):
             key = nvars, ordering, cls.create_variable_names(nvars, names)
         else:
             raise ValueError("must provide either `names` or `nametup`")
+        return key
+
+    @classmethod
+    def get_context(cls, *args, **kwargs):
+        """
+        Retrieve a context via the number of variables, `nvars`, the ordering, `ordering`, and either a variable
+        name string, `names`, or a tuple of variable names, `nametup`.
+        """
+        key = cls.create_context_key(*args, **kwargs)
 
         ctx = cls._ctx_cache.get(key)
         if ctx is None:

src/flint/flintlib/flint.pxd

@@ -50,6 +50,10 @@ cdef extern from *:
     """
 
 cdef extern from "flint/flint.h":
+    """
+    #define SIZEOF_ULONG sizeof(ulong)
+    """
+    int SIZEOF_ULONG
     const char * FLINT_VERSION
     const int __FLINT_RELEASE
     const int FLINT_BITS
@@ -60,6 +64,11 @@ cdef extern from "flint/flint.h":
     long flint_get_num_threads()
     void flint_cleanup()
 
+    ctypedef struct nmod_t:
+        mp_limb_t n
+        mp_limb_t ninv
+        flint_bitcnt_t norm
+
 cdef extern from *:
     """
     /* FLINT_BITS is not known until C compile time. We need to check if long

src/flint/flintlib/fmpz_mod_mpoly_factor.pxd

@@ -0,0 +1,26 @@
+from flint.flintlib.flint cimport slong
+from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
+from flint.flintlib.fmpz_mod_mpoly cimport fmpz_mod_mpoly_ctx_t, fmpz_mod_mpoly_t, fmpz_mod_mpoly_struct
+
+
+cdef extern from "flint/fmpz_mod_mpoly_factor.h":
+    ctypedef struct fmpz_mod_mpoly_factor_struct:
+        fmpz_t constant
+        fmpz_mod_mpoly_struct * poly
+        fmpz_struct * exp
+        slong num
+        slong alloc
+
+    ctypedef fmpz_mod_mpoly_factor_struct fmpz_mod_mpoly_factor_t[1]
+
+    void fmpz_mod_mpoly_factor_init(fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_clear(fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_swap(fmpz_mod_mpoly_factor_t f, fmpz_mod_mpoly_factor_t g, const fmpz_mod_mpoly_ctx_t ctx)
+    slong fmpz_mod_mpoly_factor_length(const fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_get_constant_fmpz(fmpz_t c, const fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_get_base(fmpz_mod_mpoly_t B, const fmpz_mod_mpoly_factor_t f, slong i, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_swap_base(fmpz_mod_mpoly_t B, fmpz_mod_mpoly_factor_t f, slong i, const fmpz_mod_mpoly_ctx_t ctx)
+    slong fmpz_mod_mpoly_factor_get_exp_si(fmpz_mod_mpoly_factor_t f, slong i, const fmpz_mod_mpoly_ctx_t ctx)
+    void fmpz_mod_mpoly_factor_sort(fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_ctx_t ctx)
+    int fmpz_mod_mpoly_factor_squarefree(fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx)
+    int fmpz_mod_mpoly_factor(fmpz_mod_mpoly_factor_t f, const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx)

src/flint/flintlib/fmpz_mpoly_factor.pxd

@@ -4,8 +4,6 @@ from flint.flintlib.flint cimport slong, fmpz_struct
 from flint.flintlib.fmpq cimport fmpq_t
 
 
-# unimported types  set()
-
 cdef extern from "flint/fmpz_mpoly_factor.h":
 
     ctypedef struct fmpz_mpoly_factor_struct:

src/flint/flintlib/nmod.pxd

@@ -1,11 +1,7 @@
-from flint.flintlib.flint cimport mp_limb_t, mp_bitcnt_t, ulong
+from flint.flintlib.flint cimport mp_limb_t, mp_bitcnt_t, ulong, nmod_t
 from flint.flintlib.fmpz cimport fmpz_t
 
 cdef extern from "flint/nmod.h":
-    ctypedef struct nmod_t:
-        mp_limb_t n
-        mp_limb_t ninv
-        mp_bitcnt_t norm
 # TODO add macros
 
 # from here on is parsed