Update remaining torch patches (#2554)

Signed-off-by: Gu, Jinghui <jinghui.gu@intel.com>

Author: gujinghui

…p-norm-channels-last-support-87680.patch …p-norm-channels-last-support-87680.patchtorch_patches/0002-enable-xpu-group-norm-channels-last-support-87680.patch renamed to torch_patches/0001-enable-xpu-group-norm-channels-last-support-87680.patch torch_patches/0002-enable-xpu-group-norm-channels-last-support-87680.patch renamed to torch_patches/0001-enable-xpu-group-norm-channels-last-support-87680.patch

@@ -1,7 +1,7 @@
-From 7ce48fc557c50e64f6adc135cf893623aff03cc5 Mon Sep 17 00:00:00 2001
+From bcd8cddd204db21474ce35d2ccce8fb04db6b119 Mon Sep 17 00:00:00 2001
 From: KevinYuk <kevin.yu@intel.com>
 Date: Mon, 31 Oct 2022 19:46:01 +0000
-Subject: [PATCH 02/11] enable xpu group norm channels last support (#87680)
+Subject: [PATCH 01/15] enable xpu group norm channels last support (#87680)
 
 XPU would support channels last format for group norm operator, however, Pytorch converts all input tensor to contiguous format, which includes channels last tensor. Need Pytorch pass down this memory format hint to us.
 Pull Request resolved: https://github.com/pytorch/pytorch/pull/87680
@@ -12,7 +12,7 @@ Approved by: https://github.com/albanD
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/aten/src/ATen/native/group_norm.cpp b/aten/src/ATen/native/group_norm.cpp
-index db1d82f84f..527e04c582 100644
+index db1d82f84fe..527e04c5827 100644
 --- a/aten/src/ATen/native/group_norm.cpp
 +++ b/aten/src/ATen/native/group_norm.cpp
 @@ -172,7 +172,7 @@ Tensor group_norm(
@@ -25,7 +25,7 @@ index db1d82f84f..527e04c582 100644
    const auto& gamma = weight.defined() ? weight.contiguous() : kEmpty;
    const auto& beta = bias.defined() ? bias.contiguous() : kEmpty;
 diff --git a/tools/autograd/derivatives.yaml b/tools/autograd/derivatives.yaml
-index 3fb18bd206..18236ea244 100644
+index 3fb18bd206d..18236ea244e 100644
 --- a/tools/autograd/derivatives.yaml
 +++ b/tools/autograd/derivatives.yaml
 @@ -1164,7 +1164,7 @@

…for-pin-memory-on-xpu-device-86545.patch …for-pin-memory-on-xpu-device-86545.patchtorch_patches/0003-add-support-for-pin-memory-on-xpu-device-86545.patch renamed to torch_patches/0002-add-support-for-pin-memory-on-xpu-device-86545.patch torch_patches/0003-add-support-for-pin-memory-on-xpu-device-86545.patch renamed to torch_patches/0002-add-support-for-pin-memory-on-xpu-device-86545.patch

@@ -1,7 +1,7 @@
-From 763de4eb63f883178735652545786cd0592d1a4a Mon Sep 17 00:00:00 2001
+From d3669bb6404ba61707d79d939afe647d08c165bf Mon Sep 17 00:00:00 2001
 From: leizhenyuan <zhenyuan.lei@intel.com>
 Date: Wed, 19 Oct 2022 13:24:48 +0000
-Subject: [PATCH 03/11] add support for pin memory on xpu device (#86545)
+Subject: [PATCH 02/15] add support for pin memory on xpu device (#86545)
 
 add support for pin memory on xpu device
 
@@ -13,7 +13,7 @@ Approved by: https://github.com/ezyang
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/torch/utils/data/_utils/pin_memory.py b/torch/utils/data/_utils/pin_memory.py
-index d3aa9118cb..466cf0c70e 100644
+index d3aa9118cb6..466cf0c70e2 100644
 --- a/torch/utils/data/_utils/pin_memory.py
 +++ b/torch/utils/data/_utils/pin_memory.py
 @@ -19,7 +19,10 @@ def _pin_memory_loop(in_queue, out_queue, device_id, done_event, device):
@@ -29,7 +29,7 @@ index d3aa9118cb..466cf0c70e 100644
      def do_one_step():
          try:
 diff --git a/torch/utils/data/dataloader.py b/torch/utils/data/dataloader.py
-index eac52ba29c..5dc0358ddc 100644
+index eac52ba29c8..5dc0358ddc7 100644
 --- a/torch/utils/data/dataloader.py
 +++ b/torch/utils/data/dataloader.py
 @@ -1040,10 +1040,14 @@ class _MultiProcessingDataLoaderIter(_BaseDataLoaderIter):

…-support-torch.save-and-torch.load.patch …-support-torch.save-and-torch.load.patchtorch_patches/0007-add-XPU-backend-to-support-torch.save-and-torch.load.patch renamed to torch_patches/0003-add-XPU-backend-to-support-torch.save-and-torch.load.patch torch_patches/0007-add-XPU-backend-to-support-torch.save-and-torch.load.patch renamed to torch_patches/0003-add-XPU-backend-to-support-torch.save-and-torch.load.patch

@@ -1,7 +1,7 @@
-From b165c779a466946bc2875953d275662e10b12930 Mon Sep 17 00:00:00 2001
+From 7ab45984c9a48f8b16adaa997486111bf689c4e2 Mon Sep 17 00:00:00 2001
 From: "Yu, Guangye" <guangye.yu@intel.com>
 Date: Wed, 30 Nov 2022 20:38:02 +0000
-Subject: [PATCH 07/11] add XPU backend to support torch.save and torch.load
+Subject: [PATCH 03/15] add XPU backend to support torch.save and torch.load
  (#89679)
 
 We need to add XPU backend to support torch.save and torch.load when parameter _use_new_zipfile_serialization=False.
@@ -25,7 +25,7 @@ Approved by: https://github.com/ezyang
  2 files changed, 25 insertions(+), 16 deletions(-)
 
 diff --git a/test/test_torch.py b/test/test_torch.py
-index 8de5b822d0..cadbcf4bcd 100644
+index 8de5b822d00..cadbcf4bcdd 100644
 --- a/test/test_torch.py
 +++ b/test/test_torch.py
 @@ -356,7 +356,7 @@ class TestTorchDeviceType(TestCase):
@@ -38,7 +38,7 @@ index 8de5b822d0..cadbcf4bcd 100644
 
          for device in ['cpu', 'cuda'] if torch.cuda.is_available() else ['cpu']:
 diff --git a/torch/csrc/serialization.cpp b/torch/csrc/serialization.cpp
-index 46f3a04f35..5cc88ad0f1 100644
+index 46f3a04f355..5cc88ad0f18 100644
 --- a/torch/csrc/serialization.cpp
 +++ b/torch/csrc/serialization.cpp
 @@ -1,6 +1,7 @@

…support-for-the-XPU-device-for-exp.patch …support-for-the-XPU-device-for-exp.patchtorch_patches/0001-Add-DLPack-oneAPI-support-for-the-XPU-device-for-exp.patch renamed to torch_patches/0004-Add-DLPack-oneAPI-support-for-the-XPU-device-for-exp.patch torch_patches/0001-Add-DLPack-oneAPI-support-for-the-XPU-device-for-exp.patch renamed to torch_patches/0004-Add-DLPack-oneAPI-support-for-the-XPU-device-for-exp.patch

@@ -1,7 +1,7 @@
-From bedd439a1447610754c5bd4089d5498b4b419df7 Mon Sep 17 00:00:00 2001
+From d63f3ba1156f5b7a9c040b6721d5874c613f59c1 Mon Sep 17 00:00:00 2001
 From: johnlu <chengjun.lu@intel.com>
 Date: Mon, 28 Mar 2022 20:49:03 +0800
-Subject: [PATCH 01/11] Add DLPack oneAPI support for the XPU device for
+Subject: [PATCH 04/15] Add DLPack oneAPI support for the XPU device for
  experimental.
 
 ---
@@ -20,7 +20,7 @@ Subject: [PATCH 01/11] Add DLPack oneAPI support for the XPU device for
  create mode 100644 aten/src/ATen/detail/XPUHooksInterface.h
 
 diff --git a/aten/src/ATen/Context.h b/aten/src/ATen/Context.h
-index 43f4433b7c..ea2cb3f41d 100644
+index 43f4433b7ce..ea2cb3f41db 100644
 --- a/aten/src/ATen/Context.h
 +++ b/aten/src/ATen/Context.h
 @@ -9,6 +9,7 @@
@@ -53,7 +53,7 @@ index 43f4433b7c..ea2cb3f41d 100644
  static inline size_t getNumGPUs() {
    // WARNING: DO NOT ADD LOGIC TO HANDLE OTHER DEVICE TYPES TO THIS
 diff --git a/aten/src/ATen/DLConvertor.cpp b/aten/src/ATen/DLConvertor.cpp
-index 614dc46158..817f983913 100644
+index 614dc46158e..817f9839137 100644
 --- a/aten/src/ATen/DLConvertor.cpp
 +++ b/aten/src/ATen/DLConvertor.cpp
 @@ -90,13 +90,17 @@ DLDevice getDLDevice(const Tensor& tensor, const int64_t& device_id) {
@@ -109,7 +109,7 @@ index 614dc46158..817f983913 100644
    return at::from_blob(
        src->dl_tensor.data,
 diff --git a/aten/src/ATen/Version.cpp b/aten/src/ATen/Version.cpp
-index 4b9da640fb..350480e213 100644
+index 4b9da640fb7..350480e2139 100644
 --- a/aten/src/ATen/Version.cpp
 +++ b/aten/src/ATen/Version.cpp
 @@ -195,6 +195,10 @@ std::string show_config() {
@@ -125,7 +125,7 @@ index 4b9da640fb..350480e213 100644
      if (!pair.second.empty()) {
 diff --git a/aten/src/ATen/detail/XPUHooksInterface.cpp b/aten/src/ATen/detail/XPUHooksInterface.cpp
 new file mode 100644
-index 0000000000..d740068379
+index 00000000000..d740068379d
 --- /dev/null
 +++ b/aten/src/ATen/detail/XPUHooksInterface.cpp
 @@ -0,0 +1,29 @@
@@ -160,7 +160,7 @@ index 0000000000..d740068379
 +} // namespace at
 diff --git a/aten/src/ATen/detail/XPUHooksInterface.h b/aten/src/ATen/detail/XPUHooksInterface.h
 new file mode 100644
-index 0000000000..ff42ca60d4
+index 00000000000..ff42ca60d49
 --- /dev/null
 +++ b/aten/src/ATen/detail/XPUHooksInterface.h
 @@ -0,0 +1,75 @@
@@ -240,7 +240,7 @@ index 0000000000..ff42ca60d4
 +} // namespace detail
 +} // namespace at
 diff --git a/aten/src/ATen/dlpack.h b/aten/src/ATen/dlpack.h
-index 0ad1e119bc..3d33935d31 100644
+index 0ad1e119bcb..3d33935d31a 100644
 --- a/aten/src/ATen/dlpack.h
 +++ b/aten/src/ATen/dlpack.h
 @@ -6,6 +6,9 @@
@@ -345,7 +345,7 @@ index 0ad1e119bc..3d33935d31 100644
    DLDataType dtype;
    /*! \brief The shape of the tensor */
 diff --git a/aten/src/ATen/ops/from_blob.h b/aten/src/ATen/ops/from_blob.h
-index 62f881fdc3..d6dea29a46 100644
+index 62f881fdc38..d6dea29a462 100644
 --- a/aten/src/ATen/ops/from_blob.h
 +++ b/aten/src/ATen/ops/from_blob.h
 @@ -127,10 +127,12 @@ inline Tensor from_blob(
@@ -363,7 +363,7 @@ index 62f881fdc3..d6dea29a46 100644
  }
 
 diff --git a/caffe2/python/dlpack.h b/caffe2/python/dlpack.h
-index 0ad1e119bc..3d33935d31 100644
+index 0ad1e119bcb..3d33935d31a 100644
 --- a/caffe2/python/dlpack.h
 +++ b/caffe2/python/dlpack.h
 @@ -6,6 +6,9 @@
@@ -468,7 +468,7 @@ index 0ad1e119bc..3d33935d31 100644
    DLDataType dtype;
    /*! \brief The shape of the tensor */
 diff --git a/torch/_tensor.py b/torch/_tensor.py
-index fd3f338d51..7ec31661b1 100644
+index fd3f338d514..7ec31661b1e 100644
 --- a/torch/_tensor.py
 +++ b/torch/_tensor.py
 @@ -1347,6 +1347,8 @@ class Tensor(torch._C._TensorBase):
@@ -481,7 +481,7 @@ index fd3f338d51..7ec31661b1 100644
              raise ValueError(
                  "Unknown device type {} for Dlpack".format(self.device.type)
 diff --git a/torch/utils/dlpack.py b/torch/utils/dlpack.py
-index ae0aafceb1..a48abcad76 100644
+index ae0aafceb17..a48abcad764 100644
 --- a/torch/utils/dlpack.py
 +++ b/torch/utils/dlpack.py
 @@ -18,6 +18,7 @@ class DLDeviceType(enum.IntEnum):

torch_patches/0005-remove-dlpack-dependency-106.patch

@@ -0,0 +1,87 @@
+From 29a49409cb2a2f02889e988d62f961e2b1535257 Mon Sep 17 00:00:00 2001
+From: "Yu, Guangye" <106960996+guangyey@users.noreply.github.com>
+Date: Thu, 30 Mar 2023 13:26:44 +0800
+Subject: [PATCH 05/15] remove dlpack dependency (#106)
+
+* remove dlpack dependency
+* rich comments
+---
+ aten/src/ATen/DLConvertor.cpp            |  2 +-
+ aten/src/ATen/detail/XPUHooksInterface.h | 11 ++++++++---
+ aten/src/ATen/dlpack.h                   |  5 ++++-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/aten/src/ATen/DLConvertor.cpp b/aten/src/ATen/DLConvertor.cpp
+index 817f9839137..c10b25a2298 100644
+--- a/aten/src/ATen/DLConvertor.cpp
++++ b/aten/src/ATen/DLConvertor.cpp
+@@ -92,7 +92,7 @@ DLDevice getDLDevice(const Tensor& tensor, const int64_t& device_id) {
+       break;
+     case DeviceType::XPU:
+       ctx = at::detail::getXPUHooks().getDLPackDeviceFromATenDevice(
+-          tensor.device(), tensor.data_ptr());
++          ctx, tensor.device(), tensor.data_ptr());
+       break;
+     default:
+       TORCH_CHECK(false, "Cannot pack tensors on " + tensor.device().str());
+diff --git a/aten/src/ATen/detail/XPUHooksInterface.h b/aten/src/ATen/detail/XPUHooksInterface.h
+index ff42ca60d49..584ccf8d8c4 100644
+--- a/aten/src/ATen/detail/XPUHooksInterface.h
++++ b/aten/src/ATen/detail/XPUHooksInterface.h
+@@ -1,6 +1,5 @@
+ #pragma once
+ 
+-#include <ATen/dlpack.h>
+ #include <c10/core/Device.h>
+ #include <c10/util/Exception.h>
+ 
+@@ -14,6 +13,11 @@ namespace at {
+ class Context;
+ }
+ 
++// We use forward declaration here instead of #include <ATen/dlpack.h> to avoid
++// leaking DLPack implementation detail to every project that includes `ATen/Context.h`, which in turn
++// would lead to a conflict when linked with another project using DLPack (for example TVM)
++struct DLDevice_;
++
+ namespace at {
+ 
+ constexpr const char* XPU_HELP =
+@@ -45,7 +49,7 @@ struct TORCH_API XPUHooksInterface {
+   }
+ 
+   virtual Device getATenDeviceFromDLPackDevice(
+-      const DLDevice& dl_device,
++      const DLDevice_& dl_device,
+       void* data) const {
+     TORCH_CHECK(
+         false,
+@@ -53,7 +57,8 @@ struct TORCH_API XPUHooksInterface {
+         XPU_HELP);
+   };
+ 
+-  virtual DLDevice getDLPackDeviceFromATenDevice(
++  virtual DLDevice_& getDLPackDeviceFromATenDevice(
++      DLDevice_& dl_device,
+       const Device& aten_device,
+       void* data) const {
+     TORCH_CHECK(
+diff --git a/aten/src/ATen/dlpack.h b/aten/src/ATen/dlpack.h
+index 3d33935d31a..ef6960b23a1 100644
+--- a/aten/src/ATen/dlpack.h
++++ b/aten/src/ATen/dlpack.h
+@@ -94,7 +94,10 @@ typedef enum {
+ /*!
+  * \brief A Device for Tensor and operator.
+  */
+-typedef struct {
++// NB: This is the only difference from
++// https://github.com/dmlc/dlpack/blob/v0.7/include/dlpack/dlpack.h Required to
++// allow forward declaration of DLDevice.
++typedef struct DLDevice_ {
+   /*! \brief The device type used in the device. */
+   DLDeviceType device_type;
+   /*!
+-- 
+2.25.1
+

…python-dictionary-in-torch.jit.tra.patch …python-dictionary-in-torch.jit.tra.patchtorch_patches/0008-Support-unpacking-python-dictionary-in-torch.jit.tra.patch renamed to torch_patches/0006-Support-unpacking-python-dictionary-in-torch.jit.tra.patch torch_patches/0008-Support-unpacking-python-dictionary-in-torch.jit.tra.patch renamed to torch_patches/0006-Support-unpacking-python-dictionary-in-torch.jit.tra.patch

@@ -1,7 +1,7 @@
-From 196157b08d6a177159db7657407ec0836207dbf7 Mon Sep 17 00:00:00 2001
+From 05a2efae11f38aa519739c800b5e2cd4d6b8defc Mon Sep 17 00:00:00 2001
 From: Stonepia <tong.su@intel.com>
 Date: Tue, 14 Feb 2023 12:55:42 +0800
-Subject: [PATCH 08/11] Support unpacking python dictionary in
+Subject: [PATCH 06/15] Support unpacking python dictionary in
  torch.jit.trace() (#81623) (#99)
 
 # Support unpacking python dictionary in **torch.jit.trace()**
@@ -71,7 +71,7 @@ Co-authored-by: tangleintel <lei1.tang@intel.com>
  7 files changed, 321 insertions(+), 38 deletions(-)
 
 diff --git a/test/test_jit.py b/test/test_jit.py
-index 055c990f85..ee168a1b33 100644
+index 055c990f859..ee168a1b339 100644
 --- a/test/test_jit.py
 +++ b/test/test_jit.py
 @@ -3027,6 +3027,46 @@ class TestFrontend(JitTestCase):
@@ -122,7 +122,7 @@ index 055c990f85..ee168a1b33 100644
  class TestScript(JitTestCase):
 
 diff --git a/torch/_C/__init__.pyi.in b/torch/_C/__init__.pyi.in
-index 9ed156886f..793edbc674 100644
+index 9ed156886f3..793edbc674f 100644
 --- a/torch/_C/__init__.pyi.in
 +++ b/torch/_C/__init__.pyi.in
 @@ -332,6 +332,15 @@ def _create_function_from_trace(
@@ -142,7 +142,7 @@ index 9ed156886f..793edbc674 100644
  def _last_executed_optimized_graph() -> Graph: ...
  def parse_type_comment(comment: str) -> Decl: ...
 diff --git a/torch/csrc/jit/python/pybind_utils.h b/torch/csrc/jit/python/pybind_utils.h
-index 694d2b8ee4..835c7d0dc7 100644
+index 694d2b8ee48..835c7d0dc70 100644
 --- a/torch/csrc/jit/python/pybind_utils.h
 +++ b/torch/csrc/jit/python/pybind_utils.h
 @@ -565,6 +565,17 @@ inline Stack toTraceableStack(const py::tuple& inputs) {
@@ -164,7 +164,7 @@ index 694d2b8ee4..835c7d0dc7 100644
    auto elems = c10::impl::GenericList(elem_type);
    for (auto elem : obj) {
 diff --git a/torch/csrc/jit/python/python_tracer.cpp b/torch/csrc/jit/python/python_tracer.cpp
-index 78676e2ed7..c89d54872a 100644
+index 78676e2ed77..c89d54872a0 100644
 --- a/torch/csrc/jit/python/python_tracer.cpp
 +++ b/torch/csrc/jit/python/python_tracer.cpp
 @@ -73,6 +73,69 @@ SourceRange getPythonInterpreterSourceRange() {
@@ -238,7 +238,7 @@ index 78676e2ed7..c89d54872a 100644
      const py::function& func,
      Stack trace_inputs,
 diff --git a/torch/csrc/jit/python/python_tracer.h b/torch/csrc/jit/python/python_tracer.h
-index 3f1fca20bf..6ec9dc388c 100644
+index 3f1fca20bfe..6ec9dc388c3 100644
 --- a/torch/csrc/jit/python/python_tracer.h
 +++ b/torch/csrc/jit/python/python_tracer.h
 @@ -24,6 +24,16 @@ Node* preRecordPythonTrace(
@@ -259,7 +259,7 @@ index 3f1fca20bf..6ec9dc388c 100644
      const py::function& func,
      Stack inputs,
 diff --git a/torch/csrc/jit/python/script_init.cpp b/torch/csrc/jit/python/script_init.cpp
-index 110c2f4a70..ee95095889 100644
+index 110c2f4a70c..ee950958893 100644
 --- a/torch/csrc/jit/python/script_init.cpp
 +++ b/torch/csrc/jit/python/script_init.cpp
 @@ -1218,6 +1218,43 @@ void initJitScriptBindings(PyObject* module) {
@@ -351,7 +351,7 @@ index 110c2f4a70..ee95095889 100644
        "_jit_script_class_compile",
        [](const std::string& qualifiedName,
 diff --git a/torch/jit/_trace.py b/torch/jit/_trace.py
-index fe0091f63b..b4352648df 100644
+index fe0091f63bb..b4352648df9 100644
 --- a/torch/jit/_trace.py
 +++ b/torch/jit/_trace.py
 @@ -316,6 +316,7 @@ def _check_trace(

…XPU-to-register-new-tensor-type-87.patch …XPU-to-register-new-tensor-type-87.patchtorch_patches/0009-Add-API-for-intel-XPU-to-register-new-tensor-type-87.patch renamed to torch_patches/0007-Add-API-for-intel-XPU-to-register-new-tensor-type-87.patch torch_patches/0009-Add-API-for-intel-XPU-to-register-new-tensor-type-87.patch renamed to torch_patches/0007-Add-API-for-intel-XPU-to-register-new-tensor-type-87.patch

@@ -1,7 +1,7 @@
-From 81caf18513132fb25d2b3bbd1b728086ad9f6e8b Mon Sep 17 00:00:00 2001
+From 4930caf206be3425947f4df914c8a5e52c00ba9b Mon Sep 17 00:00:00 2001
 From: majing <jing1.ma@intel.com>
 Date: Fri, 18 Nov 2022 15:40:13 +0800
-Subject: [PATCH 09/11] Add API for intel XPU to register new tensor type (#87)
+Subject: [PATCH 07/15] Add API for intel XPU to register new tensor type (#87)
 
 Co-authored-by: chengjunlu <chengjun.lu@intel.com>
 ---
@@ -12,7 +12,7 @@ Co-authored-by: chengjunlu <chengjun.lu@intel.com>
  4 files changed, 90 insertions(+), 73 deletions(-)
 
 diff --git a/torch/csrc/tensor/python_tensor.cpp b/torch/csrc/tensor/python_tensor.cpp
-index 648fd04186..4d6778a7b0 100644
+index 648fd041868..4d6778a7b08 100644
 --- a/torch/csrc/tensor/python_tensor.cpp
 +++ b/torch/csrc/tensor/python_tensor.cpp
 @@ -60,8 +60,7 @@ static_assert(
@@ -225,7 +225,7 @@ index 648fd04186..4d6778a7b0 100644
  }
 
 diff --git a/torch/csrc/tensor/python_tensor.h b/torch/csrc/tensor/python_tensor.h
-index ab74e05341..5827f3b4ce 100644
+index ab74e053419..5827f3b4ce3 100644
 --- a/torch/csrc/tensor/python_tensor.h
 +++ b/torch/csrc/tensor/python_tensor.h
 @@ -4,6 +4,11 @@
@@ -251,7 +251,7 @@ index ab74e05341..5827f3b4ce 100644
  //
  // TODO: This is nuts!  There is no reason to let the default tensor type id
 diff --git a/torch/csrc/utils/tensor_types.cpp b/torch/csrc/utils/tensor_types.cpp
-index 8a20c93d87..0d3c6c1f31 100644
+index 8a20c93d87a..0d3c6c1f31d 100644
 --- a/torch/csrc/utils/tensor_types.cpp
 +++ b/torch/csrc/utils/tensor_types.cpp
 @@ -19,7 +19,7 @@ using namespace at;
@@ -264,7 +264,7 @@ index 8a20c93d87..0d3c6c1f31 100644
      case at::Backend::CPU:
        return "torch";
 diff --git a/torch/csrc/utils/tensor_types.h b/torch/csrc/utils/tensor_types.h
-index b45c284c9c..729b3e326f 100644
+index b45c284c9c1..729b3e326f1 100644
 --- a/torch/csrc/utils/tensor_types.h
 +++ b/torch/csrc/utils/tensor_types.h
 @@ -8,6 +8,7 @@