Introduce submodules into python-flint

.gitignore

@@ -16,3 +16,4 @@ MANIFEST
 .coverage
 *.swp
 .python-version
+*.DS_Store

setup.py

@@ -11,22 +11,22 @@
 from distutils.sysconfig import get_config_vars
 
 
-if sys.platform == 'win32':
+if sys.platform == "win32":
     #
     # This is used in CI to build wheels with mingw64
     #
-    if os.getenv('PYTHON_FLINT_MINGW64'):
+    if os.getenv("PYTHON_FLINT_MINGW64"):
         libraries = ["arb", "flint", "mpfr", "gmp"]
-        includedir = os.path.join(os.path.dirname(__file__), '.local', 'include')
-        librarydir1 = os.path.join(os.path.dirname(__file__), '.local', 'bin')
-        librarydir2 = os.path.join(os.path.dirname(__file__), '.local', 'lib')
+        includedir = os.path.join(os.path.dirname(__file__), ".local", "include")
+        librarydir1 = os.path.join(os.path.dirname(__file__), ".local", "bin")
+        librarydir2 = os.path.join(os.path.dirname(__file__), ".local", "lib")
         librarydirs = [librarydir1, librarydir2]
         default_include_dirs += [includedir]
         default_lib_dirs += librarydirs
         # Add gcc to the PATH in GitHub Actions when this setup.py is called by
         # cibuildwheel.
-        os.environ['PATH'] += r';C:\msys64\mingw64\bin'
-    elif os.getenv('PYTHON_FLINT_MINGW64_TMP'):
+        os.environ["PATH"] += r";C:\msys64\mingw64\bin"
+    elif os.getenv("PYTHON_FLINT_MINGW64_TMP"):
         # This would be used to build under Windows against these libraries if
         # they have been installed somewhere other than .local
         libraries = ["arb", "flint", "mpfr", "gmp"]
@@ -35,60 +35,70 @@
         libraries = ["arb", "flint", "mpir", "mpfr", "pthreads"]
 else:
     # On Ubuntu libarb.so is called libflint-arb.so
-    if os.getenv('PYTHON_FLINT_LIBFLINT_ARB'):
-        arb = 'flint-arb'
+    if os.getenv("PYTHON_FLINT_LIBFLINT_ARB"):
+        arb = "flint-arb"
     else:
-        arb = 'arb'
+        arb = "arb"
 
     libraries = [arb, "flint"]
-    (opt,) = get_config_vars('OPT')
-    os.environ['OPT'] = " ".join(flag for flag in opt.split() if flag != '-Wstrict-prototypes')
+    (opt,) = get_config_vars("OPT")
+    os.environ["OPT"] = " ".join(
+        flag for flag in opt.split() if flag != "-Wstrict-prototypes"
+    )
 
 
-default_include_dirs += [
-    os.path.join(d, "flint") for d in default_include_dirs
-]
+default_include_dirs += [os.path.join(d, "flint") for d in default_include_dirs]
 
 
 define_macros = []
 compiler_directives = {
-    'language_level': 3,
-    'binding': False,
+    "language_level": 3,
+    "binding": False,
 }
 
 
 # Enable coverage tracing
-if os.getenv('PYTHON_FLINT_COVERAGE'):
-    define_macros.append(('CYTHON_TRACE', 1))
-    compiler_directives['linetrace'] = True
+if os.getenv("PYTHON_FLINT_COVERAGE"):
+    define_macros.append(("CYTHON_TRACE", 1))
+    compiler_directives["linetrace"] = True
 
 
 ext_modules = [
     Extension(
-        "flint._flint", ["src/flint/pyflint.pyx"],
+        "flint._flint",
+        ["src/flint/pyflint.pyx"],
+        libraries=libraries,
+        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:
     e.cython_directives = {"embedsignature": True}
 
 setup(
-    name='python-flint',
-    cmdclass={'build_ext': build_ext},
+    name="python-flint",
+    cmdclass={"build_ext": build_ext},
     ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives),
-    #ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives, annotate=True),
-    packages=['flint', 'flint.test'],
-    package_dir={'': 'src'},
-    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',
-    author='Fredrik Johansson',
-    author_email='[email protected]',
-    license='MIT',
-    classifiers=['Topic :: Scientific/Engineering :: Mathematics'])
+    # ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives, annotate=True),
+    packages=["flint", "flint.test"],
+    package_dir={"": "src"},
+    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",
+    author="Fredrik Johansson",
+    author_email="[email protected]",
+    license="MIT",
+    classifiers=["Topic :: Scientific/Engineering :: Mathematics"],
+)

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,2 @@
+cdef class FlintContext:
+    pass

src/flint/flint_base/flint_context.pyx

@@ -0,0 +1,78 @@
+from ._flint cimport (
+    ARF_RND_DOWN,
+    arf_rnd_t,
+    flint_cleanup,
+    flint_get_num_threads,
+    flint_set_num_threads
+)
+from .utils.conversion cimport prec_to_dps, dps_to_prec
+
+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()

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/pyflint.pyx

@@ -6,6 +6,8 @@ cimport flint
 cimport libc.stdlib
 cimport cython
 
+from .flint_base.flint_context cimport FlintContext
+
 cdef flint_rand_t global_random_state
 flint_randinit(global_random_state)
 
@@ -56,83 +58,6 @@ 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,5 @@
+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)))