feat: support private sub-packages

Author: vam-google

pybind/pybind.cc

@@ -19,7 +19,7 @@ PYBIND11_MODULE(pybind, m) {
 
   auto subM = m.def_submodule("sub", "submodule");
   subM.def("second_func", &second_func, "");
-  auto subSubM = subM.def_submodule("sub_sub", "sub submodule");
+  auto subSubM = subM.def_submodule("_sub_private", "sub submodule");
   subSubM.def("sub_sub_func", &sub_sub_func, "");
-  subSubM.def("_sub_sub_private_func", &sub_sub_func, "private sub func");
+  subSubM.def("_sub_private_private_func", &sub_sub_func, "private sub func");
 }

pybind/pybind_py_test.py

@@ -8,8 +8,8 @@
 from pybind.pybind_copy import _EXTRA_SYMBOL as REGULAR_COPY_EXTRA_SYMBOL
 from pybind.pybind.sub import second_func as sub_second_func
 import pybind.pybind.sub
-from pybind.pybind.sub.sub_sub import *
-from pybind.pybind.sub.sub_sub import _sub_sub_private_func
+from pybind.pybind.sub._sub_private import *
+from pybind.pybind.sub._sub_private import _sub_private_private_func
 from pybind.sub_pybind.relative_import_lib import call_nested_pyind_func
 from pybind.sub_pybind.relative_import_lib import sub_sub_private_func
 
@@ -56,8 +56,8 @@ def test_pybind_first(self):
     print("14: Submodules")
     self.assertEqual(sub_second_func(1), 5)
     self.assertEqual(pybind.pybind.sub.second_func(1), 6)
-    self.assertEqual(pybind.pybind.sub.sub_sub.sub_sub_func(3), 6)
-    self.assertEqual(_sub_sub_private_func(5), 10)
+    self.assertEqual(pybind.pybind.sub._sub_private.sub_sub_func(3), 6)
+    self.assertEqual(_sub_private_private_func(5), 10)
 
     print("15: Nested pybinds and relative imports")
     self.assertEqual(call_nested_pyind_func(6), 3)

pybind/sub_pybind/relative_import_lib.py

@@ -1,8 +1,8 @@
 from .nested_pybind import nested_pybind_func
-from ..pybind.sub.sub_sub import _sub_sub_private_func
+from ..pybind.sub._sub_private import _sub_private_private_func
 
 def call_nested_pyind_func(x):
   return nested_pybind_func(x)
 
 def sub_sub_private_func(x):
-  return _sub_sub_private_func(x)
+  return _sub_private_private_func(x)

pybind_external/pybind_external_py_test.py

@@ -8,8 +8,8 @@
 from pybind.pybind_copy import _EXTRA_SYMBOL as REGULAR_COPY_EXTRA_SYMBOL
 from pybind.pybind.sub import second_func as sub_second_func
 import pybind.pybind.sub
-from pybind.pybind.sub.sub_sub import *
-from pybind.pybind.sub.sub_sub import _sub_sub_private_func
+from pybind.pybind.sub._sub_private import *
+from pybind.pybind.sub._sub_private import _sub_private_private_func
 from pybind.sub_pybind.relative_import_lib import call_nested_pyind_func
 from pybind.sub_pybind.relative_import_lib import sub_sub_private_func
 
@@ -56,8 +56,8 @@ def test_pybind_first(self):
     print("14: Submodules")
     self.assertEqual(sub_second_func(1), 5)
     self.assertEqual(pybind.pybind.sub.second_func(1), 6)
-    self.assertEqual(pybind.pybind.sub.sub_sub.sub_sub_func(3), 6)
-    self.assertEqual(_sub_sub_private_func(5), 10)
+    self.assertEqual(pybind.pybind.sub._sub_private.sub_sub_func(3), 6)
+    self.assertEqual(_sub_private_private_func(5), 10)
 
     print("15: Nested pybinds and relative imports")
     self.assertEqual(call_nested_pyind_func(6), 3)

rules_pywrap/pybind_extension.py.tpl

@@ -2,11 +2,7 @@ from sys import modules
 from types import ModuleType
 
 def __update_globals(new_import_path, pywrap_m):
-  if hasattr(pywrap_m, '__all__'):
-    all_names = pywrap_m.__all__
-  else:
-    all_names = [name for name in dir(pywrap_m) if not name.startswith('_')]
-
+  all_names = pywrap_m.__all__ if hasattr(pywrap_m, '__all__') else dir(pywrap_m)
   modules[new_import_path] = pywrap_m
   for name in all_names:
     sub_pywrap = getattr(pywrap_m, name)