[GR-50133] Make numpy install and some basic examples work on Windows

PullRequest: graalpython/3062

Author: timfel

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

@@ -96,7 +96,6 @@
 #define __SIZEOF_SHORT__ 2
 #define __SIZEOF_LONG__ 4
 #define __SIZEOF_LONG_LONG__ 8
-#define __SIZEOF_INT128__ 16
 #define __SIZEOF_FLOAT__ 4
 #define __SIZEOF_DOUBLE__ 8
 #define __SIZEOF_LONG_DOUBLE__ 8

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

@@ -221,7 +221,7 @@ Py_ssize_t PyNumber_AsSsize_t(PyObject *item, PyObject *err) {
 
 // downcall for native python objects
 // taken from CPython "Objects/abstract.c PySequence_Check()"
-int PyTruffle_PySequence_Check(PyObject *s) {
+PyAPI_FUNC(int) PyTruffle_PySequence_Check(PyObject *s) {
     if (PyDict_Check(s))
         return 0;
     PySequenceMethods* seq = Py_TYPE(s)->tp_as_sequence;
@@ -230,7 +230,7 @@ int PyTruffle_PySequence_Check(PyObject *s) {
 
 // downcall for native python objects
 // partially taken from CPython "Objects/abstract.c/PySequence_GetItem"
-PyObject* PyTruffle_PySequence_GetItem(PyObject *s, Py_ssize_t i)
+PyAPI_FUNC(PyObject*) PyTruffle_PySequence_GetItem(PyObject *s, Py_ssize_t i)
 {
     PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
     if (m && m->sq_item) {
@@ -255,7 +255,7 @@ PyObject* PyTruffle_PySequence_GetItem(PyObject *s, Py_ssize_t i)
 
 // downcall for native python objects
 // taken from CPython "Objects/abstract.c/Py_Sequence_Size"
-Py_ssize_t PyTruffle_PySequence_Size(PyObject *s) {
+PyAPI_FUNC(Py_ssize_t) PyTruffle_PySequence_Size(PyObject *s) {
     PySequenceMethods *seq;
     PyMappingMethods *m;
 
@@ -300,7 +300,7 @@ PyObject * PyMapping_GetItemString(PyObject *o, const char *key) {
 
 // downcall for native python objects
 // taken from CPython "Objects/abstract.c/PyObject_Size"
-Py_ssize_t PyTruffle_PyObject_Size(PyObject *o) {
+PyAPI_FUNC(Py_ssize_t) PyTruffle_PyObject_Size(PyObject *o) {
     PySequenceMethods *m;
 
     if (o == NULL) {
@@ -320,7 +320,7 @@ Py_ssize_t PyTruffle_PyObject_Size(PyObject *o) {
 
 // downcall for native python objects
 // taken from CPython "Objects/abstract.c PyMapping_Check"
-int PyTruffle_PyMapping_Check(PyObject *o) {
+PyAPI_FUNC(int) PyTruffle_PyMapping_Check(PyObject *o) {
     return o && Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_subscript;
 }
 
@@ -475,7 +475,7 @@ int PyBuffer_IsContiguous(const Py_buffer *view, char order) {
 
 // PyMapping_Size downcall for native python objects
 // partially taken from CPython "Objects/abstract.c/Py_Mapping_Size"
-Py_ssize_t PyTruffle_PyMapping_Size(PyObject *o) {
+PyAPI_FUNC(Py_ssize_t) PyTruffle_PyMapping_Size(PyObject *o) {
     PyMappingMethods *m;
 
     if (o == NULL) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -116,6 +116,7 @@
 import com.oracle.graal.python.builtins.modules.UnicodeDataModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.WeakRefModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.WinapiModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.WinregModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ast.AstBuiltins;
 import com.oracle.graal.python.builtins.modules.ast.AstModuleBuiltins;
@@ -510,6 +511,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
                         new PosixModuleBuiltins(),
                         new NtModuleBuiltins(),
                         new WinregModuleBuiltins(),
+                        new WinapiModuleBuiltins(),
                         new CryptModuleBuiltins(),
                         new ScandirIteratorBuiltins(),
                         new DirEntryBuiltins(),

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022, 2023, 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.
+ */
+package com.oracle.graal.python.builtins.modules;
+
+import java.util.List;
+
+import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.PythonOS;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.truffle.api.dsl.NodeFactory;
+
+@CoreFunctions(defineModule = "_winapi", os = PythonOS.PLATFORM_WIN32)
+public final class WinapiModuleBuiltins extends PythonBuiltins {
+    @Override
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return List.of();
+    }
+}

graalpython/lib-graalpython/patches/numpy/numpy-1.23.5.patch

@@ -566,11 +566,11 @@ index f959162..2ef579b 100644
          return multiiter_wrong_number_of_args();
      }
 -    ret = multiiter_new_impl(n, PySequence_Fast_ITEMS(fast_seq));
-+    PyObject* seq[n];
++    PyObject** seq = (PyObject **)malloc(n, sizeof(PyObject *));
 +    for (int i = 0; i < n; i++) {
 +    	seq[i] = PySequence_Fast_GET_ITEM(fast_seq, i);
 +    }
-+    ret = multiiter_new_impl(n, seq);
++    ret = multiiter_new_impl(n, seq); free(seq);
      Py_DECREF(fast_seq);
      return ret;
  }

graalpython/lib-graalpython/patches/pip/pip-22.2.2.patch

@@ -95,7 +95,7 @@ new file mode 100644
 index 0000000..b8a506c
 --- /dev/null
 +++ b/pip/_internal/utils/graalpy.py
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,195 @@
 +# ATTENTION: GraalPy uses existence of this module to verify that it is
 +# running a patched pip in pip_hook.py
 +import os
@@ -243,8 +243,9 @@ index 0000000..b8a506c
 +    if rule:
 +        if patch := rule.get('patch'):
 +            print(f"Patching package {name} using {patch}")
++            exe = '.exe' if os.name == 'nt' else ''
 +            try:
-+                subprocess.run(["patch", "-f", "-d", location, "-p1", "-i", str(patch)], check=True)
++                subprocess.run([f"patch{exe}", "-f", "-d", location, "-p1", "-i", str(patch)], check=True)
 +            except FileNotFoundError:
 +                print(
 +                    "WARNING: GraalPy needs the 'patch' utility to apply compatibility patches. Please install it using your system's package manager.")

graalpython/lib-graalpython/patches/pip/pip-23.0.1.patch

@@ -95,7 +95,7 @@ new file mode 100644
 index 0000000..b8a506c
 --- /dev/null
 +++ b/pip/_internal/utils/graalpy.py
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,195 @@
 +# ATTENTION: GraalPy uses existence of this module to verify that it is
 +# running a patched pip in pip_hook.py
 +import os
@@ -243,8 +243,9 @@ index 0000000..b8a506c
 +    if rule:
 +        if patch := rule.get('patch'):
 +            print(f"Patching package {name} using {patch}")
++            exe = '.exe' if os.name == 'nt' else ''
 +            try:
-+                subprocess.run(["patch", "-f", "-d", location, "-p1", "-i", str(patch)], check=True)
++                subprocess.run([f"patch{exe}", "-f", "-d", location, "-p1", "-i", str(patch)], check=True)
 +            except FileNotFoundError:
 +                print(
 +                    "WARNING: GraalPy needs the 'patch' utility to apply compatibility patches. Please install it using your system's package manager.")

graalpython/lib-python/3/distutils/msvc9compiler.py

@@ -173,7 +173,7 @@ def get_build_version():
     prefix = "MSC v."
     i = sys.version.find(prefix)
     if i == -1:
-        return 6
+        return 14 # Truffle change to 14
     i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
     majorVersion = int(s[:-2]) - 6

graalpython/lib-python/3/distutils/msvccompiler.py

@@ -153,7 +153,7 @@ def get_build_version():
     prefix = "MSC v."
     i = sys.version.find(prefix)
     if i == -1:
-        return 6
+        return 14 # Truffle change to 14
     i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
     majorVersion = int(s[:-2]) - 6

graalpython/lib-python/3/encodings/__init__.py

@@ -159,6 +159,7 @@ def search_function(encoding):
     def _alias_mbcs(encoding):
         try:
             import _winapi
+            return None # Truffle change: we don't support this method yet
             ansi_code_page = "cp%s" % _winapi.GetACP()
             if encoding == ansi_code_page:
                 import encodings.mbcs