OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

PyPy compatibility: let unmodified slots be inherited in the standard way (#17837)

Browse Source 
Summary:
This is needed to fix a segfault on PyPy 3.6, see https://bitbucket.org/pypy/pypy/issues/2968/segfault-calling-cpyext_tp_new_tuple and https://github.com/pytorch/pytorch/issues/17835
Pull Request resolved: https://github.com/pytorch/pytorch/pull/17837

Differential Revision: D14399408

Pulled By: soumith

fbshipit-source-id: 75328a30018313d3223dd3e3eef9240a416c049b
This commit is contained in:
Ronan Lamy 2019-03-09 11:38:05 -08:00 committed by Facebook Github Bot
parent 17232fb842
commit 742568e7eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
torch/csrc/Size.cpp
View File

@ -117,10 +117,10 @@ namespace {
static PySequenceMethods THPSize_as_sequence = {
PyTuple_Type.tp_as_sequence->sq_length,
nullptr, /* sq_length */
wrap_tuple_fn<decltype(&sq_concat), &sq_concat>,
wrap_tuple_fn<decltype(&sq_repeat), &sq_repeat>,
PyTuple_Type.tp_as_sequence->sq_item,
nullptr, /* sq_item */
#if PY_MAJOR_VERSION == 2
wrap_tuple_fn<decltype(&sq_slice), &sq_slice>,
#else
@ -128,11 +128,11 @@ static PySequenceMethods THPSize_as_sequence = {
#endif
nullptr, /* sq_ass_item */
nullptr, /* sq_ass_slice */
PyTuple_Type.tp_as_sequence->sq_contains
nullptr /* sq_contains */
};
static PyMappingMethods THPSize_as_mapping = {
PyTuple_Type.tp_as_mapping->mp_length,
nullptr, /* mp_length */
wrap_tuple_fn<decltype(&mp_subscript), &mp_subscript>,
nullptr
};