Make pybind11 code generator generate a relative module.

Also remove the macro `GOOGLE_PYBIND11_MODULE`.

The generated _clif.cc file after this cl: https://source.corp.google.com/piper///depot/google3/experimental/wangxf/clif_gen_files/t1_clif.cc.

The generated _clif_init.cc file after this cl: https://source.corp.google.com/piper///depot/google3/experimental/wangxf/clif_gen_files/t1_clif_init.cc.

PiperOrigin-RevId: 493406517

Author: wangxf

clif/pybind11/generator.py

@@ -87,6 +87,17 @@ def preprocess_ast(self) -> None:
         capsule_types=capsule_types, registered_types=registered_types,
         requires_status=requires_status)
 
+  def generate_pyinit(self) -> Generator[str, None, None]:
+    yield '#include <Python.h>'
+    yield ''
+    mangled_module_name = _generate_mangled_name_for_module(
+        self._module_path)
+    yield f'extern "C" PyObject* GooglePyInit_{mangled_module_name}();'
+    yield ''
+    yield f'extern "C" PyObject* PyInit_{self._module_name}() {{'
+    yield I + f'return GooglePyInit_{mangled_module_name}();'
+    yield '}'
+
   def generate_header(self,
                       ast: ast_pb2.AST) -> Generator[str, None, None]:
     """Generates pybind11 bindings code from CLIF ast."""
@@ -148,31 +159,55 @@ def generate_from(self, ast: ast_pb2.AST):
     yield ''
     yield from type_casters.generate_from(ast, self._include_paths)
 
-    mangled_module_name = _generate_mangled_name_for_module(
-        self._module_path)
-    yield (f'GOOGLE_PYBIND11_MODULE({self._module_name}, '
-           f'{mangled_module_name}, m) {{')
-    yield from self._generate_import_modules(ast)
-    yield I+('m.doc() = "CLIF-generated pybind11-based module for '
-             f'{ast.source}";')
+    yield 'namespace {'
+    yield ''
+    yield 'PyObject * this_module_init() noexcept {'
+    yield I + 'PYBIND11_CHECK_PYTHON_VERSION'
+    yield I + 'PYBIND11_ENSURE_INTERNALS_READY'
+    yield I + ('static pybind11::module_::module_def '
+               f'module_def_{self._module_name};')
+    yield I + ('auto m = pybind11::module_::create_extension_module('
+               f'"{self._module_name}", nullptr, '
+               f'&module_def_{self._module_name});')
+    yield I + 'try {'
+    for s in self._generate_import_modules(ast):
+      yield I + s
+    yield I + I + ('m.doc() = "CLIF-generated pybind11-based module for '
+                   f'{ast.source}";')
     if self._codegen_info.requires_status:
-      yield I + 'pybind11::module_::import("util.task.python.error");'
-    yield I + 'pybind11_protobuf::ImportNativeProtoCasters();'
+      yield I + I + ('pybind11::module_::import('
+                     '"util.task.python.error");')
+    yield I + I + 'pybind11_protobuf::ImportNativeProtoCasters();'
 
     for decl in ast.decls:
       if decl.decltype == ast_pb2.Decl.Type.FUNC:
         for s in function.generate_from(
             'm', decl.func, self._codegen_info, None):
-          yield I + s
+          yield I + I + s
       elif decl.decltype == ast_pb2.Decl.Type.CONST:
-        yield from consts.generate_from('m', decl.const)
+        for s in consts.generate_from('m', decl.const):
+          yield I + s
       elif decl.decltype == ast_pb2.Decl.Type.CLASS:
-        yield from classes.generate_from(
-            decl, 'm', trampoline_class_names, self._codegen_info)
+        for s in classes.generate_from(
+            decl, 'm', trampoline_class_names, self._codegen_info):
+          yield I + s
       elif decl.decltype == ast_pb2.Decl.Type.ENUM:
-        yield from enums.generate_from('m', decl.enum)
+        for s in enums.generate_from('m', decl.enum):
+          yield I + s
+    yield I + I + 'return m.ptr();'
+    yield I + '}'
+    yield I + 'PYBIND11_CATCH_INIT_EXCEPTIONS'
+    yield '}'
+    yield ''
+    yield '}  // namespace'
+    yield ''
+    mangled_module_name = _generate_mangled_name_for_module(
+        self._module_path)
+    yield f'extern "C" PyObject* GooglePyInit_{mangled_module_name}() {{'
+    yield I + 'return this_module_init();'
     yield '}'
     yield ''
+
     for namespace, typedefs in itertools.groupby(
         self._types, lambda gen_type: gen_type.cpp_namespace):
       namespace = namespace.strip(':') or 'clif'

clif/pybind11/runtime.h

@@ -335,37 +335,4 @@ class type_caster<PyObject> {
 }  // namespace detail
 }  // namespace pybind11
 
-
-// These two macros are nearly the same with the macros defined in
-// third_party/pybind11, but with the module init function name changed from
-// `PyInit_<modulename>` to `GooglePyInit_<modulename>`. This is to allow the
-// static importer (/devtools/python/launcher/static_metaimporter.cc) to find
-// and statically link the generated extension module. See
-// https://g3doc.corp.google.com/devtools/python/g3doc/python-extensions.md
-// for more information.
-#define GOOGLE_PYBIND11_PLUGIN_IMPL(symbol)                                   \
-    extern "C" PYBIND11_MAYBE_UNUSED PYBIND11_EXPORT PyObject                 \
-        *GooglePyInit_##symbol(void);                                         \
-    extern "C" PYBIND11_EXPORT PyObject *GooglePyInit_##symbol(void)
-
-#define GOOGLE_PYBIND11_MODULE(name, symbol, variable)                        \
-    static ::pybind11::module_::module_def PYBIND11_CONCAT(                   \
-        pybind11_module_def_, name) PYBIND11_MAYBE_UNUSED;                    \
-    PYBIND11_MAYBE_UNUSED                                                     \
-    static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &); \
-    GOOGLE_PYBIND11_PLUGIN_IMPL(symbol) {                                     \
-        PYBIND11_CHECK_PYTHON_VERSION                                         \
-        PYBIND11_ENSURE_INTERNALS_READY                                       \
-        auto m = ::pybind11::module_::create_extension_module(                \
-            PYBIND11_TOSTRING(name), nullptr, &PYBIND11_CONCAT(               \
-                pybind11_module_def_, name));                                 \
-        try {                                                                 \
-            PYBIND11_CONCAT(pybind11_init_, name)(m);                         \
-            return m.ptr();                                                   \
-        }                                                                     \
-        PYBIND11_CATCH_INIT_EXCEPTIONS                                        \
-    }                                                                         \
-    void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ & (variable))
-
-
 #endif  // THIRD_PARTY_CLIF_PYBIND11_RUNTIME_H_