Merge pull request #61 from GiacomoPope/introduce-submodules

Introduce submodules into python-flint

Author: oscarbenjamin

.gitignore

@@ -1,6 +1,6 @@
 build/*
 dist/*
-src/flint/*.c
+src/flint/**/*.c
 src/flint/*.html
 doc/build/*
 fmake*
@@ -16,3 +16,4 @@ MANIFEST
 .coverage
 *.swp
 .python-version
+*.DS_Store

setup.py

@@ -63,16 +63,26 @@
     compiler_directives['linetrace'] = True
 
 
-ext_modules = [
-    Extension(
-        "flint._flint", ["src/flint/pyflint.pyx"],
-        libraries=libraries,
-        library_dirs=default_lib_dirs,
-        include_dirs=default_include_dirs,
-        define_macros=define_macros,
-        )
+ext_files = [
+    ("flint._flint", ["src/flint/pyflint.pyx"]), # Main Module
+    # Submodules
+    ("flint.flint_base.flint_base", ["src/flint/flint_base/flint_base.pyx"]),
+    ("flint.flint_base.flint_context", ["src/flint/flint_base/flint_context.pyx"]),
+
 ]
 
+ext_options = {
+    "libraries" : libraries,
+    "library_dirs" : default_lib_dirs,
+    "include_dirs" : default_include_dirs,
+    "define_macros" : define_macros,
+}
+
+ext_modules = []
+for mod_name, src_files in ext_files:
+    ext = Extension(mod_name, src_files, **ext_options)
+    ext_modules.append(ext)
+
 for e in ext_modules:
     e.cython_directives = {"embedsignature": True}
 
@@ -92,3 +102,4 @@
     author_email='[email protected]',
     license='MIT',
     classifiers=['Topic :: Scientific/Engineering :: Mathematics'])
+

src/flint/acb.pyx

@@ -1,3 +1,6 @@
+from flint.flint_base.flint_base cimport flint_scalar
+from flint.flint_base.flint_context cimport getprec
+
 cdef int acb_set_python(acb_t x, obj, bint allow_conversion):
     cdef double re, im
 

src/flint/acb_mat.pyx

@@ -1,3 +1,7 @@
+from flint.flint_base.flint_context cimport getprec
+
+from flint.flint_base.flint_base cimport flint_mat
+
 cdef acb_mat_coerce_operands(x, y):
     if isinstance(y, (fmpz_mat, fmpq_mat, arb_mat)):
         return x, acb_mat(y)

src/flint/acb_poly.pyx

@@ -1,3 +1,8 @@
+from flint.flint_base.flint_context cimport getprec
+# TODO: waiting for fix on the roots method, currently 
+# globally defined.
+# from flint.flint_base.flint_base cimport flint_poly
+
 cdef acb_poly_coerce_operands(x, y):
     if isinstance(y, (int, long, float, complex, fmpz, fmpq, arb, acb, fmpz_poly, fmpq_poly, arb_poly)):
         return x, acb_poly(y)

src/flint/acb_series.pyx

@@ -1,3 +1,6 @@
+from flint.flint_base.flint_context cimport getprec, getcap
+from flint.flint_base.flint_base cimport flint_series
+
 cdef acb_series_coerce_operands(x, y):
     if isinstance(y, (int, long, float, complex, fmpz, fmpz_poly, fmpz_series, fmpq, fmpq_poly, fmpq_series, arb, arb_poly, arb_series, acb, acb_poly)):
         return x, acb_series(y)

src/flint/arb.pyx

@@ -1,3 +1,9 @@
+from cpython.version cimport PY_MAJOR_VERSION
+
+from flint.flint_base.flint_context cimport getprec
+from flint.flint_base.flint_base cimport flint_scalar
+from flint.utils.conversion cimport chars_from_str, str_from_chars
+
 cdef _str_trunc(s, trunc=0):
     if trunc > 0 and len(s) > 3 * trunc:
         left = right = trunc

src/flint/arb_mat.pyx

@@ -1,3 +1,6 @@
+from flint.flint_base.flint_context cimport getprec
+from flint.flint_base.flint_base cimport flint_mat
+
 cdef arb_mat_coerce_operands(x, y):
     if isinstance(y, (fmpz_mat, fmpq_mat)):
         return x, arb_mat(y)

src/flint/arb_poly.pyx

@@ -1,3 +1,8 @@
+from flint.flint_base.flint_context cimport getprec
+# TODO: waiting for fix on the roots method, currently 
+# globally defined.
+# from flint.flint_base.flint_base cimport flint_poly
+
 cdef arb_poly_coerce_operands(x, y):
     if isinstance(y, (int, long, float, fmpz, fmpq, arb, fmpz_poly, fmpq_poly)):
         return x, arb_poly(y)

src/flint/arb_series.pyx

@@ -1,3 +1,6 @@
+from flint.flint_base.flint_context cimport getprec, getcap
+from flint.flint_base.flint_base cimport flint_series
+
 cdef arb_series_coerce_operands(x, y):
     if isinstance(y, (int, long, float, fmpz, fmpz_poly, fmpz_series, fmpq, fmpq_poly, fmpq_series, arb, arb_poly)):
         return x, arb_series(y)

src/flint/arf.pyx

@@ -1,3 +1,6 @@
+from flint.flint_base.flint_context cimport getprec
+from flint.utils.conversion cimport prec_to_dps
+
 cdef class arf:
 
     cdef arf_t val

src/flint/dirichlet.pyx

@@ -1,3 +1,5 @@
+from flint.flint_base.flint_context cimport getprec
+
 cdef dict _dirichlet_group_cache = {}
 
 cdef class dirichlet_group(object):

src/flint/flint_base/__init__.py

@@ -0,0 +1,19 @@
+cdef class flint_elem:
+    pass
+
+cdef class flint_scalar(flint_elem):
+    pass
+
+# TODO:
+# See .pyx file
+# cdef class flint_poly(flint_elem):
+#     pass
+
+cdef class flint_mpoly(flint_elem):
+    pass
+
+cdef class flint_mat(flint_elem):
+    pass
+
+cdef class flint_series(flint_elem):
+    pass

src/flint/flint_base/flint_base.pxd

@@ -0,0 +1,151 @@
+from flint.flint_base.flint_context cimport thectx
+
+cdef class flint_elem:
+    def __repr__(self):
+        if thectx.pretty:
+            return self.str()
+        else:
+            return self.repr()
+
+    def __str__(self):
+        return self.str()
+
+cdef class flint_scalar(flint_elem):
+    pass
+ 
+# TODO:
+# We cannot include this class until we can import
+# acb_poly, so for now we leave this class as a global
+# inside pyflint.pyx
+# 
+# cdef class flint_poly(flint_elem):
+#     """
+#     Base class for polynomials.
+#     """
+
+#     def __iter__(self):
+#         cdef long i, n
+#         n = self.length()
+#         for i in range(n):
+#             yield self[i]
+
+#     def coeffs(self):
+#         return list(self)
+
+#     def str(self, bint ascending=False):
+#         """
+#         Convert to a human-readable string (generic implementation for
+#         all polynomial types).
+
+#         If *ascending* is *True*, the monomials are output from low degree to
+#         high, otherwise from high to low.
+#         """
+#         coeffs = [str(c) for c in self]
+#         if not coeffs:
+#             return "0"
+#         s = []
+#         coeffs = enumerate(coeffs)
+#         if not ascending:
+#             coeffs = reversed(list(coeffs))
+#         for i, c in coeffs:
+#             if c == "0":
+#                 continue
+#             else:
+#                 if c.startswith("-") or (" " in c):
+#                     c = "(" + c + ")"
+#                 if i == 0:
+#                     s.append("%s" % c)
+#                 elif i == 1:
+#                     if c == "1":
+#                         s.append("x")
+#                     else:
+#                         s.append("%s*x" % c)
+#                 else:
+#                     if c == "1":
+#                         s.append("x^%s" % i)
+#                     else:
+#                         s.append("%s*x^%s" % (c, i))
+#         return " + ".join(s)
+
+#     def roots(self, **kwargs):
+#         """
+#         Isolates the complex roots of *self*. See :meth:`.acb_poly.roots`
+#         for details.
+#         """
+#         # TODO: 
+#         # To avoid circular imports, we import within the method
+#         from XXX.XXX.acb_poly import acb_poly
+#         return acb_poly(self).roots(**kwargs)
+
+cdef class flint_mpoly(flint_elem):
+    """
+    Base class for multivariate polynomials.
+    """
+
+cdef class flint_series(flint_elem):
+    """
+    Base class for power series.
+    """
+    def __iter__(self):
+        cdef long i, n
+        n = self.length()
+        for i in range(n):
+            yield self[i]
+
+    def coeffs(self):
+        return list(self)
+
+
+cdef class flint_mat(flint_elem):
+    """
+    Base class for matrices.
+    """
+
+    def repr(self):
+        if thectx.pretty:
+            return str(self)
+        # XXX
+        return "%s(%i, %i, [%s])" % (type(self).__name__,
+            self.nrows(), self.ncols(), (", ".join(map(str, self.entries()))))
+
+    def str(self, *args, **kwargs):
+        tab = self.table()
+        if len(tab) == 0 or len(tab[0]) == 0:
+            return "[]"
+        tab = [[r.str(*args, **kwargs) for r in row] for row in tab]
+        widths = []
+        for i in xrange(len(tab[0])):
+            w = max([len(row[i]) for row in tab])
+            widths.append(w)
+        for i in xrange(len(tab)):
+            tab[i] = [s.rjust(widths[j]) for j, s in enumerate(tab[i])]
+            tab[i] = "[" + (", ".join(tab[i])) + "]"
+        return "\n".join(tab)
+
+    def entries(self):
+        cdef long i, j, m, n
+        m = self.nrows()
+        n = self.ncols()
+        L = [None] * (m * n)
+        for i from 0 <= i < m:
+            for j from 0 <= j < n:
+                L[i*n + j] = self[i, j]
+        return L
+
+    def __iter__(self):
+        cdef long i, j, m, n
+        m = self.nrows()
+        n = self.ncols()
+        for i from 0 <= i < m:
+            for j from 0 <= j < n:
+                yield self[i, j]
+
+    def table(self):
+        cdef long i, m, n
+        m = self.nrows()
+        n = self.ncols()
+        L = self.entries()
+        return [L[i*n : (i+1)*n] for i in range(m)]
+
+    # supports mpmath conversions
+    tolist = table

src/flint/flint_base/flint_base.pyx

@@ -0,0 +1,25 @@
+from flint._flint cimport (
+    arf_rnd_t,
+)
+
+cdef class FlintContext:
+    cdef public bint pretty
+    cdef public long _prec
+    cdef public long _dps
+    cdef arf_rnd_t rnd
+    cdef public bint unicode
+    cdef public long _cap
+
+cdef FlintContext thectx
+
+cdef inline long getprec(long prec=0):
+    if prec > 1:
+        return prec
+    else:
+        return thectx._prec
+
+cdef inline long getcap(long cap=-1):
+    if cap >= 0:
+        return cap
+    else:
+        return thectx._cap