rpms/python-torch
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update gitcommit to 2.4.0-rc3

Browse source 
Signed-off-by: Tom Rix <trix@redhat.com>
This commit is contained in:
Tom Rix 2024-06-21 05:33:36 -06:00
commit 4e1bebf65f
2 changed files with 241 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

222
0001-Changes-to-compile-with-3.13-126033.patch Normal file
View file

@ -0,0 +1,222 @@
From 655a06444b261cb28e71a0973c0ab67aaa8261ab Mon Sep 17 00:00:00 2001
From: albanD <desmaison.alban@gmail.com>
Date: Tue, 14 May 2024 02:14:53 +0000
Subject: [PATCH] Changes to compile with 3.13 (#126033)
This is mainly:
- Fix refcount access macro
- Hide all the Dynamo code that needs update as usual
- Add _PyWeakref_ClearRef as an extern provided by CPython. Including the pycore header that defines it would require raw c include shenanigans that I don't think are worth it.
This allows to build both with regular and nogil version of cpython. Both
Note that this requires the 3.13 branch at least past [d3094744d40de2deefbda9b1996d5029c9ebf0b0](https://github.com/python/cpython/commit/d3094744d40de2deefbda9b1996d5029c9ebf0b0) which we need for mimalloc include and weakref function being exposed.
debug-only issues in pybind11 with PyMem_MALLOC vs PyObject_MALLOC being should be synced either by updating pybind or cpython. @colesbury I can send a PR to ifdef the proper use in pybind if you think that this is the best solution here?
Pull Request resolved: https://github.com/pytorch/pytorch/pull/126033
Approved by: https://github.com/colesbury
---
torch/csrc/Storage.cpp | 2 +-
torch/csrc/autograd/python_variable.cpp | 2 +-
torch/csrc/dynamo/cpython_defs.c | 15 +++++-
torch/csrc/dynamo/cpython_defs.h | 2 +
torch/csrc/dynamo/eval_frame.c | 67 ++++++++++++++++++-------
torch/csrc/utils/python_compat.h | 4 ++
6 files changed, 70 insertions(+), 22 deletions(-)
diff --git a/torch/csrc/Storage.cpp b/torch/csrc/Storage.cpp
index 93dbc9c09bb2..b22bbac35981 100644
--- a/torch/csrc/Storage.cpp
+++ b/torch/csrc/Storage.cpp
@@ -236,7 +236,7 @@ static void THPStorage_subclass_dealloc(PyObject* self) {
if (type->tp_del) {
PyObject_GC_Track(self);
type->tp_del(self);
- if (self->ob_refcnt > 0) {
+ if (Py_REFCNT(self) > 0) {
// Resurrected (see above comment about resurrection from `__del__`)
return;
}
diff --git a/torch/csrc/autograd/python_variable.cpp b/torch/csrc/autograd/python_variable.cpp
index 9e85f0026b35..8fd1129da63c 100644
--- a/torch/csrc/autograd/python_variable.cpp
+++ b/torch/csrc/autograd/python_variable.cpp
@@ -1910,7 +1910,7 @@ void THPVariable_subclass_dealloc(PyObject* self) {
if (type->tp_del) {
PyObject_GC_Track(self);
type->tp_del(self);
- if (self->ob_refcnt > 0) {
+ if (Py_REFCNT(self) > 0) {
/* Resurrected */
return;
}
diff --git a/torch/csrc/dynamo/cpython_defs.c b/torch/csrc/dynamo/cpython_defs.c
index 4a1dba63009a..5e0945a052ae 100644
--- a/torch/csrc/dynamo/cpython_defs.c
+++ b/torch/csrc/dynamo/cpython_defs.c
@@ -13,6 +13,17 @@
} else { \
}
+#if IS_PYTHON_3_13_PLUS
+// Gave up after fixing a few of these
+// pycore_opcode.h is gone (new is pycore_opcode_metadata.h ?)
+// f_code is gone (new is f_executable?)
+
+// Fake definitions for what we removed
+const uint8_t* THP_PyOpcode_Caches = NULL;
+const int THP_PyOpcode_Caches_size = 0;
+
+#else
+
// NOTE: all `assert`s below are converted to `CHECK`s
#if IS_PYTHON_3_11_PLUS
@@ -29,8 +40,8 @@
#define NEED_OPCODE_TABLES // To get _PyOpcode_Deopt
#include <internal/pycore_opcode.h>
#undef NEED_OPCODE_TABLES
-#undef Py_BUILD_CORE
#include <internal/pycore_frame.h>
+#undef Py_BUILD_CORE
// As a simple way to reduce the impact of ABI changes on the CPython side, this check forces
// us to manually re-check that the function didn't change on the next major version
@@ -364,3 +375,5 @@ THP_PyFrame_Clear(_PyInterpreterFrame *frame)
}
#endif
+
+#endif // CPython 3.13
\ No newline at end of file
diff --git a/torch/csrc/dynamo/cpython_defs.h b/torch/csrc/dynamo/cpython_defs.h
index a897c3e6c6e7..3b6c9667f8c9 100644
--- a/torch/csrc/dynamo/cpython_defs.h
+++ b/torch/csrc/dynamo/cpython_defs.h
@@ -8,7 +8,9 @@
#if IS_PYTHON_3_11_PLUS
+#define Py_BUILD_CORE
#include <internal/pycore_frame.h>
+#undef Py_BUILD_CORE
int THP_PyFrame_FastToLocalsWithError(
_PyInterpreterFrame* frame,
diff --git a/torch/csrc/dynamo/eval_frame.c b/torch/csrc/dynamo/eval_frame.c
index c286e821f09d..e13cb5af2a0e 100644
--- a/torch/csrc/dynamo/eval_frame.c
+++ b/torch/csrc/dynamo/eval_frame.c
@@ -8,6 +8,31 @@
#include <opcode.h>
#include <stdbool.h>
+
+
+PyObject* guard_error_hook = NULL;
+const char* cache_lookup_profiler_str = "TorchDynamo Cache Lookup";
+
+static int active_dynamo_threads = 0;
+
+static Py_tss_t eval_frame_callback_key = Py_tss_NEEDS_INIT;
+
+inline static PyObject* eval_frame_callback_get(void) {
+ void* result = PyThread_tss_get(&eval_frame_callback_key);
+ if (unlikely(result == NULL)) {
+ return (PyObject*)Py_None;
+ } else {
+ return (PyObject*)result;
+ }
+}
+
+inline static void eval_frame_callback_set(PyObject* obj) {
+ PyThread_tss_set(&eval_frame_callback_key, obj);
+}
+
+// 3.13 Not supported at all. See cpython_defs.c for hints
+#if !(IS_PYTHON_3_13_PLUS)
+
// Problem in CPython includes when mixing core and non-core build
// The fix was not backported to 3.12 so this is needed here
// https://github.com/python/cpython/issues/105268
@@ -138,24 +163,6 @@ THP_PyFrame_FastToLocalsWithError(THP_EVAL_API_FRAME_OBJECT *frame, int *free_va
}
#endif
-PyObject* guard_error_hook = NULL;
-const char* cache_lookup_profiler_str = "TorchDynamo Cache Lookup";
-
-static Py_tss_t eval_frame_callback_key = Py_tss_NEEDS_INIT;
-
-inline static PyObject* eval_frame_callback_get(void) {
- void* result = PyThread_tss_get(&eval_frame_callback_key);
- if (unlikely(result == NULL)) {
- return (PyObject*)Py_None;
- } else {
- return (PyObject*)result;
- }
-}
-
-inline static void eval_frame_callback_set(PyObject* obj) {
- PyThread_tss_set(&eval_frame_callback_key, obj);
-}
-
static PyObject* _custom_eval_frame_shim(
PyThreadState* tstate,
THP_EVAL_API_FRAME_OBJECT* frame,
@@ -627,7 +634,29 @@ static PyObject* _custom_eval_frame(
}
}
-static int active_dynamo_threads = 0;
+#else // IS_PYTHON_3_13_PLUS
+
+// Fake definitions for everything we removed
+
+typedef struct THPPyInterpreterFrame {
+ PyObject_HEAD
+ _PyInterpreterFrame* frame; // Borrowed reference
+} THPPyInterpreterFrame;
+
+inline static void enable_eval_frame_shim(PyThreadState* tstate) {}
+inline static void enable_eval_frame_default(PyThreadState* tstate) {}
+
+static struct PyGetSetDef THPPyInterpreterFrame_properties[] = {NULL};
+
+static PyTypeObject THPPyInterpreterFrameType = {
+ PyVarObject_HEAD_INIT(NULL, 0)
+ .tp_name = "torch._C.dynamo.eval_frame._PyInterpreterFrame",
+ .tp_basicsize = sizeof(THPPyInterpreterFrame),
+ .tp_flags = Py_TPFLAGS_DEFAULT,
+ .tp_getset = THPPyInterpreterFrame_properties,
+};
+
+#endif // CPython 3.13
static PyObject* increment_working_threads(PyThreadState* tstate) {
active_dynamo_threads = active_dynamo_threads + 1;
diff --git a/torch/csrc/utils/python_compat.h b/torch/csrc/utils/python_compat.h
index 73b991cf3fbf..b060db00db73 100644
--- a/torch/csrc/utils/python_compat.h
+++ b/torch/csrc/utils/python_compat.h
@@ -11,6 +11,7 @@ extern "C" {
#define IS_PYTHON_3_11_PLUS PY_VERSION_HEX >= 0x030B00C1
#define IS_PYTHON_3_12_PLUS PY_VERSION_HEX >= 0x030C0000
+#define IS_PYTHON_3_13_PLUS PY_VERSION_HEX >= 0x030D0000
PYCAPI_COMPAT_STATIC_INLINE(int)
PyCode_GetNCellvars(PyCodeObject* code) {
@@ -32,6 +33,9 @@ PyCode_GetNFreevars(PyCodeObject* code) {
#endif
}
+// Provided by CPython but getting the header for them is very hard
+extern void _PyWeakref_ClearRef(PyWeakReference* self);
+
#ifdef __cplusplus
}
#endif
--
2.45.1

23
python-torch.spec
View file

@ -6,10 +6,10 @@
# So pre releases can be tried # So pre releases can be tried
%bcond_with gitcommit %bcond_with gitcommit
%if %{with gitcommit} %if %{with gitcommit}
# ToT # v2.4.0-rc3
%global commit0 2b9465d62ab8733a36226f0d8e236a8a9bd60c23 %global commit0 50e57d4f3fdbd51cea0ef9979bc61abd1a4e96c8
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global date0 20240612 %global date0 20240620
%global pypi_version 2.4.0 %global pypi_version 2.4.0
%else %else
%global pypi_version 2.3.1 %global pypi_version 2.3.1
@ -63,8 +63,13 @@
# OpenCV support came in F41 # OpenCV support came in F41
%if 0%{?fedora} > 40 %if 0%{?fedora} > 40
%if %{without gitcommit}
%bcond_without opencv %bcond_without opencv
%else %else
# USE_OPENCV removed in 2.4.0+
%bcond_with opencv
%endif
%else
%bcond_with opencv %bcond_with opencv
%endif %endif
@ -230,7 +235,8 @@ Patch6: 0001-reenable-foxi-linking.patch
# Bring some patches forward # Bring some patches forward
%if %{without gitcommit} %if %{without gitcommit}
# https://github.com/pytorch/pytorch/pull/123384 # https://github.com/pytorch/pytorch/pull/123384
Patch7: 0001-Reenable-dim-for-python-3.12.patch # Breaks on python 3.13
# Patch7: 0001-Reenable-dim-for-python-3.12.patch
# Dynamo/Inductor on 3.12 # Dynamo/Inductor on 3.12
# Fails to apply on 2.3.1 # Fails to apply on 2.3.1
@ -248,6 +254,11 @@ Patch7: 0001-Reenable-dim-for-python-3.12.patch
# git submodule (because the release archive contains an actual sleef source # git submodule (because the release archive contains an actual sleef source
# tree instead, so this would not apply.) # tree instead, so this would not apply.)
Patch9: 0001-Enable-x86-CPU-vectorization-on-windows-submodule-sl.patch Patch9: 0001-Enable-x86-CPU-vectorization-on-windows-submodule-sl.patch
# For Python 3.13
# https://github.com/pytorch/pytorch/pull/126033
Patch10: 0001-Changes-to-compile-with-3.13-126033.patch
%endif %endif
# ROCm patches # ROCm patches
@ -503,6 +514,7 @@ Requires: python3-%{pypi_name}%{?_isa} = %{version}-%{release}
%autosetup -p1 -n pytorch-%{commit0} %autosetup -p1 -n pytorch-%{commit0}
# Overwrite with a git checkout of the pyproject.toml # Overwrite with a git checkout of the pyproject.toml
cp %{SOURCE1000} . cp %{SOURCE1000} .
%else %else
%autosetup -p1 -n pytorch-v%{version} %autosetup -p1 -n pytorch-v%{version}
%endif %endif
@ -826,6 +838,7 @@ export CAFFE2_LINK_LOCAL_PROTOBUF=OFF
export INTERN_BUILD_MOBILE=OFF export INTERN_BUILD_MOBILE=OFF
export USE_DISTRIBUTED=OFF export USE_DISTRIBUTED=OFF
export USE_CUDA=OFF export USE_CUDA=OFF
export USE_FAKELOWP=OFF
export USE_FBGEMM=OFF export USE_FBGEMM=OFF
export USE_FLASH_ATTENTION=OFF export USE_FLASH_ATTENTION=OFF
export USE_GOLD_LINKER=OFF export USE_GOLD_LINKER=OFF
@ -837,6 +850,7 @@ export USE_LITE_PROTO=OFF
export USE_MAGMA=OFF export USE_MAGMA=OFF
export USE_MKLDNN=OFF export USE_MKLDNN=OFF
export USE_MPI=OFF export USE_MPI=OFF
export USE_MKLDNN=OFF
export USE_NCCL=OFF export USE_NCCL=OFF
export USE_NNPACK=OFF export USE_NNPACK=OFF
export USE_NUMPY=ON export USE_NUMPY=ON
@ -853,6 +867,7 @@ export USE_SYSTEM_PYBIND11=OFF
export USE_SYSTEM_LIBS=OFF export USE_SYSTEM_LIBS=OFF
export USE_TENSORPIPE=OFF export USE_TENSORPIPE=OFF
export USE_XNNPACK=ON export USE_XNNPACK=ON
export USE_XPU=OFF
%if %{with pthreadpool} %if %{with pthreadpool}
export USE_SYSTEM_PTHREADPOOL=ON export USE_SYSTEM_PTHREADPOOL=ON