[GR-17377] Darwin support for Numpy/Pandas/SKLearn

PullRequest: graalpython/622

Author: fangerer

graalpython/com.oracle.graal.python.cext/modules/_memoryview.c

@@ -785,8 +785,8 @@ PyMemoryView_FromBuffer(Py_buffer *info)
 /* Create a memoryview from an object that implements the buffer protocol.
    If the object is a memoryview, the new memoryview must be registered
    with the same managed buffer. Otherwise, a new managed buffer is created. */
-PyObject *
-PyMemoryView_FromObject(PyObject *v)
+static PyObject *
+_PyMemoryView_FromObject(PyObject *v)
 {
     _PyManagedBufferObject *mbuf;
 
@@ -928,7 +928,7 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char order)
     assert(buffertype == PyBUF_READ || buffertype == PyBUF_WRITE);
     assert(order == 'C' || order == 'F' || order == 'A');
 
-    mv = (PyMemoryViewObject *)PyMemoryView_FromObject(obj);
+    mv = (PyMemoryViewObject *)_PyMemoryView_FromObject(obj);
     if (mv == NULL)
         return NULL;
 
@@ -968,7 +968,7 @@ memory_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    return polyglot_from_PyMemoryViewObject((PyMemoryViewObject *)PyMemoryView_FromObject(obj));
+    return polyglot_from_PyMemoryViewObject((PyMemoryViewObject *)_PyMemoryView_FromObject(obj));
 }
 
 

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

@@ -311,6 +311,11 @@ int PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o) {
     return UPCALL_CEXT_I(_jls_PySequence_SetItem, native_to_java(s), i, native_to_java(o));
 }
 
+UPCALL_ID(PySequence_GetSlice);
+PyObject* PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2) {
+	return UPCALL_CEXT_O(_jls_PySequence_GetSlice, native_to_java(s), i1, i2);
+}
+
 UPCALL_ID(PySequence_Tuple);
 PyObject* PySequence_Tuple(PyObject *v) {
     return UPCALL_CEXT_O(_jls_PySequence_Tuple, native_to_java(v));
@@ -519,3 +524,23 @@ Py_ssize_t PyMapping_Size(PyObject *o) {
     PyErr_Format(PyExc_TypeError, "object of type '%s' has no len()", Py_TYPE(o)->tp_name);
     return -1;
 }
+
+UPCALL_ID(PySequence_Repeat);
+PyObject* PySequence_Repeat(PyObject *o, Py_ssize_t count) {
+	return UPCALL_CEXT_O(_jls_PySequence_Repeat, native_to_java(o), count);
+}
+
+UPCALL_ID(PySequence_Concat);
+PyObject* PySequence_Concat(PyObject *s, PyObject *o) {
+	return UPCALL_CEXT_O(_jls_PySequence_Concat, native_to_java(s), native_to_java(o));
+}
+
+UPCALL_ID(PySequence_InPlaceRepeat);
+PyObject* PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count) {
+	return UPCALL_CEXT_O(_jls_PySequence_Repeat, native_to_java(o), count);
+}
+
+UPCALL_ID(PySequence_InPlaceConcat);
+PyObject* PySequence_InPlaceConcat(PyObject *s, PyObject *o) {
+	return UPCALL_CEXT_O(_jls_PySequence_Concat, native_to_java(s), native_to_java(o));
+}

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

@@ -47,11 +47,11 @@ void *Py_NoValue;
 
 PyObject*(*PY_TRUFFLE_LANDING)(void *rcv, void* name, ...);
 void*(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
-double(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
+void*(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
 void*(*PY_TRUFFLE_LANDING_PTR)(void *rcv, void* name, ...);
 PyObject*(*PY_TRUFFLE_CEXT_LANDING)(void* name, ...);
 void* (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
-double (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
+void* (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
 void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 
 
@@ -64,12 +64,12 @@ static void initialize_upcall_functions() {
 
     PY_TRUFFLE_LANDING = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall", SRC_CS)));
     PY_TRUFFLE_LANDING_L = ((void*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_l", SRC_CS)));
-    PY_TRUFFLE_LANDING_D = ((double(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_d", SRC_CS)));
+    PY_TRUFFLE_LANDING_D = ((void*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_d", SRC_CS)));
     PY_TRUFFLE_LANDING_PTR = ((void*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_ptr", SRC_CS)));
     PY_TRUFFLE_CEXT_LANDING = ((PyObject*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall", SRC_CS)));
-    PY_TRUFFLE_CEXT_LANDING_L = ((void* (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_l", SRC_CS)));
-    PY_TRUFFLE_CEXT_LANDING_D = ((double (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_d", SRC_CS)));
-    PY_TRUFFLE_CEXT_LANDING_PTR = ((void* (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_ptr", SRC_CS)));
+    PY_TRUFFLE_CEXT_LANDING_L = ((void*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_l", SRC_CS)));
+    PY_TRUFFLE_CEXT_LANDING_D = ((void*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_d", SRC_CS)));
+    PY_TRUFFLE_CEXT_LANDING_PTR = ((void*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_ptr", SRC_CS)));
 
     Py_NoValue = UPCALL_CEXT_O(polyglot_from_string("Py_NoValue", SRC_CS));
 }

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

@@ -110,11 +110,11 @@ double polyglot_ensure_double(void *obj) {
 /* upcall functions for calling into Python */
 extern PyObject*(*PY_TRUFFLE_LANDING)(void *rcv, void* name, ...);
 extern void*(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
-extern double(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
+extern void*(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
 extern void*(*PY_TRUFFLE_LANDING_PTR)(void *rcv, void* name, ...);
 extern PyObject*(*PY_TRUFFLE_CEXT_LANDING)(void* name, ...);
 extern void* (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
-extern double (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
+extern void* (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
 extern void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 
 /* Call function with return type 'PyObject *'; does polyglot cast and error handling */
@@ -139,7 +139,7 @@ extern void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 #define UPCALL_CEXT_O(__name__, ...) PY_TRUFFLE_CEXT_LANDING(__name__, ##__VA_ARGS__)
 
 /* Call void function of 'python_cext' module; no polyglot cast and no error handling */
-#define UPCALL_CEXT_VOID(__name__, ...) (PY_TRUFFLE_CEXT_LANDING(__name__, ##__VA_ARGS__))
+#define UPCALL_CEXT_VOID(__name__, ...) ((void)PY_TRUFFLE_CEXT_LANDING(__name__, ##__VA_ARGS__))
 
 /* Call function of 'python_cext' module with return type 'PyObject*'; no polyglot cast but error handling */
 #define UPCALL_CEXT_NOCAST(__name__, ...) PY_TRUFFLE_CEXT_LANDING(__name__, ##__VA_ARGS__)
@@ -331,6 +331,7 @@ extern PyObject* wrapped_null;
 
 /* STR */
 __attribute__((always_inline)) PyObject* PyTruffle_Unicode_FromFormat(const char *fmt, va_list va, void **args, int argc);
+__attribute__((always_inline)) PyObject* PyTruffle_Tuple_Pack(int dummy, va_list va, void **args, int argc);
 
 /* BYTES, BYTEARRAY */
 int bytes_buffer_getbuffer(PyBytesObject *self, Py_buffer *view, int flags);
@@ -361,7 +362,7 @@ int bufferdecorator_getbuffer(PyBufferDecorator *self, Py_buffer *view, int flag
     for (int i = off; i < __poly_argc; i++) {                           \
         __poly_args[i - off] = polyglot_get_arg(i);                     \
     }                                                                   \
-    result = function(__VA_ARGS__, __va_list, __poly_args, 0)
+    result = function(__VA_ARGS__, __va_list, __poly_args, __poly_argc)
 #else
 /*
  * (tfel): Just skip the optimization with using a managed malloc and use

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -57,6 +57,11 @@ void* PyCapsule_GetContext(PyObject *o) {
     return result;
 }
 
+UPCALL_ID(PyCapsule_SetContext);
+int PyCapsule_SetContext(PyObject *o, void *context) {
+    return UPCALL_CEXT_I(_jls_PyCapsule_SetContext, native_to_java(o), (uint64_t)context);
+}
+
 UPCALL_ID(PyCapsule_GetPointer);
 void* PyCapsule_GetPointer(PyObject *o, const char *name) {
     void* result = UPCALL_CEXT_PTR(_jls_PyCapsule_GetPointer, native_to_java(o), name ? polyglot_from_string(name, SRC_CS) : native_to_java(Py_None));
@@ -77,3 +82,10 @@ UPCALL_ID(PyCapsule_IsValid);
 int PyCapsule_IsValid(PyObject *o, const char *name) {
     return o != NULL && UPCALL_CEXT_I(_jls_PyCapsule_IsValid, native_to_java(o), name ? polyglot_from_string(name, SRC_CS) : native_to_java(Py_None));
 }
+
+UPCALL_ID(PyCapsule_GetName);
+const char * PyCapsule_GetName(PyObject *o) {
+	return as_char_pointer(UPCALL_CEXT_O(_jls_PyCapsule_GetName, native_to_java(o)));
+}
+
+

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

@@ -65,6 +65,11 @@ PyThreadState* PyEval_SaveThread() {
 void PyEval_RestoreThread(PyThreadState *ptr) {
 }
 
+UPCALL_ID(PyEval_GetBuiltins);
+PyObject* PyEval_GetBuiltins() {
+	return UPCALL_CEXT_O(_jls_PyEval_GetBuiltins);
+}
+
 UPCALL_ID(PyThread_allocate_lock);
 void* PyThread_allocate_lock() {
     return UPCALL_CEXT_O(_jls_PyThread_allocate_lock);

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

@@ -224,3 +224,22 @@ _Py_c_abs(Py_complex z)
         errno = 0;
     return result;
 }
+
+UPCALL_ID(PyComplex_RealAsDouble);
+double PyComplex_RealAsDouble(PyObject *op) {
+	return UPCALL_CEXT_D(_jls_PyComplex_RealAsDouble, native_to_java(op));
+}
+
+UPCALL_ID(PyComplex_ImagAsDouble);
+double PyComplex_ImagAsDouble(PyObject *op) {
+	return UPCALL_CEXT_D(_jls_PyComplex_ImagAsDouble, native_to_java(op));
+}
+
+UPCALL_ID(PyComplex_FromDoubles);
+PyObject * PyComplex_FromDoubles(double real, double imag) {
+	return UPCALL_CEXT_O(_jls_PyComplex_FromDoubles, real, imag);
+}
+
+PyObject * PyComplex_FromCComplex(Py_complex cval) {
+	return UPCALL_CEXT_O(_jls_PyComplex_FromDoubles, cval.real, cval.imag);
+}

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

@@ -192,3 +192,8 @@ PyObject** _PyObject_GetDictPtr(PyObject* obj) {
 void PyDict_Clear(PyObject *obj) {
 	(void) UPCALL_O(to_java(obj), polyglot_from_string("clear", SRC_CS));
 }
+
+UPCALL_ID(PyDict_Merge);
+int PyDict_Merge(PyObject *a, PyObject *b, int override) {
+    return UPCALL_CEXT_I(_jls_PyDict_Merge, native_to_java(a), native_to_java(b), override);
+}

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

@@ -139,3 +139,18 @@ int PyException_SetTraceback(PyObject *self, PyObject *tb) {
         return 0;
     }
 }
+
+UPCALL_ID(PyException_SetCause);
+void PyException_SetCause(PyObject *self, PyObject *cause) {
+	UPCALL_CEXT_VOID(_jls_PyException_SetCause, native_to_java(self), native_to_java(cause));
+}
+
+UPCALL_ID(PyException_GetContext);
+PyObject * PyException_GetContext(PyObject *self) {
+    return UPCALL_CEXT_O(_jls_PyException_GetContext, native_to_java(self));
+}
+
+UPCALL_ID(PyException_SetContext);
+void PyException_SetContext(PyObject *self, PyObject *context) {
+    UPCALL_CEXT_VOID(_jls_PyException_SetContext, native_to_java(self), native_to_java(context));
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -94,3 +94,8 @@ UPCALL_ID(PyList_Sort);
 int PyList_Sort(PyObject *l) {
 	return UPCALL_CEXT_I(_jls_PyList_Sort, native_to_java(l));
 }
+
+UPCALL_ID(PyList_Insert);
+int PyList_Insert(PyObject *op, Py_ssize_t where, PyObject *newitem) {
+    return UPCALL_CEXT_I(_jls_PyList_Insert, native_to_java(op), where, native_to_java(newitem));
+}