Merge branch 'master' into patch-2

SethHWeidman · web-flow · commit 5094aac4c2f1 · 2019-08-16T15:43:00.000-07:00
diff --git a/advanced_source/torch_script_custom_ops.rst b/advanced_source/torch_script_custom_ops.rst
@@ -170,7 +170,7 @@ Registration is very simple. For our case, we need to write:
 .. code-block:: cpp
 
   static auto registry =
-    torch::jit::RegisterOperators("my_ops::warp_perspective", &warp_perspective);
+    torch::RegisterOperators("my_ops::warp_perspective", &warp_perspective);
 
 somewhere in the global scope of our ``op.cpp`` file. This creates a global
 variable ``registry``, which will register our operator with TorchScript in its
@@ -188,7 +188,7 @@ operator name are separated by two colons (``::``).
   .. code-block:: cpp
 
     static auto registry =
-      torch::jit::RegisterOperators("my_ops::warp_perspective", &warp_perspective)
+      torch::RegisterOperators("my_ops::warp_perspective", &warp_perspective)
       .op("my_ops::another_op", &another_op)
       .op("my_ops::and_another_op", &and_another_op);
 
@@ -982,7 +982,7 @@ custom TorchScript operator as a string. For this, use
   }
 
   static auto registry =
-    torch::jit::RegisterOperators("my_ops::warp_perspective", &warp_perspective);
+    torch::RegisterOperators("my_ops::warp_perspective", &warp_perspective);
   """
 
   torch.utils.cpp_extension.load_inline(
diff --git a/beginner_source/data_loading_tutorial.py b/beginner_source/data_loading_tutorial.py
@@ -136,6 +136,9 @@ def __len__(self):
         return len(self.landmarks_frame)
 
     def __getitem__(self, idx):
+        if torch.is_tensor(idx):
+            idx = idx.tolist()
+
         img_name = os.path.join(self.root_dir,
                                 self.landmarks_frame.iloc[idx, 0])
         image = io.imread(img_name)
