Merge branch 'origin/master' into release/graal-vm/1.0

Author: ansalond

CHANGELOG.md

@@ -3,6 +3,16 @@
 This changelog summarizes major changes between GraalVM versions of the Python
 language runtime. The main focus is on user-observable behavior of the engine.
 
+## Version 1.0.0 RC3
+
+* Support for more String encodings
+* Implement buffered I/O
+* Remove our random module substitute and use the standard library implementation
+* Fix a potential thread-safety problem with cached parse trees when multiple Python contexts are used from multiple threads
+* Complete support for math module builtins
+* C-API improvements to run simple scikit-learn and NumPy examples
+* Support the buffer protocol to wrap arbitrary Python sequences with no copy into NumPy arrays
+
 ## Version 1.0.0 RC2
 
 * Updates to the polyglot and embedding APIs

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "2081dc054251c6658f7ce8f4b6671a474edbf2f6",
+  overlay: "03b824f947adf9a67c80c3e8a27646d43a687bfb",
 
   // ======================================================================================================
   // 
@@ -124,8 +124,8 @@
 
   local labsjdk8Mixin = {
     downloads +: {
-      JAVA_HOME: utils.download("labsjdk", "8u161-jvmci-0.42"),
-      EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "9.0.4+11")] },
+      JAVA_HOME: utils.download("labsjdk", "8u172-jvmci-0.46"),
+      EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "11+20")] },
     },
     environment +: {
       CI: "true",

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/Makefile

@@ -55,8 +55,8 @@ default: ${TARGET_LIB} ${MODULE_TARGETS} ${HEADER_TARGETS}
 
 CFLAGS=${LLVM_TARGET_FLAGS} -ggdb -emit-llvm
 OPT_FLAGS=-mem2reg -globalopt -simplifycfg -constprop -always-inline -instcombine -dse -loop-simplify -reassociate -licm -gvn
-WARNINGS=-Wno-int-to-pointer-cast -Wno-int-conversion -Wno-incompatible-pointer-types-discards-qualifiers
-INCLUDES=-I${VPATH}/include
+WARNINGS=-Wno-int-to-pointer-cast -Wno-int-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-pointer-type-mismatch
+INCLUDES=-I${POLYGLOT_INC} -I${VPATH}/include
 
 
 rebuild:

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

@@ -46,6 +46,7 @@
 #define HAVE_SYS_WAIT_H
 
 #define PYPY_VERSION 0
+#define PYPY_VERSION_NUM 0
 
 #include <truffle.h>
 #include <polyglot.h>
@@ -61,6 +62,7 @@
 #include <langinfo.h>
 #include <assert.h>
 #include <unistd.h>
+#include <math.h>
 
 #include "pyport.h"
 #include "pymacro.h"
@@ -71,6 +73,7 @@
 #include "unicodeobject.h"
 #include "pystate.h"
 #include "pyarena.h"
+#include "compile.h"
 #include "pythonrun.h"
 #include "ceval.h"
 #include "pyerrors.h"
@@ -106,6 +109,12 @@
 #include "code.h"
 #include "pyfpe.h"
 #include "memoryobject.h"
+#include "pystrhex.h"
+#include "codecs.h"
+#include "frameobject.h"
+#include "traceback.h"
+#include "classobject.h"
+#include "pythread.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 */