toposort extension modules so that ordering doesn't matter

Author: virtuald

src/semiwrap/cmd_gen_modinit_hpp.py

@@ -101,7 +101,6 @@ def main():
         module_name = sys.argv[1]
         output_hpp = sys.argv[2]
         inputs = sys.argv[3:]
-        assert len(inputs) > 0
     except Exception as e:
         print(__doc__, file=sys.stderr)
         sys.exit(1)

src/semiwrap/makeplan.py

@@ -15,6 +15,8 @@
 from .pkgconf_cache import PkgconfCache
 from .pyproject import PyProject
 
+import toposort
+
 
 @dataclasses.dataclass
 class Entrypoint:
@@ -150,10 +152,7 @@ def generate(self):
         # Generate extension modules
         #
 
-        for package_name, extension in projectcfg.extension_modules.items():
-            if extension.ignore:
-                continue
-
+        for package_name, extension in self._sorted_extension_modules():
             try:
                 yield from self._process_extension_module(package_name, extension)
             except Exception as e:
@@ -215,6 +214,32 @@ def _process_export_type_caster(self, name: str, caster_cfg: TypeCasterConfig):
         # store it so it can be used elsewhere
         self.local_caster_targets[name] = BuildTargetOutput(caster_target, 0)
 
+    def _sorted_extension_modules(
+        self,
+    ) -> T.Generator[T.Tuple[str, ExtensionModuleConfig], None, None]:
+        # sort extension modules by dependencies, that way modules can depend on other modules
+        # also declared in pyproject.toml without needing to worry about ordering in the file
+        by_name = {}
+        to_sort: T.Dict[str, T.Set[str]] = {}
+
+        for package_name, extension in self.pyproject.project.extension_modules.items():
+            if extension.ignore:
+                continue
+
+            name = extension.name or package_name.replace(".", "_")
+            by_name[name] = (package_name, extension)
+
+            deps = to_sort.setdefault(name, set())
+            for dep in extension.wraps:
+                deps.add(dep)
+            for dep in extension.depends:
+                deps.add(dep)
+
+        for name in toposort.toposort_flatten(to_sort, sort=True):
+            data = by_name.get(name)
+            if data:
+                yield data
+
     def _process_extension_module(
         self, package_name: str, extension: ExtensionModuleConfig
     ):

tests/cpp/sw-test-base/meson.build

@@ -12,4 +12,8 @@ swtest_base__module2_sources += files(
   'src/swtest_base/cpp/main2.cpp',
 )
 
+swtest_base__module3_sources += files(
+  'src/swtest_base/cpp/main3.cpp',
+)
+
 subdir('wrapcfg/modules')

tests/cpp/sw-test-base/pyproject.toml

@@ -29,11 +29,16 @@ base_class = "cpp/baseclass.h"
 
 
 [tool.semiwrap.extension_modules."swtest_base._module2"]
-depends = ["swtest_base__module"]
+depends = ["swtest_base__module", "swtest_base__module3"]
 
 [tool.semiwrap.extension_modules."swtest_base._module2".headers]
 fn2 = "cpp/fn2.h"
 
+
+[tool.semiwrap.extension_modules."swtest_base._module3"]
+# empty module to test dependency on module declared after a module
+
+
 [tool.semiwrap.export_type_casters.sw-test-base-casters]
 pypackage = "swtest_base"
 includedir = ["src/swtest_base/cpp/type_casters"]

tests/cpp/sw-test-base/src/swtest_base/cpp/main3.cpp

@@ -0,0 +1,5 @@
+#include <semiwrap_init.swtest_base._module3.hpp>
+
+SEMIWRAP_PYBIND11_MODULE(m) {
+    initWrapper(m);
+}