From 8962610247e3353b6019c09f778ec1fa9dfda628 Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Wed, 2 Oct 2024 23:26:52 +0800 Subject: [PATCH] [BE][clang-format] make macro `PyObject_HEAD_INIT(type)` and `PyVarObject_HEAD_INIT(type, size)` have its own line (#136949) Pull Request resolved: https://github.com/pytorch/pytorch/pull/136949 Approved by: https://github.com/albanD, https://github.com/eqy ghstack dependencies: #136945 --- .clang-format | 18 ++++++++++++++++++ caffe2/.clang-format | 18 ++++++++++++++++++ torch/csrc/Device.cpp | 3 ++- torch/csrc/Dtype.cpp | 3 ++- torch/csrc/Event.cpp | 3 ++- torch/csrc/Generator.cpp | 3 ++- torch/csrc/Layout.cpp | 3 ++- torch/csrc/MemoryFormat.cpp | 3 ++- torch/csrc/QScheme.cpp | 3 ++- torch/csrc/Size.cpp | 3 ++- torch/csrc/Storage.cpp | 10 ++++------ torch/csrc/Stream.cpp | 3 ++- torch/csrc/TypeInfo.cpp | 6 ++++-- torch/csrc/autograd/profiler_python.cpp | 3 ++- torch/csrc/autograd/python_cpp_function.cpp | 4 +++- torch/csrc/autograd/python_engine.cpp | 3 ++- torch/csrc/autograd/python_function.cpp | 3 ++- torch/csrc/autograd/python_legacy_variable.cpp | 5 ++--- .../autograd/python_torch_functions_manual.cpp | 5 ++--- torch/csrc/autograd/python_variable.cpp | 10 ++++------ torch/csrc/cuda/Event.cpp | 3 ++- torch/csrc/cuda/Stream.cpp | 3 ++- torch/csrc/dynamo/guards.cpp | 6 ++++-- torch/csrc/fx/node.cpp | 6 ++++-- torch/csrc/profiler/python/init.cpp | 10 +++++----- torch/csrc/tensor/python_tensor.cpp | 6 ++++-- torch/csrc/utils/disable_torch_function.cpp | 10 ++++------ torch/csrc/xpu/Event.cpp | 3 ++- torch/csrc/xpu/Stream.cpp | 3 ++- 29 files changed, 108 insertions(+), 54 deletions(-) diff --git a/.clang-format b/.clang-format index 5c093e39f940..e85e7bdf5786 100644 --- a/.clang-format +++ b/.clang-format @@ -60,6 +60,24 @@ IndentWrappedFunctionNames: false KeepEmptyLinesAtTheStartOfBlocks: false MacroBlockBegin: '' MacroBlockEnd: '' +Macros: + - >- + PyObject_HEAD_INIT(type)={ + /* this is not exactly match with PyObject_HEAD_INIT in Python source code + * but it is enough for clang-format */ + { 0xFFFFFFFF }, + (type) + }, + - >- + PyVarObject_HEAD_INIT(type, size)={ + { + /* manually expand PyObject_HEAD_INIT(type) above + * because clang-format do not support recursive expansion */ + { 0xFFFFFFFF }, + (type) + }, + (size) + }, MaxEmptyLinesToKeep: 1 NamespaceIndentation: None PenaltyBreakBeforeFirstCallParameter: 1 diff --git a/caffe2/.clang-format b/caffe2/.clang-format index 78603034433b..7263446d248e 100644 --- a/caffe2/.clang-format +++ b/caffe2/.clang-format @@ -59,6 +59,24 @@ IndentWrappedFunctionNames: false KeepEmptyLinesAtTheStartOfBlocks: false MacroBlockBegin: '' MacroBlockEnd: '' +Macros: + - >- + PyObject_HEAD_INIT(type)={ + /* this is not exactly match with PyObject_HEAD_INIT in Python source code + * but it is enough for clang-format */ + { 0xFFFFFFFF }, + (type) + }, + - >- + PyVarObject_HEAD_INIT(type, size)={ + { + /* manually expand PyObject_HEAD_INIT(type) above + * because clang-format do not support recursive expansion */ + { 0xFFFFFFFF }, + (type) + }, + (size) + }, MaxEmptyLinesToKeep: 1 NamespaceIndentation: None ObjCBlockIndentWidth: 2 diff --git a/torch/csrc/Device.cpp b/torch/csrc/Device.cpp index aaf04fb4b33d..0e3126ebe2b4 100644 --- a/torch/csrc/Device.cpp +++ b/torch/csrc/Device.cpp @@ -225,7 +225,8 @@ static PyMethodDef THPDevice_methods[] = { }; PyTypeObject THPDeviceType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.device", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.device", /* tp_name */ sizeof(THPDevice), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/Dtype.cpp b/torch/csrc/Dtype.cpp index 4b911322ff4c..74175c164c4d 100644 --- a/torch/csrc/Dtype.cpp +++ b/torch/csrc/Dtype.cpp @@ -123,7 +123,8 @@ PyObject* THPDtype_repr(THPDtype* self) { } PyTypeObject THPDtypeType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.dtype", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.dtype", /* tp_name */ sizeof(THPDtype), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/Event.cpp b/torch/csrc/Event.cpp index 907a2cc785af..c198411106c1 100644 --- a/torch/csrc/Event.cpp +++ b/torch/csrc/Event.cpp @@ -276,7 +276,8 @@ static PyMethodDef THPEvent_methods[] = { {nullptr}}; PyTypeObject THPEventType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.Event", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.Event", /* tp_name */ sizeof(THPEvent), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THPEvent_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/Generator.cpp b/torch/csrc/Generator.cpp index e94a0b19831b..666a05b6af09 100644 --- a/torch/csrc/Generator.cpp +++ b/torch/csrc/Generator.cpp @@ -330,7 +330,8 @@ static struct PyMemberDef THPGenerator_members[] = { {nullptr}}; PyTypeObject THPGeneratorType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C.Generator", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C.Generator", /* tp_name */ sizeof(THPGenerator), /* tp_basicsize */ 0, /* tp_itemsize */ THPGenerator_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/Layout.cpp b/torch/csrc/Layout.cpp index 4b56805b0b5a..b7a44a185668 100644 --- a/torch/csrc/Layout.cpp +++ b/torch/csrc/Layout.cpp @@ -27,7 +27,8 @@ PyObject* THPLayout_repr(THPLayout* self) { } PyTypeObject THPLayoutType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.layout", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.layout", /* tp_name */ sizeof(THPLayout), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/MemoryFormat.cpp b/torch/csrc/MemoryFormat.cpp index 698eea7730be..8a0fbec8371e 100644 --- a/torch/csrc/MemoryFormat.cpp +++ b/torch/csrc/MemoryFormat.cpp @@ -40,7 +40,8 @@ static PyMethodDef THPMemoryFormat_methods[] = { }; PyTypeObject THPMemoryFormatType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.memory_format", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.memory_format", /* tp_name */ sizeof(THPMemoryFormat), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/QScheme.cpp b/torch/csrc/QScheme.cpp index abcfc5b4e9ee..9d6d244ed998 100644 --- a/torch/csrc/QScheme.cpp +++ b/torch/csrc/QScheme.cpp @@ -39,7 +39,8 @@ PyObject* THPQScheme_repr(THPQScheme* self) { } PyTypeObject THPQSchemeType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.qscheme", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.qscheme", /* tp_name */ sizeof(THPQScheme), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/Size.cpp b/torch/csrc/Size.cpp index 0e739c7f6a32..322c7a4e090b 100644 --- a/torch/csrc/Size.cpp +++ b/torch/csrc/Size.cpp @@ -234,7 +234,8 @@ static PyMethodDef THPSize_methods[] = { {nullptr}}; PyTypeObject THPSizeType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.Size", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.Size", /* tp_name */ sizeof(THPSize), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/Storage.cpp b/torch/csrc/Storage.cpp index e76de79344f9..effe761d49a8 100644 --- a/torch/csrc/Storage.cpp +++ b/torch/csrc/Storage.cpp @@ -593,9 +593,8 @@ struct THPStorageMeta { int THPStorageMetaType_init(PyObject* cls, PyObject* args, PyObject* kwargs); PyTypeObject THPStorageMetaType = { - PyVarObject_HEAD_INIT( - DEFERRED_ADDRESS(&PyType_Type), - 0) "torch._C._StorageMeta", /* tp_name */ + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "torch._C._StorageMeta", /* tp_name */ sizeof(THPStorageMeta), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ @@ -637,9 +636,8 @@ PyTypeObject THPStorageMetaType = { // TODO: implement equality PyTypeObject THPStorageType = { - PyVarObject_HEAD_INIT( - &THPStorageMetaType, - 0) "torch._C.StorageBase", /* tp_name */ + PyVarObject_HEAD_INIT(&THPStorageMetaType, 0) + "torch._C.StorageBase", /* tp_name */ sizeof(THPStorage), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/Stream.cpp b/torch/csrc/Stream.cpp index cff0dce51945..a3d47373f27a 100644 --- a/torch/csrc/Stream.cpp +++ b/torch/csrc/Stream.cpp @@ -332,7 +332,8 @@ static PyMethodDef THPStream_methods[] = { {nullptr}}; PyTypeObject THPStreamType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.Stream", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.Stream", /* tp_name */ sizeof(THPStream), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THPStream_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/TypeInfo.cpp b/torch/csrc/TypeInfo.cpp index 97df12218763..e7e4201964a0 100644 --- a/torch/csrc/TypeInfo.cpp +++ b/torch/csrc/TypeInfo.cpp @@ -286,7 +286,8 @@ static PyMethodDef THPFInfo_methods[] = { }; PyTypeObject THPFInfoType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.finfo", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.finfo", /* tp_name */ sizeof(THPFInfo), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ @@ -339,7 +340,8 @@ static PyMethodDef THPIInfo_methods[] = { }; PyTypeObject THPIInfoType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.iinfo", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.iinfo", /* tp_name */ sizeof(THPIInfo), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/autograd/profiler_python.cpp b/torch/csrc/autograd/profiler_python.cpp index 39023019a8d4..481cff3cc5c0 100644 --- a/torch/csrc/autograd/profiler_python.cpp +++ b/torch/csrc/autograd/profiler_python.cpp @@ -554,7 +554,8 @@ struct TraceContext { // CPython boilerplate to define `TraceContext` as a proper python object. static PyTypeObject TraceContextType = { - PyVarObject_HEAD_INIT(nullptr, 0) "TraceContext", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "TraceContext", /* tp_name */ sizeof(TraceContext), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/autograd/python_cpp_function.cpp b/torch/csrc/autograd/python_cpp_function.cpp index 5570a763d49b..cbaa06211113 100644 --- a/torch/csrc/autograd/python_cpp_function.cpp +++ b/torch/csrc/autograd/python_cpp_function.cpp @@ -246,7 +246,9 @@ PyTypeObject* _initFunctionPyTypeObject( const char* name, PyGetSetDef* function_properties, PyMethodDef* function_methods) { - type.ob_base = {PyObject_HEAD_INIT(nullptr) 0}; + type.ob_base = { + PyObject_HEAD_INIT(nullptr) + 0}; // NOLINTNEXTLINE(misc-redundant-expression) type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC; type.tp_name = name; diff --git a/torch/csrc/autograd/python_engine.cpp b/torch/csrc/autograd/python_engine.cpp index 4d55d803a602..12a668095b41 100644 --- a/torch/csrc/autograd/python_engine.cpp +++ b/torch/csrc/autograd/python_engine.cpp @@ -460,7 +460,8 @@ static struct PyMethodDef THPEngine_methods[] = { {nullptr}}; PyTypeObject THPEngineType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._EngineBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._EngineBase", /* tp_name */ sizeof(THPEngine), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/autograd/python_function.cpp b/torch/csrc/autograd/python_function.cpp index c9c4b2346b59..f66c8bce09bc 100644 --- a/torch/csrc/autograd/python_function.cpp +++ b/torch/csrc/autograd/python_function.cpp @@ -1791,7 +1791,8 @@ static struct PyMethodDef THPFunction_methods[] = { {nullptr}}; PyTypeObject THPFunctionType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._FunctionBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._FunctionBase", /* tp_name */ sizeof(THPFunction), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THPFunction_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/autograd/python_legacy_variable.cpp b/torch/csrc/autograd/python_legacy_variable.cpp index 897e15e9e40e..0647abc69e09 100644 --- a/torch/csrc/autograd/python_legacy_variable.cpp +++ b/torch/csrc/autograd/python_legacy_variable.cpp @@ -109,9 +109,8 @@ static PyObject* THPVariable_pynew( } PyTypeObject THPLegacyVariableType = { - PyVarObject_HEAD_INIT( - nullptr, - 0) "torch._C._LegacyVariableBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._LegacyVariableBase", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/autograd/python_torch_functions_manual.cpp b/torch/csrc/autograd/python_torch_functions_manual.cpp index 92890a1509e8..920cdc928ef3 100644 --- a/torch/csrc/autograd/python_torch_functions_manual.cpp +++ b/torch/csrc/autograd/python_torch_functions_manual.cpp @@ -532,9 +532,8 @@ void gatherTorchFunctions(std::vector& torch_functions) { } static PyTypeObject THPVariableFunctions = { - PyVarObject_HEAD_INIT( - nullptr, - 0) "torch._C._VariableFunctionsClass", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._VariableFunctionsClass", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/autograd/python_variable.cpp b/torch/csrc/autograd/python_variable.cpp index edf95f6a18ef..3f7d4afca6fa 100644 --- a/torch/csrc/autograd/python_variable.cpp +++ b/torch/csrc/autograd/python_variable.cpp @@ -1781,9 +1781,8 @@ struct THPVariableMeta { int THPVariableMetaType_init(PyObject* cls, PyObject* args, PyObject* kwargs); PyTypeObject THPVariableMetaType = { - PyVarObject_HEAD_INIT( - DEFERRED_ADDRESS(&PyType_Type), - 0) "torch._C._TensorMeta", /* tp_name */ + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "torch._C._TensorMeta", /* tp_name */ sizeof(THPVariableMeta), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ @@ -1824,9 +1823,8 @@ PyTypeObject THPVariableMetaType = { }; PyTypeObject THPVariableType = { - PyVarObject_HEAD_INIT( - &THPVariableMetaType, - 0) "torch._C.TensorBase", /* tp_name */ + PyVarObject_HEAD_INIT(&THPVariableMetaType, 0) + "torch._C.TensorBase", /* tp_name */ sizeof(THPVariable), /* tp_basicsize */ 0, /* tp_itemsize */ // This is unspecified, because it is illegal to create a THPVariableType diff --git a/torch/csrc/cuda/Event.cpp b/torch/csrc/cuda/Event.cpp index c67a8a58e776..912dcd6fae26 100644 --- a/torch/csrc/cuda/Event.cpp +++ b/torch/csrc/cuda/Event.cpp @@ -200,7 +200,8 @@ static PyMethodDef THCPEvent_methods[] = { {nullptr}}; PyTypeObject THCPEventType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._CudaEventBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._CudaEventBase", /* tp_name */ sizeof(THCPEvent), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THCPEvent_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/cuda/Stream.cpp b/torch/csrc/cuda/Stream.cpp index cbfa64af2523..35cf30145981 100644 --- a/torch/csrc/cuda/Stream.cpp +++ b/torch/csrc/cuda/Stream.cpp @@ -156,7 +156,8 @@ static PyMethodDef THCPStream_methods[] = { {nullptr}}; PyTypeObject THCPStreamType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._CudaStreamBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._CudaStreamBase", /* tp_name */ sizeof(THCPStream), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THCPStream_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/dynamo/guards.cpp b/torch/csrc/dynamo/guards.cpp index 53dcd0f60446..1eccc44420d9 100644 --- a/torch/csrc/dynamo/guards.cpp +++ b/torch/csrc/dynamo/guards.cpp @@ -500,7 +500,8 @@ static PyMethodDef TensorGuards_methods[] = { {nullptr} /* Sentinel */ }; -static PyTypeObject TensorGuardsType = {PyVarObject_HEAD_INIT(nullptr, 0)}; +static PyTypeObject TensorGuardsType = { PyVarObject_HEAD_INIT(nullptr, 0) +}; // TODO (janimesh) - Remove the PyObject_HEAD part when C++ guard manager is // merged. @@ -617,7 +618,8 @@ static PyMethodDef GlobalStateGuard_methods[] = { METH_NOARGS, "Return string reason for guard check failing"}, {nullptr}}; -static PyTypeObject GlobalStateGuardType = {PyVarObject_HEAD_INIT(nullptr, 0)}; +static PyTypeObject GlobalStateGuardType = { PyVarObject_HEAD_INIT(nullptr, 0) +}; static PyObject* check_type_id(PyObject* dummy, PyObject* args) { // faster `lambda obj, expected: id(type(obj)) == expected` diff --git a/torch/csrc/fx/node.cpp b/torch/csrc/fx/node.cpp index 06c0683db342..aa7c5b67f7a4 100644 --- a/torch/csrc/fx/node.cpp +++ b/torch/csrc/fx/node.cpp @@ -60,7 +60,8 @@ static void NodeBase_dealloc(PyObject* self) { } static PyTypeObject NodeBaseType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._NodeBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._NodeBase", /* tp_name */ sizeof(NodeBase), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)NodeBase_dealloc, /* tp_dealloc */ @@ -212,7 +213,8 @@ static void NodeIter_dealloc(PyObject* self) { } static PyTypeObject NodeIterType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._NodeIter", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._NodeIter", /* tp_name */ sizeof(NodeIter), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)NodeIter_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/profiler/python/init.cpp b/torch/csrc/profiler/python/init.cpp index 7f77dbad5ebf..46e70d90e7ad 100644 --- a/torch/csrc/profiler/python/init.cpp +++ b/torch/csrc/profiler/python/init.cpp @@ -38,9 +38,8 @@ static void THPCapturedTraceback_dealloc(PyObject* self_) { } PyTypeObject THPCapturedTracebackType = { - PyVarObject_HEAD_INIT( - nullptr, - 0) "torch._C._profiler.CapturedTraceback", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._profiler.CapturedTraceback", /* tp_name */ sizeof(THPCapturedTraceback), /* tp_basicsize */ 0, /* tp_itemsize */ THPCapturedTraceback_dealloc, /* tp_dealloc */ @@ -643,8 +642,9 @@ void initPythonBindings(PyObject* module) { {nullptr}, }; - static PyTypeObject RecordFunctionFast_Type = { - PyVarObject_HEAD_INIT(nullptr, 0)}; + static PyTypeObject RecordFunctionFast_Type = { PyVarObject_HEAD_INIT(nullptr, + 0) + }; RecordFunctionFast_Type.tp_name = "torch._C._profiler.RecordFunctionFast", RecordFunctionFast_Type.tp_basicsize = sizeof(RecordFunctionFast); diff --git a/torch/csrc/tensor/python_tensor.cpp b/torch/csrc/tensor/python_tensor.cpp index 6960034626d5..ad418955e055 100644 --- a/torch/csrc/tensor/python_tensor.cpp +++ b/torch/csrc/tensor/python_tensor.cpp @@ -172,7 +172,8 @@ static struct PyGetSetDef metaclass_properties[] = { {nullptr}}; static PyTypeObject metaclass = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch.tensortype", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch.tensortype", /* tp_name */ sizeof(PyTypeObject) /* tp_basicsize */ }; @@ -188,7 +189,8 @@ static void py_initialize_metaclass(PyTypeObject& metaclass) { } static PyTypeObject tensor_type_prototype = { - PyVarObject_HEAD_INIT(&metaclass, 0) nullptr, /* tp_name */ + PyVarObject_HEAD_INIT(&metaclass, 0) + nullptr, /* tp_name */ sizeof(PyTensorType) /* tp_basicsize */ }; diff --git a/torch/csrc/utils/disable_torch_function.cpp b/torch/csrc/utils/disable_torch_function.cpp index 818c3c4a00d4..e25badfe3e64 100644 --- a/torch/csrc/utils/disable_torch_function.cpp +++ b/torch/csrc/utils/disable_torch_function.cpp @@ -80,9 +80,8 @@ static PyMethodDef DisableTorchFunctionSubclass_methods[] = { // NOLINT {nullptr, nullptr, 0, nullptr}}; PyTypeObject DisableTorchFunctionSubclassType = { - PyVarObject_HEAD_INIT( - nullptr, - 0) "torch._C.DisableTorchFunctionSubclass", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C.DisableTorchFunctionSubclass", /* tp_name */ sizeof(DisableTorchFunctionSubclass), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ @@ -155,9 +154,8 @@ static PyMethodDef DisableTorchFunction_methods[] = { // NOLINT {nullptr, nullptr, 0, nullptr}}; PyTypeObject DisableTorchFunctionType = { - PyVarObject_HEAD_INIT( - nullptr, - 0) "torch._C.DisableTorchFunction", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C.DisableTorchFunction", /* tp_name */ sizeof(DisableTorchFunction), /* tp_basicsize */ 0, /* tp_itemsize */ nullptr, /* tp_dealloc */ diff --git a/torch/csrc/xpu/Event.cpp b/torch/csrc/xpu/Event.cpp index ebb7586d73c0..45e04edaa375 100644 --- a/torch/csrc/xpu/Event.cpp +++ b/torch/csrc/xpu/Event.cpp @@ -127,7 +127,8 @@ static PyMethodDef THXPEvent_methods[] = { {nullptr}}; PyTypeObject THXPEventType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._XpuEventBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._XpuEventBase", /* tp_name */ sizeof(THXPEvent), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THXPEvent_dealloc, /* tp_dealloc */ diff --git a/torch/csrc/xpu/Stream.cpp b/torch/csrc/xpu/Stream.cpp index 382893176240..f3750aa7222b 100644 --- a/torch/csrc/xpu/Stream.cpp +++ b/torch/csrc/xpu/Stream.cpp @@ -139,7 +139,8 @@ static PyMethodDef THXPStream_methods[] = { {nullptr}}; PyTypeObject THXPStreamType = { - PyVarObject_HEAD_INIT(nullptr, 0) "torch._C._XpuStreamBase", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) + "torch._C._XpuStreamBase", /* tp_name */ sizeof(THXPStream), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)THXPStream_dealloc, /* tp_dealloc */