[GR-10719] Extend C API to support simple Cython generated sources

PullRequest: graalpython/110

Author: timfel

graalpython/benchmarks/src/benchmarks/interop/python_r_image_demo.py

@@ -35,6 +35,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import polyglot
 import sys
 import os
 
@@ -44,21 +45,19 @@
 
 from image_magix import Image
 
-MIME_R = "application/x-r"
-
-load_jpeg = eval(compile("""function(file.name) {
+load_jpeg = polyglot.eval(string="""function(file.name) {
     jimg <- read.csv(gzfile(file.name))
     return (jimg)
-}""", "", MIME_R))
+}""", language="R")
 
 print("stage 1")
 
 working_dir_parts.append("img.csv.gz")
 raw_data = load_jpeg(os.sep.join(working_dir_parts))
 
 # the dimensions are R attributes; define function to access them
-getDim = eval(compile("function(v, pos) dim(v)[[pos]]", "", MIME_R))
-getDataRowMajor = eval(compile("function(v) as.vector(t(v))", "", MIME_R))
+getDim = polyglot.eval(string="function(v, pos) dim(v)[[pos]]", language="R")
+getDataRowMajor = polyglot.eval(string="function(v) as.vector(t(v))", language="R")
 
 print("stage 2")
 
@@ -77,17 +76,16 @@
 
 print("stage 3")
 
-draw = eval(compile("""function(processedImgObj) {
+draw = polyglot.eval(string="""function(processedImgObj) {
     require(grDevices)
     require(grid)
     mx <- matrix(processedImgObj$`@data`/255, nrow=processedImgObj$`@height`, ncol=processedImgObj$`@width`)
     cat("rows:", nrow(mx), "\n")
     grid.newpage()
     grid.raster(mx, height=unit(nrow(mx),"points"))
     cat("DONE\n")
-}""", "", MIME_R))
+}""", language="R")
 
 draw(result)
 
-eval(compile("dev.off()", "", MIME_R))
-
+polyglot.eval(string="dev.off()", language="R")

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -112,6 +112,7 @@
 #include "codecs.h"
 #include "frameobject.h"
 #include "traceback.h"
+#include "classobject.h"
 
 #define PY_TRUFFLE_CEXT ((void*)polyglot_import("python_cext"))
 #define PY_BUILTIN ((void*)polyglot_import("python_builtins"))

graalpython/com.oracle.graal.python.cext/include/classobject.h

@@ -0,0 +1,63 @@
+/* Copyright (c) 2018, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2017 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+/* Former class object interface -- now only bound methods are here  */
+
+/* Revealing some structures (not for general use) */
+
+#ifndef Py_LIMITED_API
+#ifndef Py_CLASSOBJECT_H
+#define Py_CLASSOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *im_func;   /* The callable object implementing the method */
+    PyObject *im_self;   /* The instance it is bound to */
+    PyObject *im_weakreflist; /* List of weak references */
+} PyMethodObject;
+
+PyAPI_DATA(PyTypeObject) PyMethod_Type;
+
+#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)
+
+PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *);
+
+PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *);
+PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
+
+/* Macros for direct access to these values. Type checks are *not*
+   done, so use with care. */
+#define PyMethod_GET_FUNCTION(meth) \
+        (((PyMethodObject *)meth) -> im_func)
+#define PyMethod_GET_SELF(meth) \
+        (((PyMethodObject *)meth) -> im_self)
+
+PyAPI_FUNC(int) PyMethod_ClearFreeList(void);
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *func;
+} PyInstanceMethodObject;
+
+PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type;
+
+#define PyInstanceMethod_Check(op) ((op)->ob_type == &PyInstanceMethod_Type)
+
+PyAPI_FUNC(PyObject *) PyInstanceMethod_New(PyObject *);
+PyAPI_FUNC(PyObject *) PyInstanceMethod_Function(PyObject *);
+
+/* Macros for direct access to these values. Type checks are *not*
+   done, so use with care. */
+#define PyInstanceMethod_GET_FUNCTION(meth) \
+        (((PyInstanceMethodObject *)meth) -> func)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_CLASSOBJECT_H */
+#endif /* Py_LIMITED_API */

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

@@ -52,5 +52,7 @@
 
 #define HAVE_WCHAR_H 1
 
+#define WITH_THREAD 1
+
 #endif /*Py_PYCONFIG_H*/
 

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

@@ -98,6 +98,10 @@ declare_type(PyByteArray_Type, bytearray, PyByteArrayObject);
 declare_type(PyCFunction_Type, function, PyCFunctionObject);
 declare_type(_PyExc_BaseException, BaseException, PyBaseExceptionObject);
 declare_type(PyBuffer_Type, buffer, PyBufferDecorator);
+declare_type(PyMethod_Type, method, PyMethodObject);
+declare_type(PyCode_Type, code, PyCodeObject);
+declare_type(PyFrame_Type, frame, PyFrameObject);
+declare_type(PyTraceBack_Type, traceback, PyTracebackObject);
 // Below types use the same object structure as others, and thus
 // POLYGLOT_DECLARE_TYPE should not be called again
 initialize_type(PySuper_Type, super, _object);

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+PyTypeObject PyMethod_Type = PY_TRUFFLE_TYPE("method", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyMethodObject));
+PyTypeObject PyInstanceMethod_Type = PY_TRUFFLE_TYPE("instancemethod", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyInstanceMethodObject));
+
+PyObject* PyMethod_Function(PyObject* obj) {
+    if (PyMethod_Check(obj)) {
+        return PyMethod_GET_FUNCTION(obj);
+    } else {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+}
+
+PyObject* PyMethod_Self(PyObject* obj) {
+    if (PyMethod_Check(obj)) {
+        return PyMethod_GET_SELF(obj);
+    } else {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+PyTypeObject PyCode_Type = PY_TRUFFLE_TYPE("code", &PyType_Type, Py_TPFLAGS_DEFAULT, sizeof(PyTypeObject));
+
+PyCodeObject* PyCode_New(int argcount, int kwonlyargcount, int nlocals,
+                         int stacksize, int flags, PyObject *code,
+                         PyObject *consts, PyObject *names, PyObject *varnames,
+                         PyObject *freevars, PyObject *cellvars,
+                         PyObject *filename, PyObject *name, int firstlineno,
+                         PyObject *lnotab) {
+    return UPCALL_CEXT_O("PyCode_New", argcount, kwonlyargcount, nlocals,
+                         stacksize, flags, native_to_java(code),
+                         native_to_java(consts), native_to_java(names), native_to_java(varnames),
+                         native_to_java(filename), native_to_java(name), firstlineno,
+                         native_to_java(lnotab));
+}

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

@@ -103,3 +103,12 @@ int PyDict_SetItemString(PyObject *d, const char *key, PyObject *item) {
 int PyDict_DelItemString(PyObject *d, const char *key) {
     return UPCALL_CEXT_I("PyDict_DelItem", native_to_java(d), polyglot_from_string(key, SRC_CS));
 }
+
+int PyDict_Update(PyObject *a, PyObject *b) {
+    PyObject* result = UPCALL_O(native_to_java(a), "update", native_to_java(b));
+    if (PyErr_Occurred()) {
+        return -1;
+    } else {
+        return 0;
+    }
+}

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

@@ -51,7 +51,7 @@ void PyErr_BadInternalCall(void) {
 
 
 PyObject* PyErr_Occurred() {
-	return UPCALL_CEXT_O("PyErr_Occurred", ERROR_MARKER);
+    return UPCALL_CEXT_O("PyErr_Occurred", ERROR_MARKER);
 }
 
 void PyErr_SetString(PyObject *exception, const char *string) {
@@ -107,11 +107,11 @@ static void _PyErr_GetOrFetchExcInfo(int consume, PyObject **p_type, PyObject **
 }
 
 void PyErr_Fetch(PyObject **p_type, PyObject **p_value, PyObject **p_traceback) {
-	_PyErr_GetOrFetchExcInfo(1, p_type, p_value, p_traceback);
+    _PyErr_GetOrFetchExcInfo(1, p_type, p_value, p_traceback);
 }
 
 void PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback) {
-	_PyErr_GetOrFetchExcInfo(0, p_type, p_value, p_traceback);
+    _PyErr_GetOrFetchExcInfo(0, p_type, p_value, p_traceback);
     Py_XINCREF(*p_type);
     Py_XINCREF(*p_value);
     Py_XINCREF(*p_traceback);
@@ -156,3 +156,13 @@ void PyErr_WriteUnraisable(PyObject *obj) {
 void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb) {
     UPCALL_CEXT_VOID("PyErr_Display", native_to_java(exception), native_to_java(value), native_to_java(tb));
 }
+
+void PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) {
+    // (tfel): nothing to do here from our side, the exception is already
+    // reified
+    return;
+}
+
+void PyErr_SetExcInfo(PyObject *p_type, PyObject *p_value, PyObject *p_traceback) {
+    PyErr_Restore(p_type, p_value, p_traceback);
+}

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

@@ -75,9 +75,13 @@ PyObject * PyExc_ZeroDivisionError = NULL;
 PyObject * PyExc_ArithmeticError = NULL;
 PyObject * PyExc_StopIteration = NULL;
 PyObject * PyExc_BufferError = NULL;
+PyObject * PyExc_AssertionError = NULL;
+PyObject * PyExc_UnboundLocalError = NULL;
+PyObject * PyExc_NotImplementedError = NULL;
 
 void initialize_exceptions() {
     PyExc_AttributeError = PY_EXCEPTION("AttributeError");
+    PyExc_AssertionError = PY_EXCEPTION("AssertionError");
     PyExc_BaseException = PY_EXCEPTION("BaseException");
     PyExc_BytesWarning = PY_EXCEPTION("BytesWarning");
     PyExc_DeprecationWarning = PY_EXCEPTION("DeprecationWarning");
@@ -107,5 +111,16 @@ void initialize_exceptions() {
     PyExc_ArithmeticError = PY_EXCEPTION("ArithmeticError");
     PyExc_StopIteration = PY_EXCEPTION("StopIteration");
     PyExc_BufferError = PY_EXCEPTION("BufferError");
+    PyExc_UnboundLocalError = PY_EXCEPTION("UnboundLocalError");
+    PyExc_NotImplementedError = PY_EXCEPTION("NotImplementedError");
 }
 
+
+int PyException_SetTraceback(PyObject *self, PyObject *tb) {
+    PyObject* result = UPCALL_O(native_to_java(self), "with_traceback", native_to_java(tb));
+    if (result == ERROR_MARKER) {
+        return -1;
+    } else {
+        return 0;
+    }
+}