[GR-10431] Fixes for R-Python/Numpy interop.

PullRequest: graalpython/87

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -90,6 +90,7 @@ POLYGLOT_DECLARE_TYPE(PyBufferDecorator);
 
 extern void* to_java(PyObject* obj);
 extern void* to_java_type(PyTypeObject* cls);
+void* native_to_java(PyObject* obj);
 extern PyObject* to_sulong(void *o);
 extern PyObject* explicit_cast(PyObject* cobj);
 #define as_char_pointer(obj) polyglot_invoke(PY_TRUFFLE_CEXT, "to_char_pointer", to_java(obj))

graalpython/com.oracle.graal.python.cext/src/object.c

@@ -538,7 +538,6 @@ PyObject* PyObject_CallObject(PyObject* callable, PyObject* args) {
 PyObject* PyObject_CallFunction(PyObject* callable, const char* fmt, ...) {
     PyObject* args;
     CALL_WITH_VARARGS(args, Py_BuildValue, 2, fmt);
-    args = to_sulong(args);
     if (strlen(fmt) < 2) {
         PyObject* singleArg = args;
         args = PyTuple_New(strlen(fmt));

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -69,7 +69,8 @@ def setUp(self):
 
 def ccompile(self, name):
     from distutils.core import setup, Extension
-    module = Extension(name, sources=['%s/%s.c' % (__dir__, name)])
+    source_file = '%s/%s.c' % (__dir__, name)
+    module = Extension(name, sources=[source_file])
     args = ['--quiet', 'build', 'install_lib', '-f', '--install-dir=%s' % __dir__]
     setup(
         script_name='setup',
@@ -79,6 +80,13 @@ def ccompile(self, name):
         description='',
         ext_modules=[module]
     )
+    # ensure file was really written
+    try:
+        stat_result = os.stat(source_file)
+        if stat_result[6] == 0:
+            raise SystemError("empty source file %s" % (source_file,))
+    except FileNotFoundError:
+        raise SystemError("source file %s not available" % (source_file,))
 
 
 c_template = """
@@ -377,6 +385,7 @@ def create_module(self, name=None):
 
 
 class UnseenFormatter(Formatter):
+
     def get_value(self, key, args, kwds):
         if isinstance(key, str):
             try:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -60,8 +60,9 @@
 import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
-import com.oracle.graal.python.builtins.objects.cext.PythonClassNativeWrapper;
-import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.UnicodeObjectNodes.UnicodeAsWideCharNode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
@@ -231,9 +232,9 @@ long run(PFloat value) {
         }
 
         @Specialization
-        Object run(PythonObjectNativeWrapper value,
+        Object run(PythonNativeWrapper value,
                         @Cached("create()") AsLong recursive) {
-            return recursive.executeWith(value.getPythonObject());
+            return recursive.executeWith(value.getDelegate());
         }
 
         private BuiltinConstructors.IntNode getIntNode() {
@@ -634,8 +635,8 @@ private Object checkFunctionResult(Object result) {
     abstract static class PNativeToPTypeNode extends PForeignToPTypeNode {
 
         @Specialization
-        protected static PythonAbstractObject fromNativeNone(PythonObjectNativeWrapper nativeWrapper) {
-            return nativeWrapper.getPythonObject();
+        protected static Object fromNativeNone(PythonNativeWrapper nativeWrapper) {
+            return nativeWrapper.getDelegate();
         }
 
         public static PNativeToPTypeNode create() {
@@ -1040,8 +1041,8 @@ abstract static class PyTruffle_GetTpFlags extends NativeBuiltin {
         @Child private GetClassNode getClassNode;
 
         @Specialization
-        long doPythonObject(PythonObjectNativeWrapper nativeWrapper) {
-            PythonClass pclass = getClassNode().execute(nativeWrapper.getPythonObject());
+        long doPythonObject(PythonNativeWrapper nativeWrapper) {
+            PythonClass pclass = getClassNode().execute(nativeWrapper.getDelegate());
             return pclass.getFlags();
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -38,7 +38,7 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
-import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.runtime.interop.PythonMessageResolutionForeign;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -45,6 +45,10 @@
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.AsPythonObjectNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToSulongNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.TruffleObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.PGuards;
@@ -77,42 +81,42 @@ public abstract static class ToSulongNode extends PBaseNode {
          * passed from Python into C code need to wrap Strings into PStrings.
          */
         @Specialization
-        Object run(String str) {
+        Object doString(String str) {
             return PythonObjectNativeWrapper.wrap(factory().createString(str));
         }
 
         @Specialization
-        Object run(boolean b) {
+        Object doBoolean(boolean b) {
             return PythonObjectNativeWrapper.wrap(factory().createInt(b));
         }
 
         @Specialization
-        Object run(int integer) {
-            return PythonObjectNativeWrapper.wrap(factory().createInt(integer));
+        Object doInteger(int i) {
+            return PythonObjectNativeWrapper.wrap(factory().createInt(i));
         }
 
         @Specialization
-        Object run(long integer) {
-            return PythonObjectNativeWrapper.wrap(factory().createInt(integer));
+        Object doLong(long l) {
+            return PythonObjectNativeWrapper.wrap(factory().createInt(l));
         }
 
         @Specialization
-        Object run(double number) {
-            return PythonObjectNativeWrapper.wrap(factory().createFloat(number));
+        Object doDouble(double d) {
+            return PythonObjectNativeWrapper.wrap(factory().createFloat(d));
         }
 
         @Specialization
-        Object runNativeClass(PythonNativeClass object) {
-            return object.object;
+        Object doNativeClass(PythonNativeClass nativeClass) {
+            return nativeClass.object;
         }
 
         @Specialization
-        Object runNativeObject(PythonNativeObject object) {
-            return object.object;
+        Object doNativeObject(PythonNativeObject nativeObject) {
+            return nativeObject.object;
         }
 
         @Specialization(guards = "!isNativeClass(object)")
-        Object runNativeObject(PythonClass object) {
+        Object doPythonClass(PythonClass object) {
             return PythonClassNativeWrapper.wrap(object);
         }
 
@@ -122,6 +126,11 @@ Object runNativeObject(PythonAbstractObject object) {
             return PythonObjectNativeWrapper.wrap(object);
         }
 
+        @Specialization(guards = {"isForeignObject(object)"})
+        Object doPythonClass(TruffleObject object) {
+            return TruffleObjectNativeWrapper.wrap(object);
+        }
+
         @Fallback
         Object run(Object obj) {
             assert obj != null : "Java 'null' cannot be a Sulong value";
@@ -140,6 +149,10 @@ protected static boolean isNativeObject(PythonAbstractObject o) {
             return o instanceof PythonNativeObject;
         }
 
+        protected static boolean isForeignObject(Object o) {
+            return !(o instanceof PythonAbstractObject);
+        }
+
         public static ToSulongNode create() {
             return ToSulongNodeGen.create();
         }
@@ -156,11 +169,11 @@ public abstract static class AsPythonObjectNode extends PBaseNode {
         @Child GetClassNode getClassNode;
 
         @Specialization
-        PythonAbstractObject doNativeWrapper(PythonObjectNativeWrapper object) {
-            return object.getPythonObject();
+        Object doNativeWrapper(PythonNativeWrapper object) {
+            return object.getDelegate();
         }
 
-        @Specialization(guards = "isForeignObject(object)")
+        @Specialization(guards = {"isForeignObject(object)", "!isNativeWrapper(object)"})
         PythonAbstractObject doNativeObject(TruffleObject object) {
             return factory().createNativeObjectWrapper(object);
         }
@@ -204,10 +217,14 @@ protected boolean isForeignObject(TruffleObject obj) {
             return getClassNode.execute(obj) == getCore().getForeignClass();
         }
 
+        protected boolean isNativeWrapper(Object obj) {
+            return obj instanceof PythonNativeWrapper;
+        }
+
         @TruffleBoundary
         public static Object doSlowPath(Object object) {
-            if (object instanceof PythonObjectNativeWrapper) {
-                return ((PythonObjectNativeWrapper) object).getPythonObject();
+            if (object instanceof PythonNativeWrapper) {
+                return ((PythonNativeWrapper) object).getDelegate();
             } else if (GetClassNode.getItSlowPath(object) == PythonLanguage.getCore().getForeignClass()) {
                 throw new AssertionError("Unsupported slow path operation: converting 'to_java(" + object + ")");
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CStringWrapper.java

@@ -42,8 +42,10 @@
 import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
- * Unlike a {@link PythonObjectNativeWrapper} object that wraps a Python unicode object, this
- * wrapper let's a Java String look like a {@code char*}.
+ * Unlike a
+ * {@link com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper}
+ * object that wraps a Python unicode object, this wrapper let's a Java String look like a
+ * {@code char*}.
  */
 public class CStringWrapper implements TruffleObject {