Introduce submodules into python-flint

.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

@@ -70,7 +70,15 @@
         library_dirs=default_lib_dirs,
         include_dirs=default_include_dirs,
         define_macros=define_macros,
-        )
+        ),
+    Extension(
+        "flint.flint_base.flint_context",
+        ["src/flint/flint_base/flint_context.pyx"],
+        libraries=libraries,
+        library_dirs=default_lib_dirs,
+        include_dirs=default_include_dirs,
+        define_macros=define_macros,
+    ),
 ]
 
 for e in ext_modules:
@@ -86,9 +94,10 @@
     description='Bindings for FLINT and Arb',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-    version='0.4.1',
-    url='https://github.com/python-flint/python-flint',
+    version='0.4.2',
+    url='https://github.com/flintlib/python-flint',
     author='Fredrik Johansson',
     author_email='[email protected]',
     license='MIT',
     classifiers=['Topic :: Scientific/Engineering :: Mathematics'])
+

src/flint/arb.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+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/arf.pyx

@@ -1,3 +1,5 @@
+from .utils.conversion cimport prec_to_dps
+
 cdef class arf:
 
     cdef arf_t val

src/flint/flint_base/flint_context.pxd

@@ -0,0 +1,11 @@
+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

src/flint/flint_base/flint_context.pyx

@@ -0,0 +1,70 @@
+from flint._flint cimport (
+    ARF_RND_DOWN,
+    flint_cleanup,
+    flint_get_num_threads,
+    flint_set_num_threads
+)
+from flint.utils.conversion cimport prec_to_dps, dps_to_prec
+
+cdef class FlintContext:
+    def __init__(self):
+        self.default()
+
+    def default(self):
+        self.pretty = True
+        self.rnd = ARF_RND_DOWN
+        self.prec = 53
+        self.unicode = False
+        self.threads = 1
+        self.cap = 10
+
+    @property 
+    def prec(self):
+        return self._prec
+
+    @prec.setter
+    def prec(self, prec):
+        cdef long cprec = prec
+        if cprec < 2:
+            raise ValueError("prec must be >= 2")
+        self._prec = cprec
+        self._dps = prec_to_dps(cprec)
+
+    @property
+    def dps(self):
+        return self._dps
+
+    @dps.setter
+    def dps(self, prec):
+        self.prec = dps_to_prec(prec)
+
+    @property
+    def cap(self):
+        return self._cap
+
+    @cap.setter
+    def cap(self, long cap):
+        if cap < 0:
+            raise ValueError("cap must be >= 0")
+        self._cap = cap
+
+    @property
+    def threads(self):
+        return flint_get_num_threads()
+
+    @threads.setter
+    def threads(self, long num):
+        assert num >= 1 and num <= 64
+        flint_set_num_threads(num)
+
+    def __repr__(self):
+        return "pretty = %-8s  # pretty-print repr() output\n" \
+               "unicode = %-8s # use unicode characters in output\n" \
+               "prec = %-8s    # real/complex precision (in bits)\n"   \
+               "dps = %-8s     # real/complex precision (in digits)\n"    \
+               "cap = %-8s     # power series precision\n"    \
+               "threads = %-8s # max number of threads used internally\n" % \
+            (self.pretty, self.unicode, self.prec, self.dps, self.cap, self.threads)
+
+    def cleanup(self):
+        flint_cleanup()

src/flint/fmpz.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+from flint.utils.conversion cimport chars_from_str
+
 cdef inline int fmpz_set_pylong(fmpz_t x, obj):
     cdef int overflow
     cdef slong longval

src/flint/fmpz_mpoly.pyx

@@ -1,3 +1,6 @@
+from cpython.version cimport PY_MAJOR_VERSION
+from flint.utils.conversion cimport str_from_chars
+
 cdef any_as_fmpz_mpoly(x):
     cdef fmpz_mpoly res
     """

src/flint/fmpz_poly.pyx

@@ -1,3 +1,5 @@
+from cpython.version cimport PY_MAJOR_VERSION
+
 cdef any_as_fmpz_poly(x):
     cdef fmpz_poly res
     if typecheck(x, fmpz_poly):

src/flint/functions.pyx

@@ -1,3 +1,5 @@
+from .utils.conversion cimport dps_to_prec
+
 # xxx: this doesn't work when changed to a cdef function. why?
 def __goodness(x, bint parts=True, metric=None):
     if metric is not None:

src/flint/nmod_mat.pyx

@@ -1,3 +1,5 @@
+from flint.utils.conversion cimport matrix_to_str
+
 cdef any_as_nmod_mat(obj, nmod_t mod):
     cdef nmod_mat r
     cdef mp_limb_t v

src/flint/pyflint.pyx

@@ -6,6 +6,8 @@ cimport flint
 cimport libc.stdlib
 cimport cython
 
+from flint.flint_base.flint_context cimport FlintContext
+
 cdef flint_rand_t global_random_state
 flint_randinit(global_random_state)
 
@@ -22,117 +24,13 @@ cdef extern from "Python.h":
     double PyComplex_RealAsDouble(PyObject *op)
     double PyComplex_ImagAsDouble(PyObject *op)
 
-from cpython.version cimport PY_MAJOR_VERSION
-
-cdef chars_from_str(s):
-    if PY_MAJOR_VERSION < 3:
-        return s
-    else:
-        return s.encode('ascii')
-
-cdef str_from_chars(s):
-    if PY_MAJOR_VERSION < 3:
-        return str(s)
-    else:
-        return bytes(s).decode('ascii')
-
-cdef matrix_to_str(tab):
-    if len(tab) == 0 or len(tab[0]) == 0:
-        return "[]"
-    tab = [[str(c) for c 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)
-
 cdef inline bint typecheck(object ob, object tp):
     return PyObject_TypeCheck(ob, <PyTypeObject*>tp)
 
 DEF FMPZ_UNKNOWN = 0
 DEF FMPZ_REF = 1
 DEF FMPZ_TMP = 2
 
-
-cdef long prec_to_dps(n):
-    return max(1, int(round(int(n)/3.3219280948873626)-1))
-
-cdef long dps_to_prec(n):
-    return max(1, int(round((int(n)+1)*3.3219280948873626)))
-
-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
-
-    def __init__(self):
-        self.default()
-
-    def default(self):
-        self.pretty = True
-        self.rnd = ARF_RND_DOWN
-        self.prec = 53
-        self.unicode = False
-        self.threads = 1
-        self.cap = 10
-
-    property prec:
-
-        def __set__(self, prec):
-            cdef long cprec = prec
-            if cprec < 2:
-                raise ValueError("prec must be >= 2")
-            self._prec = cprec
-            self._dps = prec_to_dps(cprec)
-
-        def __get__(self):
-            return self._prec
-
-    property dps:
-
-        def __set__(self, prec):
-            self.prec = dps_to_prec(prec)
-
-        def __get__(self):
-            return self._dps
-
-    property cap:
-
-        def __set__(self, long cap):
-            if cap < 0:
-                raise ValueError("cap must be >= 0")
-            self._cap = cap
-
-        def __get__(self):
-            return self._cap
-
-    property threads:
-
-        def __set__(self, long num):
-            assert num >= 1 and num <= 64
-            flint_set_num_threads(num)
-
-        def __get__(self):
-            return flint_get_num_threads()
-
-    def __repr__(self):
-        return "pretty = %-8s  # pretty-print repr() output\n" \
-               "unicode = %-8s # use unicode characters in output\n" \
-               "prec = %-8s    # real/complex precision (in bits)\n"   \
-               "dps = %-8s     # real/complex precision (in digits)\n"    \
-               "cap = %-8s     # power series precision\n"    \
-               "threads = %-8s # max number of threads used internally\n" % \
-            (self.pretty, self.unicode, self.prec, self.dps, self.cap, self.threads)
-
-    def cleanup(self):
-        flint_cleanup()
-
 cdef FlintContext thectx = FlintContext()
 
 ctx = thectx

src/flint/utils/conversion.pxd

@@ -0,0 +1,32 @@
+from cpython.version cimport PY_MAJOR_VERSION
+
+cdef inline long prec_to_dps(n):
+    return max(1, int(round(int(n)/3.3219280948873626)-1))
+
+cdef inline long dps_to_prec(n):
+    return max(1, int(round((int(n)+1)*3.3219280948873626)))
+
+cdef inline chars_from_str(s):
+    if PY_MAJOR_VERSION < 3:
+        return s
+    else:
+        return s.encode('ascii')
+
+cdef inline str_from_chars(s):
+    if PY_MAJOR_VERSION < 3:
+        return str(s)
+    else:
+        return bytes(s).decode('ascii')
+
+cdef inline matrix_to_str(tab):
+    if len(tab) == 0 or len(tab[0]) == 0:
+        return "[]"
+    tab = [[str(c) for c 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)