[GR-36700] Python language library.

PullRequest: graalpython/2263

Author: tomasstupka

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "2a6018d949661319d714f343bc2b7f0f972b4a26" }
+{ "overlay": "bbd123566faf600786d8ea6dc6a16639f9f97bce" }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -331,6 +331,15 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
             }
         }
 
+        if (!ImageInfo.inImageCode()) {
+            for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
+                if (arg.equals("-ea")) {
+                    addRelaunchArg("--vm.ea");
+                    break;
+                }
+            }
+        }
+
         // According to CPython if no arguments are given, they contain an empty string.
         if (programArgs.isEmpty()) {
             programArgs.add("");

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/ProfileTests.java

@@ -41,9 +41,9 @@
 package com.oracle.graal.python.test.runtime;
 
 import org.junit.Before;
-import org.junit.Test;
 
 import com.oracle.graal.python.test.PythonTests;
+import org.junit.Ignore;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -57,7 +57,7 @@ public void ensureBytecode() {
         PythonTests.skipOnLegacyASTInterpreter();
     }
 
-    @Test
+    @Ignore("due to GR-40923")
     public void profileYield() {
         String source = "import sys\n" +
                         "def f(frame, event, arg): print(frame, event, arg)\n" +
@@ -72,7 +72,7 @@ public void profileYield() {
                         "<module>> return None\n", source);
     }
 
-    @Test
+    @Ignore("due to GR-40923")
     public void profileException() {
         String source = "import sys\n" +
                         "def f(frame, event, arg): print(frame, event, arg)\n" +

graalpython/com.oracle.graal.python.test/src/tests/test_subprocess.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -126,3 +126,13 @@ def test_kill(self):
         finally:
             p.kill()
             p.wait()
+
+    def test_java_asserts(self):
+        import sys
+        if sys.implementation.name == "graalpy":
+            import subprocess, __graalpython__
+            if __graalpython__.java_assert():
+                result = subprocess.run([sys.executable, "-c", "import __graalpython__; __graalpython__.java_assert()"])
+            else:
+                result = subprocess.run([sys.executable, "-c", "import __graalpython__; not __graalpython__.java_assert()"])
+            assert result.returncode == 0

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

@@ -712,4 +712,15 @@ TruffleString doit(VirtualFrame frame,
             return fromJavaStringNode.execute(tempFile.getPath(), TS_ENCODING);
         }
     }
+
+    @Builtin(name = "java_assert", minNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class JavaAssertNode extends PythonBuiltinNode {
+        @Specialization
+        Object doit() {
+            boolean assertOn = false;
+            assert assertOn = true;
+            return assertOn;
+        }
+    }
 }

mx.graalpython/graalpython-launcher

@@ -1,4 +1,4 @@
 DISABLE_INSTALLABLES=true
 DYNAMIC_IMPORTS=/vm,/substratevm
-NATIVE_IMAGES=graalpy
+NATIVE_IMAGES=lib:pythonvm
 NO_LICENSES=true

mx.graalpython/graalpython-managed-launcher

@@ -1,4 +1,4 @@
 DISABLE_INSTALLABLES=true
 DYNAMIC_IMPORTS=/substratevm,/graalpython-enterprise
-NATIVE_IMAGES=graalpy
+NATIVE_IMAGES=lib:pythonvm
 NO_LICENSES=true

mx.graalpython/mx_graalpython.py

@@ -311,7 +311,7 @@ def run_cpython_test(args):
     env = os.environ.copy()
     delete_bad_env_keys(env)
     with _dev_pythonhome_context():
-        mx.run([python_gvm_with_assertions()] + interp_args + [
+        mx.run([python_gvm()] + ['--vm.ea'] + interp_args + [
             os.path.join(SUITE.dir, "graalpython/com.oracle.graal.python.test/src/tests/run_cpython_test.py"),
         ] + test_args + testfiles, env=env)
 
@@ -342,7 +342,9 @@ def retag_unittests(args):
         'graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py',
         '--retag'
     ]
-    vm = python_svm() if not parsed_args.jvm else python_gvm_with_assertions()
+    vm = python_svm() if not parsed_args.jvm else python_gvm()
+    if parsed_args.jvm:
+        args += ['-ea']
     mx.run([vm] + args + remaining_args, env=env)
     if parsed_args.upload_results_to:
         with tempfile.TemporaryDirectory(prefix='graalpython-retagger-') as d:
@@ -590,18 +592,6 @@ def python_enterprise_gvm(_=None):
     mx.log(launcher)
     return launcher
 
-def python_gvm_with_assertions():
-    launcher = python_gvm()
-    patch_batch_launcher(launcher, '-ea')
-    return launcher
-
-
-def python_managed_gvm_with_assertions():
-    launcher = python_managed_gvm()
-    patch_batch_launcher(launcher, '-ea')
-    return launcher
-
-
 def python_svm(_=None):
     home = _graalvm_home(envfile="graalpython-launcher")
     launcher = _join_bin(home, "graalpy")
@@ -695,7 +685,7 @@ def is_included(path):
 
 
 def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=False, exclude=None, env=None,
-                         use_pytest=False, cwd=None, lock=None, out=None, err=None, nonZeroIsFatal=True):
+                         use_pytest=False, cwd=None, lock=None, out=None, err=None, nonZeroIsFatal=True, javaAsserts=False):
     if lock:
         lock.acquire()
     # ensure that the test distribution is up-to-date
@@ -759,6 +749,9 @@ def graalvm_vm_arg(java_arg):
                 mx.run([python_binary, "--jvm", agent_args] + args + [testfile],
                        nonZeroIsFatal=nonZeroIsFatal, env=env, cwd=cwd, out=out, err=err)
     else:
+        if javaAsserts:
+            args += ['-ea']
+
         args += testfiles
         mx.logv(" ".join([python_binary] + args))
         if lock:
@@ -838,7 +831,7 @@ def run(self):
             mx.abort("At least one HPy testing thread failed.")
 
 
-def run_tagged_unittests(python_binary, env=None, cwd=None):
+def run_tagged_unittests(python_binary, env=None, cwd=None, javaAsserts=False):
     if env is None:
         env = os.environ
     sub_env = env.copy()
@@ -852,7 +845,8 @@ def run_tagged_unittests(python_binary, env=None, cwd=None):
         args=["-v"],
         paths=["test_tagged_unittests.py"],
         env=sub_env,
-        cwd=cwd
+        cwd=cwd,
+        javaAsserts=javaAsserts
     )
 
 
@@ -877,19 +871,19 @@ def graalpython_gate_runner(args, tasks):
                 test_args = [exe, _graalpytest_driver(), "-v", _graalpytest_root()]
                 mx.run(test_args, nonZeroIsFatal=True, env=env)
             mx.run(["env"])
-            run_python_unittests(python_gvm_with_assertions())
+            run_python_unittests(python_gvm(), javaAsserts=True)
 
     with Task('GraalPython sandboxed tests', tasks, tags=[GraalPythonTags.unittest_sandboxed]) as task:
         if task:
-            run_python_unittests(python_managed_gvm_with_assertions())
+            run_python_unittests(python_managed_gvm(), javaAsserts=True)
 
     with Task('GraalPython multi-context unittests', tasks, tags=[GraalPythonTags.unittest_multi]) as task:
         if task:
-            run_python_unittests(python_gvm_with_assertions(), args=["-multi-context"])
+            run_python_unittests(python_gvm(), args=["-multi-context"], javaAsserts=True)
 
     with Task('GraalPython Jython emulation tests', tasks, tags=[GraalPythonTags.unittest_jython]) as task:
         if task:
-            run_python_unittests(python_gvm_with_assertions(), args=["--python.EmulateJython"], paths=["test_interop.py"])
+            run_python_unittests(python_gvm(), args=["--python.EmulateJython"], paths=["test_interop.py"], javaAsserts=True)
 
     with Task('GraalPython HPy tests', tasks, tags=[GraalPythonTags.unittest_hpy]) as task:
         if task:
@@ -901,8 +895,8 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython posix module tests', tasks, tags=[GraalPythonTags.unittest_posix]) as task:
         if task:
-            run_python_unittests(python_gvm_with_assertions(), args=["--PosixModuleBackend=native"], paths=["test_posix.py", "test_mmap.py"])
-            run_python_unittests(python_gvm_with_assertions(), args=["--PosixModuleBackend=java"], paths=["test_posix.py", "test_mmap.py"])
+            run_python_unittests(python_gvm(), args=["--PosixModuleBackend=native"], paths=["test_posix.py", "test_mmap.py"], javaAsserts=True)
+            run_python_unittests(python_gvm(), args=["--PosixModuleBackend=java"], paths=["test_posix.py", "test_mmap.py"], javaAsserts=True)
 
     with Task('GraalPython Python tests', tasks, tags=[GraalPythonTags.tagged]) as task:
         if task:
@@ -1652,10 +1646,9 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
         'graalpython:GRAALPYTHON_GRAALVM_SUPPORT',
         'graalpython:GRAALPYTHON_GRAALVM_DOCS',
     ],
-    launcher_configs=[
-        mx_sdk.LanguageLauncherConfig(
-            destination='bin/<exe:graalpy>',
-            links=['bin/python', 'bin/python3'],
+    library_configs=[
+        mx_sdk.LanguageLibraryConfig(
+            launchers=['bin/<exe:graalpy>', 'bin/<exe:python>', 'bin/<exe:python3>'],
             jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
             main_class=GRAALPYTHON_MAIN_CLASS,
             build_args=[
@@ -1814,7 +1807,7 @@ def python_coverage(args):
             'coverage-upload',
         ])
     if args.truffle:
-        executable = python_gvm_with_assertions()
+        executable = python_gvm()
         variants = [
             {"args": []},
             {"args": ["--python.EmulateJython"], "paths": ["test_interop.py"]},
@@ -1844,9 +1837,9 @@ def python_coverage(args):
                 env['GRAAL_PYTHON_ARGS'] = " ".join(extra_args)
                 env['ENABLE_THREADED_GRAALPYTEST'] = "false"
                 if kwds.pop("tagged", False):
-                    run_tagged_unittests(executable, env=env)
+                    run_tagged_unittests(executable, env=env, javaAsserts=True)
                 else:
-                    run_python_unittests(executable, env=env, **kwds)
+                    run_python_unittests(executable, env=env, javaAsserts=True, **kwds)
 
         # generate a synthetic lcov file that includes all sources with 0
         # coverage. this is to ensure all sources actuall show up - otherwise,

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
+                "version": "9a0570863be7d236519bceda4b05ee3e00a6c384",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
+                "version": "9a0570863be7d236519bceda4b05ee3e00a6c384",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
+                "version": "9a0570863be7d236519bceda4b05ee3e00a6c384",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},