[GR-12617] Small fixes to get Numpy to build from git

timfel · timfel · commit c549329c4c9c · 2018-12-07T02:05:19.000-08:00
PullRequest: graalpython/321
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/__init__.py b/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/__init__.py
@@ -0,0 +1,40 @@
+# Copyright (c) 2018, 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
+#
+# 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.
+
+from . import context
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/context.py b/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/context.py
@@ -0,0 +1,40 @@
+# Copyright (c) 2018, 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
+#
+# 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.
+
+from . import reduction
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/reduction.py b/graalpython/com.oracle.graal.python.test/src/tests/package/recpkg/reduction.py
@@ -0,0 +1,40 @@
+# Copyright (c) 2018, 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
+#
+# 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.
+
+from . import context
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_imports.py b/graalpython/com.oracle.graal.python.test/src/tests/test_imports.py
@@ -121,3 +121,9 @@ def func(x):
     old_name = code.co_filename
     _imp._fix_co_filename(code, old_name + '_more_path')
     assert code.co_filename == old_name + '_more_path'
+
+
+def test_recursive_import_from():
+    if sys.version_info.minor >= 6:
+        import package.recpkg
+        assert package.recpkg.context is package.recpkg.reduction.context
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -246,7 +246,7 @@ public abstract static class ChdirNode extends PythonBuiltinNode {
         PNone chdir(String spath) {
             Env env = getContext().getEnv();
             try {
-                TruffleFile dir = env.getTruffleFile(spath);
+                TruffleFile dir = env.getTruffleFile(spath).getAbsoluteFile();
                 env.setCurrentWorkingDirectory(dir);
                 return PNone.NONE;
             } catch (UnsupportedOperationException | IllegalArgumentException | SecurityException e) {
@@ -1531,4 +1531,13 @@ protected String doGeneric(Object x) {
             return recursive.execute(strNode.executeWith(PythonBuiltinClassType.PString, x, PNone.NO_VALUE, PNone.NO_VALUE));
         }
     }
+
+    @Builtin(name = "cpu_count", fixedNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class CpuCountNode extends PythonBuiltinNode {
+        @Specialization
+        int getCpuCount() {
+            return Runtime.getRuntime().availableProcessors();
+        }
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java
@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.ProcessBuilder.Redirect;
 import java.nio.ByteBuffer;
@@ -48,22 +49,29 @@
 import java.nio.channels.WritableByteChannel;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
+import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.str.PString;
-import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
+import com.oracle.graal.python.nodes.expression.CastToListNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.nodes.util.CastToIndexNode;
+import com.oracle.graal.python.nodes.util.CastToStringNode;
 import com.oracle.graal.python.runtime.PosixResources;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleOptions;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -80,14 +88,15 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
                     "errpipe_read", "errpipe_write", "restore_signals", "call_setsid", "preexec_fn"})
     @GenerateNodeFactory
     abstract static class ForkExecNode extends PythonBuiltinNode {
-        @SuppressWarnings("unused")
-        @TruffleBoundary
+        @Child BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
+
         @Specialization
-        synchronized int forkExec(PList args, PTuple executable_list, boolean close_fds,
-                        PTuple fdsToKeep, PNone cwd, PNone env,
+        @TruffleBoundary
+        synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList, @SuppressWarnings("unused") boolean closeFds,
+                        @SuppressWarnings("unused") PList fdsToKeep, String cwd, PList env,
                         int p2cread, int p2cwrite, int c2pread, int c2pwrite,
-                        int errread, int errwrite, int errpipe_read, int errpipe_write,
-                        boolean restore_signals, boolean call_setsid, PNone preexec_fn) {
+                        int errread, int errwrite, @SuppressWarnings("unused") int errpipe_read, int errpipe_write,
+                        @SuppressWarnings("unused") boolean restore_signals, @SuppressWarnings("unused") boolean call_setsid, @SuppressWarnings("unused") PNone preexec_fn) {
             PythonContext context = getContext();
             PosixResources resources = context.getResources();
             if (!context.isExecutableAccessAllowed()) {
@@ -119,10 +128,6 @@ synchronized int forkExec(PList args, PTuple executable_list, boolean close_fds,
                 }
             }
 
-            Channel stdin = null;
-            Channel stdout = null;
-            Channel stderr = null;
-
             ProcessBuilder pb = new ProcessBuilder(argStrings);
             if (p2cread != -1 && p2cwrite != -1) {
                 pb.redirectInput(Redirect.PIPE);
@@ -142,6 +147,26 @@ synchronized int forkExec(PList args, PTuple executable_list, boolean close_fds,
                 pb.redirectError(Redirect.INHERIT);
             }
 
+            try {
+                if (getContext().getEnv().getTruffleFile(cwd).exists()) {
+                    pb.directory(new File(cwd));
+                } else {
+                    throw raise(PythonBuiltinClassType.OSError, "working directory %s is not accessible", cwd);
+                }
+            } catch (SecurityException e) {
+                throw raise(PythonBuiltinClassType.OSError, e.getMessage());
+            }
+
+            Map<String, String> environment = pb.environment();
+            for (Object keyValue : env.getSequenceStorage().getInternalArray()) {
+                if (keyValue instanceof PBytes) {
+                    String[] string = new String(toBytes.execute(keyValue)).split("=", 2);
+                    if (string.length == 2) {
+                        environment.put(string[0], string[1]);
+                    }
+                }
+            }
+
             try {
                 Process process = pb.start();
                 if (p2cwrite != -1) {
@@ -177,5 +202,49 @@ synchronized int forkExec(PList args, PTuple executable_list, boolean close_fds,
                 return -1;
             }
         }
+
+        @Specialization(replaces = "forkExec")
+        int forkExecDefault(Object args, Object executable_list, Object close_fds,
+                        Object fdsToKeep, Object cwd, Object env,
+                        Object p2cread, Object p2cwrite, Object c2pread, Object c2pwrite,
+                        Object errread, Object errwrite, Object errpipe_read, Object errpipe_write,
+                        Object restore_signals, Object call_setsid, PNone preexec_fn,
+                        @Cached("create()") CastToListNode castArgs,
+                        @Cached("create()") CastToListNode castExecList,
+                        @Cached("createIfTrueNode()") CastToBooleanNode castCloseFds,
+                        @Cached("create()") CastToListNode castFdsToKeep,
+                        @Cached("create()") CastToStringNode castCwd,
+                        @Cached("create()") CastToListNode castEnv,
+                        @Cached("create()") CastToIndexNode castP2cread,
+                        @Cached("create()") CastToIndexNode castP2cwrite,
+                        @Cached("create()") CastToIndexNode castC2pread,
+                        @Cached("create()") CastToIndexNode castC2pwrite,
+                        @Cached("create()") CastToIndexNode castErrread,
+                        @Cached("create()") CastToIndexNode castErrwrite,
+                        @Cached("create()") CastToIndexNode castErrpipeRead,
+                        @Cached("create()") CastToIndexNode castErrpipeWrite,
+                        @Cached("createIfTrueNode()") CastToBooleanNode castRestoreSignals,
+                        @Cached("createIfTrueNode()") CastToBooleanNode castSetsid) {
+
+            String actualCwd;
+            if (cwd instanceof PNone) {
+                actualCwd = getContext().getEnv().getCurrentWorkingDirectory().getPath();
+            } else {
+                actualCwd = castCwd.execute(cwd);
+            }
+
+            PList actualEnv;
+            if (env instanceof PNone) {
+                actualEnv = factory().createList();
+            } else {
+                actualEnv = castEnv.executeWith(env);
+            }
+
+            return forkExec(castArgs.executeWith(args), castExecList.executeWith(executable_list), castCloseFds.executeWith(close_fds),
+                            castFdsToKeep.executeWith(fdsToKeep), actualCwd, actualEnv,
+                            castP2cread.execute(p2cread), castP2cwrite.execute(p2cwrite), castC2pread.execute(c2pread), castC2pwrite.execute(c2pwrite),
+                            castErrread.execute(errread), castErrwrite.execute(errwrite), castErrpipeRead.execute(errpipe_read), castErrpipeWrite.execute(errpipe_write),
+                            castRestoreSignals.executeWith(restore_signals), castSetsid.executeWith(call_setsid), preexec_fn);
+        }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -1064,7 +1064,7 @@ void setSlice(SequenceStorage store, SliceInfo sinfo, SequenceStorage sequence,
 
         @Specialization(guards = "!compatibleAssign(self, sequence)")
         void doError(@SuppressWarnings("unused") SequenceStorage self, @SuppressWarnings("unused") SliceInfo info, SequenceStorage sequence) {
-            throw new SequenceStoreException(sequence);
+            throw new SequenceStoreException(sequence.getIndicativeValue());
         }
 
         protected static boolean isValidReplacement(Class<? extends SequenceStorage> cachedClass, SequenceStorage s, SliceInfo info) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java
@@ -25,13 +25,20 @@
  */
 package com.oracle.graal.python.nodes.statement;
 
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ImportError;
 
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.frame.WriteNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.subscript.GetItemNode;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
@@ -40,7 +47,11 @@ public class ImportFromNode extends AbstractImportNode {
     private final int level;
     private final String[] fromlist;
     @Children private final WriteNode[] aslist;
+    @Child private GetAttributeNode getName;
+    @Child private GetItemNode getItem;
+    @Child private ReadAttributeFromObjectNode readModules;
     @Child private LookupAndCallBinaryNode readNode = LookupAndCallBinaryNode.create(__GETATTRIBUTE__);
+    private final IsBuiltinClassProfile attrErrorProfile = IsBuiltinClassProfile.create();
 
     public static ImportFromNode create(String importee, String[] fromlist, WriteNode[] readNodes, int level) {
         return new ImportFromNode(importee, fromlist, readNodes, level);
@@ -68,7 +79,32 @@ public void executeVoid(VirtualFrame frame) {
             try {
                 writeNode.doWrite(frame, readNode.executeObject(importedModule, attr));
             } catch (PException e) {
-                throw raise(ImportError, "cannot import name '%s'", attr);
+                e.expectAttributeError(attrErrorProfile);
+                if (getName == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    getName = insert(GetAttributeNode.create(__NAME__, null));
+                }
+                try {
+                    String pkgname;
+                    Object pkgname_o = getName.executeObject(importedModule);
+                    if (pkgname_o instanceof PString) {
+                        pkgname = ((PString) pkgname_o).getValue();
+                    } else if (pkgname_o instanceof String) {
+                        pkgname = (String) pkgname_o;
+                    } else {
+                        throw e;
+                    }
+                    String fullname = pkgname + "." + attr;
+                    if (getItem == null) {
+                        CompilerDirectives.transferToInterpreterAndInvalidate();
+                        getItem = insert(GetItemNode.create());
+                        readModules = insert(ReadAttributeFromObjectNode.create());
+                    }
+                    Object sysModules = readModules.execute(getCore().lookupBuiltinModule("sys"), "modules");
+                    writeNode.doWrite(frame, getItem.execute(sysModules, fullname));
+                } catch (PException e2) {
+                    throw raise(ImportError, "cannot import name '%s'", attr);
+                }
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CastToStringNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CastToStringNode.java

Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ void setSlice(SequenceStorage store, SliceInfo sinfo, SequenceStorage sequence,`
`1064`	`1064`
`1065`	`1065`	`@Specialization(guards = "!compatibleAssign(self, sequence)")`
`1066`	`1066`	`void doError(@SuppressWarnings("unused") SequenceStorage self, @SuppressWarnings("unused") SliceInfo info, SequenceStorage sequence) {`
`1067`		`- throw new SequenceStoreException(sequence);`
	`1067`	`+ throw new SequenceStoreException(sequence.getIndicativeValue());`
`1068`	`1068`	`}`
`1069`	`1069`
`1070`	`1070`	`protected static boolean isValidReplacement(Class<? extends SequenceStorage> cachedClass, SequenceStorage s, SliceInfo info) {`