Remove modular building option

setup.py

@@ -34,12 +34,6 @@
 # Use `setup.py [] --release-symbols` for a release build with symbols libtiledb
 TILEDB_SYMBOLS_BUILD = False
 
-# Use `setup.py [] --modular` for a modular build of libtiledb_py
-#   Each .pyx file will be built as a separate shared library for faster
-#   compilation. This is disabled by default to avoid distributing multiple
-#   shared libraries.
-TILEDBPY_MODULAR = False
-
 # Allow to override TILEDB_FORCE_ALL_DEPS with environment variable
 TILEDB_FORCE_ALL_DEPS = "TILEDB_FORCE_ALL_DEPS" in os.environ
 TILEDB_DISABLE_SERIALIZATION = "TILEDB_DISABLE_SERIALIZATION" in os.environ
@@ -435,7 +429,6 @@ def do_copy(src, dest):
     ext_attr_update(
         "cython_compile_time_env",
         {
-            "TILEDBPY_MODULAR": TILEDBPY_MODULAR,
             "LIBTILEDB_VERSION_MAJOR": major,
             "LIBTILEDB_VERSION_MINOR": minor,
             "LIBTILEDB_VERSION_PATCH": patch,
@@ -626,9 +619,6 @@ def install_requires():
     if arg.find("--release-symbols") == 0:
         TILEDB_SYMBOLS_BUILD = True
         sys.argv.remove(arg)
-    if arg.find("--modular") == 0:
-        TILEDBPY_MODULAR = True
-        sys.argv.remove(arg)
     TILEDBPY_WERROR = False
     if arg.find("--werror") == 0:
         TILEDBPY_WERROR = True
@@ -729,29 +719,7 @@ def install_requires():
     ),
 ]
 
-
-if TILEDBPY_MODULAR:
-    for source in MODULAR_SOURCES:
-        module_name = os.path.splitext(os.path.split(source)[-1])[0]
-        if module_name + ".pxd" in MODULAR_HEADERS:
-            deps = module_name + ".pxd"
-        else:
-            deps = None
-        ext = Extension(
-            "tiledb.{}".format(module_name),
-            include_dirs=INC_DIRS,
-            define_macros=DEF_MACROS,
-            sources=[source],
-            depends=[deps] if deps else [],
-            library_dirs=LIB_DIRS,
-            libraries=LIBS,
-            extra_link_args=LFLAGS,
-            extra_compile_args=CXXFLAGS,
-            language="c++",
-        )
-        __extensions.append(ext)
-else:
-    __extensions[0].depends += MODULAR_SOURCES
+__extensions[0].depends += MODULAR_SOURCES
 
 # Helper to set Extension attributes correctly based on python version
 def ext_attr_update(attr, value):

tiledb/indexing.pyx

@@ -1,7 +1,3 @@
-IF TILEDBPY_MODULAR:
-  include "common.pxi"
-  from .libtiledb cimport *
-
 from libc.stdio cimport printf
 
 import weakref

tiledb/libmetadata.pyx

@@ -1,8 +1,3 @@
-IF TILEDBPY_MODULAR:
-    include "common.pxi"
-    from .libtiledb import *
-    from .libtiledb cimport *
-
 import weakref
 from collections.abc import MutableMapping
 

tiledb/libtiledb.pxd

@@ -1,9 +1,6 @@
 from libc.stdint cimport uint32_t, uint64_t
 from libc.stdio cimport FILE
-
-IF TILEDBPY_MODULAR:
-    from .indexing cimport DomainIndexer
-
+include "indexing.pxd"
 include "common.pxi"
 
 cdef extern from "Python.h":
@@ -1237,5 +1234,3 @@ cdef class ReadQuery(object):
 cdef class Metadata(object):
     cdef object array_ref
 
-IF (not TILEDBPY_MODULAR):
-    include "indexing.pxd"

tiledb/libtiledb.pyx

@@ -6,6 +6,8 @@ from cpython.pycapsule cimport PyCapsule_GetPointer, PyCapsule_IsValid, PyCapsul
 from cpython.version cimport PY_MAJOR_VERSION
 
 include "common.pxi"
+include "indexing.pyx"
+include "libmetadata.pyx"
 import io
 import warnings
 import collections.abc
@@ -27,17 +29,6 @@ from .vfs import VFS
 # https://docs.scipy.org/doc/numpy/reference/c-api.array.html#c.import_array
 np.import_array()
 
-
-###############################################################################
-#    MODULAR IMPORTS                                                 #
-###############################################################################
-
-IF TILEDBPY_MODULAR:
-    from .indexing import DomainIndexer
-ELSE:
-    include "indexing.pyx"
-    include "libmetadata.pyx"
-
 ###############################################################################
 #    Utility/setup                                                            #
 ###############################################################################