Merge branch 'hpy-import'

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/hpy/version.h

@@ -0,0 +1,4 @@
+
+// automatically generated by setup.py:get_scm_config()
+#define HPY_VERSION "0.0.3"
+#define HPY_GIT_REVISION "2196f14"

graalpython/lib-graalpython/modules/hpy/devel/__init__.py

@@ -21,8 +21,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import sys
 import os.path
 import functools
+import re
 from pathlib import Path
 from distutils import log
 from distutils.ccompiler import new_compiler
@@ -35,6 +37,9 @@
 # NOTE: this file is also imported by PyPy tests, so it must be compatible
 # with both Python 2.7 and Python 3.x
 
+DEFAULT_HPY_ABI = 'universal'
+if hasattr(sys, 'implementation') and sys.implementation.name == 'cpython':
+    DEFAULT_HPY_ABI = 'cpython'
 
 class HPyDevel:
     """ Extra sources for building HPy extensions with hpy.devel. """
@@ -129,6 +134,17 @@ def fix_distribution(self, dist):
         base_build_ext = dist.cmdclass.get("build_ext", build_ext)
         orig_bdist_egg_write_stub = bdist_egg_mod.write_stub
 
+        if isinstance(base_build_ext, type):
+            assert ('setuptools.command.build_ext', 'build_ext') in [
+                (c.__module__, c.__name__) for c in base_build_ext.__mro__
+            ], (
+                "dist.cmdclass['build_ext'] does not inherit from"
+                " setuptools.command.build_ext.build_ext. The HPy build"
+                " system does not currently support any other build_ext"
+                " classes. If you are using distutils.commands.build_ext,"
+                " please use setuptools.commands.build_ext instead."
+            )
+
         class build_hpy_ext(build_hpy_ext_mixin, base_build_ext, object):
             _base_build_ext = base_build_ext
 
@@ -167,30 +183,30 @@ def handle_hpy_ext_modules(dist, attr, hpy_ext_modules):
     assert attr == 'hpy_ext_modules'
 
     # add a global option --hpy-abi to setup.py
-    dist.__class__.hpy_abi = 'cpython'
+    dist.__class__.hpy_abi = DEFAULT_HPY_ABI
     dist.__class__.global_options += [
-        ('hpy-abi=', None, 'Specify the HPy ABI mode (default: cpython)')
+        ('hpy-abi=', None, 'Specify the HPy ABI mode (default: %s)' % DEFAULT_HPY_ABI)
     ]
     hpydevel = HPyDevel()
     hpydevel.fix_distribution(dist)
 
 
 _HPY_UNIVERSAL_MODULE_STUB_TEMPLATE = """
-class Spec:
-    def __init__(self, name, origin):
-        self.name = name
-        self.origin = origin
-
+# DO NOT EDIT THIS FILE!
+# This file is automatically generated by hpy
 
 def __bootstrap__():
+
     import sys, pkg_resources
-    from hpy.universal import load_from_spec
+    from hpy.universal import load
     ext_filepath = pkg_resources.resource_filename(__name__, {ext_file!r})
-    m = load_from_spec(Spec({module_name!r}, ext_filepath))
+    m = load({module_name!r}, ext_filepath)
     m.__file__ = ext_filepath
     m.__loader__ = __loader__
+    m.__name__ = __name__
     m.__package__ = __package__
     m.__spec__ = __spec__
+    m.__spec__.origin = ext_filepath
     sys.modules[__name__] = m
 
 __bootstrap__()
@@ -283,6 +299,9 @@ def _finalize_hpy_ext(self, ext):
         if ext.hpy_abi == 'universal':
             ext.define_macros.append(('HPY_UNIVERSAL_ABI', None))
             ext._hpy_needs_stub = True
+        else:
+            raise DistutilsError('Unknown HPy ABI: %s. Valid values are: '
+                                 'cpython, universal' % ext.hpy_abi)
 
     def finalize_options(self):
         self._extensions = self.distribution.ext_modules or []
@@ -337,12 +356,23 @@ def write_stub(self, output_dir, ext, compile=False):
         log.info(
             "writing hpy universal stub loader for %s to %s",
             ext._full_name, stub_file)
-        if compile and os.path.exists(stub_file):
-            raise DistutilsError(stub_file + " already exists! Please delete.")
+
         ext_file = os.path.basename(ext._file_name)
         module_name = ext_file.split(".")[0]
         if not self.dry_run:
             with open(stub_file, 'w') as f:
                 f.write(_HPY_UNIVERSAL_MODULE_STUB_TEMPLATE.format(
                     ext_file=ext_file, module_name=module_name)
                 )
+
+    def get_export_symbols(self, ext):
+        """ Override .get_export_symbols to replace "PyInit_<module_name>"
+            with "HPyInit_<module_name>.
+
+            Only relevant on Windows, where the .pyd file (DLL) must export the
+            module "HPyInit_" function.
+        """
+        exports = self._base_build_ext.get_export_symbols(self, ext)
+        if hasattr(ext, "hpy_abi") and ext.hpy_abi == 'universal':
+            exports = [re.sub(r"^PyInit_", "HPyInit_", name) for name in exports]
+        return exports

graalpython/lib-graalpython/modules/hpy/devel/version.py

@@ -23,4 +23,4 @@
 
 # automatically generated by setup.py:get_scm_config()
 __version__ = "0.0.3"
-__git_revision__ = "33c8692"
+__git_revision__ = "2196f14"