[GR-65186] Add patch for torch 2.7.0 etc.

PullRequest: graalpython/3804

Author: msimacek

graalpython/lib-graalpython/patches/metadata.toml

@@ -152,6 +152,14 @@ version = '>= 1.64.0'
 patch = 'grpcio-1.66.1.patch'
 license = 'Apache-2.0'
 
+[[grpcio.rules]]
+# Force re-cythonize + other fixes
+# The rc version won't get matched by the version range above
+version = '== 1.72.0rc1'
+install-priority = 0
+patch = 'grpcio-1.66.1.patch'
+license = 'Apache-2.0'
+
 [[h2o.rules]]
 patch = 'h2o.patch'
 license = 'Apache-2.0'
@@ -425,10 +433,19 @@ patch = 'prompt_toolkit.patch'
 license = 'BSD-3-Clause'
 
 [[protobuf.rules]]
+patch = 'protobuf.patch'
+license = 'BSD-3-Clause'
+# There are 'none-any' wheels on pypi, this is only needed on sdists
+dist-type = 'sdist'
+install-priority = 0
+
+[[protobuf.rules]]
+# msimacek: This version doesn't exist, but the patch file is referenced from the tensorflow patch which I'm afraid to touch
 version = '== 3.21.9'
-# Also referenced outside of pip from tensorflow patches
 patch = 'protobuf-3.21.9.patch'
 license = 'BSD-3-Clause'
+dist-type = 'sdist'
+install-priority = 0
 
 [[psycopg2.rules]]
 version = '<= 2.9.9'
@@ -763,6 +780,12 @@ patch = 'torch-2.4.1.patch'
 license = 'BSD-3-Clause'
 dist-type = 'sdist'
 
+[[torch.rules]]
+version = '== 2.7.0'
+patch = 'torch-2.7.0.patch'
+license = 'BSD-3-Clause'
+dist-type = 'sdist'
+
 [[torch.add-sources]]
 version = '1.13.1'
 url = 'https://github.com/pytorch/pytorch/releases/download/v1.13.1/pytorch-v1.13.1.tar.gz'
@@ -775,9 +798,22 @@ url = 'https://github.com/pytorch/pytorch/releases/download/v2.2.1/pytorch-v2.2.
 version = '2.4.1'
 url = 'https://github.com/pytorch/pytorch/releases/download/v2.4.1/pytorch-v2.4.1.tar.gz'
 
+[[torch.add-sources]]
+version = '2.7.0'
+url = 'https://github.com/pytorch/pytorch/releases/download/v2.7.0/pytorch-v2.7.0.tar.gz'
+
+[[torchvision.rules]]
+version = '== 0.22.0'
+patch = 'torchvision-0.22.0.patch'
+license = 'BSD-3-Clause'
+
+[[torchvision.add-sources]]
+version = '0.19.1'
+url = 'https://github.com/pytorch/vision/archive/refs/tags/v0.22.0.tar.gz'
+
 [[torchvision.rules]]
 version = '== 0.19.1'
-patch = 'torchvision-1.19.1.patch'
+patch = 'torchvision-0.19.1.patch'
 license = 'BSD-3-Clause'
 
 [[torchvision.add-sources]]
@@ -786,7 +822,7 @@ url = 'https://github.com/pytorch/vision/archive/refs/tags/v0.19.1.tar.gz'
 
 [[torchvision.rules]]
 version = '== 0.17.1'
-patch = 'torchvision-1.17.1.patch'
+patch = 'torchvision-0.17.1.patch'
 license = 'BSD-3-Clause'
 
 [[torchvision.add-sources]]

graalpython/lib-graalpython/patches/protobuf.patch

@@ -0,0 +1,15 @@
+diff --git a/google/protobuf/internal/api_implementation.py b/google/protobuf/internal/api_implementation.py
+index b40446b..48e684f 100644
+--- a/google/protobuf/internal/api_implementation.py
++++ b/google/protobuf/internal/api_implementation.py
+@@ -70,8 +70,8 @@ if _implementation_type not in ('python', 'cpp', 'upb'):
+                    'supported. Please set to \'python\', \'cpp\' or '
+                    '\'upb\'.'.format(_implementation_type))
+ 
+-if 'PyPy' in sys.version and _implementation_type == 'cpp':
+-  warnings.warn('PyPy does not work yet with cpp protocol buffers. '
++if sys.implementation.name in ('pypy', 'graalpy') and _implementation_type == 'cpp':
++  warnings.warn('PyPy and GraalPy do not work yet with cpp protocol buffers. '
+                 'Falling back to the python implementation.')
+   _implementation_type = 'python'
+ 

graalpython/lib-graalpython/patches/torch-2.4.1.patch

@@ -178,6 +178,19 @@ index f5fdbf155..d76176cb6 100644
 
 
  class TestWrapperSubclassAliasing(TestCase):
+diff --git a/third_party/fbgemm/CMakeLists.txt b/third_party/fbgemm/CMakeLists.txt
+index 134523e7d..a00538e3c 100644
+--- a/third_party/fbgemm/CMakeLists.txt
++++ b/third_party/fbgemm/CMakeLists.txt
+@@ -10,6 +10,8 @@
+ 
+ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+ 
++add_compile_options(-Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=restrict)
++
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
+ # Define function to extract filelists from defs.bzl file
 diff --git a/third_party/pybind11/include/pybind11/detail/common.h b/third_party/pybind11/include/pybind11/detail/common.h
 index 454e6061b..7feafc7d7 100644
 --- a/third_party/pybind11/include/pybind11/detail/common.h
@@ -537,20 +550,6 @@ index c301da982..a2668be20 100644
 +const int THP_PyOpcode_Caches_size = 0;
 +
 +#endif // GraalPy change
-diff --git a/torch/csrc/dynamo/extra_state.c b/torch/csrc/dynamo/extra_state.c
-index cbe9ab37a..18740a0d8 100644
---- a/torch/csrc/dynamo/extra_state.c
-+++ b/torch/csrc/dynamo/extra_state.c
-@@ -100,9 +100,6 @@ void destroy_extra_state(void* obj) {
- }
- 
- void set_extra_state(PyCodeObject* code, ExtraState* extra_state) {
--  ExtraState* old_extra_state = get_extra_state(code);
--  CHECK(extra_state == nullptr || old_extra_state != extra_state);
--  _PyCode_SetExtra((PyObject*)code, extra_index, extra_state);
- }
- 
- ExtraState* init_and_set_extra_state(PyCodeObject* code) {
 diff --git a/torch/csrc/dynamo/eval_frame.c b/torch/csrc/dynamo/eval_frame.c
 index cbe9ab37a..18740a0d8 100644
 --- a/torch/csrc/dynamo/eval_frame.c
@@ -628,6 +627,24 @@ index cbe9ab37a..18740a0d8 100644
 
    return module;
  }
+diff --git a/torch/csrc/dynamo/extra_state.cpp b/torch/csrc/dynamo/extra_state.cpp
+index 7c9b4be00..b8edbcfda 100644
+--- a/torch/csrc/dynamo/extra_state.cpp
++++ b/torch/csrc/dynamo/extra_state.cpp
+@@ -65,11 +65,13 @@ void destroy_extra_state(void* obj) {
+ }
+ 
+ void set_extra_state(PyCodeObject* code, ExtraState* extra_state) {
++#if 0 // GraalPy change
+   ExtraState* old_extra_state = get_extra_state(code);
+   CHECK(
+       old_extra_state == nullptr || old_extra_state == SKIP_CODE ||
+       old_extra_state != extra_state);
+   _PyCode_SetExtra((PyObject*)code, extra_index, extra_state);
++#endif // GraalPy change
+ }
+ 
+ ExtraState* init_and_set_extra_state(PyCodeObject* code) {
 diff --git a/torch/csrc/jit/python/python_tracer.cpp b/torch/csrc/jit/python/python_tracer.cpp
 index 92e6e2d3a..4d2ec0bfe 100644
 --- a/torch/csrc/jit/python/python_tracer.cpp