[GR-52628] Update torch to 2.2.1

PullRequest: graalpython/3244

Author: msimacek

docs/user/Python-Runtime.md

@@ -129,7 +129,7 @@ It has the following known issues:
   - _pip.exe_ cannot be used directly
   - `pip` has trouble with cache file loading, use `--no-cache-dir`
   - Only pure Python binary wheels can be installed, no native extensions or source builds
-  - To install a package, use `myvenv/Scripts/python.cmd -m pip --no-cache-dir install <pkg>`
+  - To install a package, use `myvenv/Scripts/python.exe -m pip --no-cache-dir install <pkg>`
 - Running from PowerShell works better than running from CMD, various scripts will fail on the latter
 
 ## Installing Packages

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

@@ -869,6 +869,7 @@ void initialize_hashes();
 void _PyFloat_InitState(PyInterpreterState* state);
 
 Py_LOCAL_SYMBOL TruffleContext* TRUFFLE_CONTEXT;
+Py_LOCAL_SYMBOL int graalpy_finalizing;
 
 PyAPI_FUNC(void) initialize_graal_capi(TruffleEnv* env, void* (*getBuiltin)(int id)) {
 	clock_t t = clock();
@@ -931,25 +932,22 @@ void nop_GraalPyTruffle_BulkNotifyRefCount(void* ptrs, int count) {
  * ATTENTION: the array is expected to be NULL-terminated !
  *
  */
-static int64_t reset_func_ptrs[] = {
-        &GraalPy_get_PyObject_ob_refcnt,
-        nop_GraalPy_get_PyObject_ob_refcnt,
-        &GraalPy_set_PyObject_ob_refcnt,
-        nop_GraalPy_set_PyObject_ob_refcnt,
-        &GraalPyTruffle_NotifyRefCount,
-        nop_GraalPyTruffle_NotifyRefCount,
-        &GraalPyTruffle_BulkNotifyRefCount,
-        nop_GraalPyTruffle_NotifyRefCount,
+static int64_t reset_ptrs[] = {
+        &graalpy_finalizing, 1,
+        &GraalPy_get_PyObject_ob_refcnt, nop_GraalPy_get_PyObject_ob_refcnt,
+        &GraalPy_set_PyObject_ob_refcnt, nop_GraalPy_set_PyObject_ob_refcnt,
+        &GraalPyTruffle_NotifyRefCount, nop_GraalPyTruffle_NotifyRefCount,
+        &GraalPyTruffle_BulkNotifyRefCount, nop_GraalPyTruffle_NotifyRefCount,
         /* sentinel (required) */
         NULL
 };
 
 /*
  * This function is called from Java during C API initialization to get the
- * pointer to array 'reset_func_pts'.
+ * pointer to array 'reset_pts'.
  */
 PyAPI_FUNC(int64_t *) GraalPy_get_finalize_capi_pointer_array() {
-    return reset_func_ptrs;
+    return reset_ptrs;
 }
 
 #if ((__linux__ && __GNU_LIBRARY__) || __APPLE__)

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

@@ -147,6 +147,8 @@ PyAPI_DATA(uint32_t) Py_Truffle_Options;
 extern THREAD_LOCAL Py_LOCAL_SYMBOL PyThreadState *tstate_current;
 #endif /* GRAALVM_PYTHON_LLVM_MANAGED */
 
+extern Py_LOCAL_SYMBOL int graalpy_finalizing;
+
 /* Flags definitions representing global (debug) options. */
 static MUST_INLINE int PyTruffle_Trace_Memory() {
 	return Py_Truffle_Options & PY_TRUFFLE_TRACE_MEM;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -41,7 +41,7 @@
 #include "capi.h"
 
 int Py_IsInitialized(void) {
-    return 1;
+    return !graalpy_finalizing;
 }
 
 void _Py_NO_RETURN  _Py_FatalErrorFunc(const char *func, const char *msg) {

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/tokenizer/Tokenizer.java

@@ -391,9 +391,6 @@ private static int[] charsToCodePoints(char[] chars) {
      * spec comment are ignored,
      */
     public static Tokenizer fromString(ErrorCallback errorCallback, String code, EnumSet<Flag> flags, SourceRange inputSourceRange) {
-        if (code.length() > 0 && code.charAt(0) == '\\') {
-            System.out.println("Creating tokenizer for *" + code + "*");
-        }
         return new Tokenizer(errorCallback, charsToCodePoints(code.toCharArray()), flags, inputSourceRange);
     }
 

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_peepholer.txt

@@ -134,6 +134,7 @@
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Bind;
@@ -962,40 +963,46 @@ Object get(Object obj,
     @CApiBuiltin(ret = Int, args = {PyObject, ConstCharPtrAsTruffleString}, call = Direct)
     abstract static class PyObject_SetDoc extends CApiBinaryBuiltinNode {
         @Specialization
-        static int set(PBuiltinFunction obj, TruffleString value,
+        static int set(PBuiltinFunction obj, Object value,
                         @Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
             write.execute(obj, T___DOC__, value);
             return 1;
         }
 
         @Specialization
-        static int set(PBuiltinMethod obj, TruffleString value,
+        static int set(PBuiltinMethod obj, Object value,
                         @Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
             set(obj.getBuiltinFunction(), value, write);
             return 1;
         }
 
         @Specialization
-        static int set(GetSetDescriptor obj, TruffleString value,
+        static int set(GetSetDescriptor obj, Object value,
                         @Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
             write.execute(obj, T___DOC__, value);
             return 1;
         }
 
         @Specialization(guards = "isType.execute(inliningTarget, type)", limit = "1")
-        static int set(PythonAbstractNativeObject type, TruffleString value,
-                        @SuppressWarnings("unused") @Bind("this") Node inliningTarget,
+        static int set(PythonAbstractNativeObject type, Object value,
+                        @Bind("this") Node inliningTarget,
                         @SuppressWarnings("unused") @Cached IsTypeNode isType,
                         @Cached CStructAccess.WritePointerNode writePointerNode) {
-            writePointerNode.write(type.getPtr(), PyTypeObject__tp_doc, new CStringWrapper(value));
+            Object cValue;
+            if (value instanceof TruffleString stringValue) {
+                cValue = new CStringWrapper(stringValue);
+            } else {
+                cValue = PythonContext.get(inliningTarget).getNativeNull();
+            }
+            writePointerNode.write(type.getPtr(), PyTypeObject__tp_doc, cValue);
             return 1;
         }
 
         @Fallback
         @SuppressWarnings("unused")
         static int set(Object obj, Object value) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw CompilerDirectives.shouldNotReachHere("Don't know how to set doc for " + obj.getClass());
+            // The callers don't expect errors, so just do nothing
+            return 1;
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextAbstractBuiltins.java

@@ -52,7 +52,6 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
 import static com.oracle.graal.python.nodes.ErrorMessages.CALLED_WITH_INVALID_PY_CAPSULE_OBJECT;
 import static com.oracle.graal.python.nodes.ErrorMessages.PY_CAPSULE_IMPORT_S_IS_NOT_VALID;
-import static com.oracle.graal.python.nodes.statement.AbstractImportNode.T_IMPORT_ALL;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
@@ -364,7 +363,7 @@ static Object doGeneric(TruffleString name, @SuppressWarnings("unused") int noBl
                 }
                 if (object == null) {
                     // noBlock has no effect anymore since 3.3
-                    object = AbstractImportNode.importModule(trace, T_IMPORT_ALL);
+                    object = AbstractImportNode.importModule(trace);
                 } else {
                     object = getAttrNode.execute(object, trace);
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCapsuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -52,7 +52,6 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_GLOBALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_LOCALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T___IMPORT__;
-import static com.oracle.graal.python.nodes.statement.AbstractImportNode.T_IMPORT_ALL;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi5BuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
@@ -76,7 +75,7 @@ public final class PythonCextImportBuiltins {
     abstract static class PyImport_ImportModule extends CApiUnaryBuiltinNode {
         @Specialization
         static Object imp(TruffleString name) {
-            return AbstractImportNode.importModule(name, T_IMPORT_ALL);
+            return AbstractImportNode.importModule(name);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextImportBuiltins.java

@@ -50,6 +50,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___REDUCE__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_NEWLINE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_UTF8;
+import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.KeyError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.PicklingError;
@@ -1831,7 +1832,7 @@ private void saveGlobal(VirtualFrame frame, PythonContext ctx, PPickler pickler,
 
             Object module;
             try {
-                module = PickleUtils.importDottedModule(moduleName);
+                module = importModule(moduleName);
             } catch (PException e) {
                 throw raise(PicklingError, ErrorMessages.CANT_PICKLE_P_IMPORT_OF_MODULE_S_FAILED, obj, moduleName);
             }