Merge branch 'master' into patch-1

Author: holly1238

.circleci/scripts/build_for_windows.sh

@@ -37,8 +37,7 @@ pip install -r requirements.txt
 pip install pySoundFile
 # Force uninstall torch & related packages, we'll install them using conda later.
 pip uninstall -y torch torchvision torchtext
-conda install -yq -c pytorch "cudatoolkit=10.1" pytorch torchvision torchtext
-conda install torchaudio -c pytorch-test
+conda install -yq -c pytorch "cudatoolkit=10.1" pytorch torchvision torchtext torchaudio
 python -m spacy download de
 python -m spacy download en
 pushd ${PROJECT_DIR}

.jenkins/build.sh

@@ -48,9 +48,9 @@ if [[ "${JOB_BASE_NAME}" == *worker_* ]]; then
   # Step 1: Remove runnable code from tutorials that are not supposed to be run
   python $DIR/remove_runnable_code.py beginner_source/aws_distributed_training_tutorial.py beginner_source/aws_distributed_training_tutorial.py || true
   # python $DIR/remove_runnable_code.py advanced_source/ddp_pipeline_tutorial.py advanced_source/ddp_pipeline_tutorial.py || true
-  # Temp remove for mnist download issue. 
-  python $DIR/remove_runnable_code.py beginner_source/fgsm_tutorial.py beginner_source/fgsm_tutorial.py || true
-  python $DIR/remove_runnable_code.py intermediate_source/spatial_transformer_tutorial.py intermediate_source/spatial_transformer_tutorial.py || true
+  # Temp remove for mnist download issue. (Re-enabled for 1.8.1)
+  # python $DIR/remove_runnable_code.py beginner_source/fgsm_tutorial.py beginner_source/fgsm_tutorial.py || true
+  # python $DIR/remove_runnable_code.py intermediate_source/spatial_transformer_tutorial.py intermediate_source/spatial_transformer_tutorial.py || true
 
   # TODO: Fix bugs in these tutorials to make them runnable again
   # python $DIR/remove_runnable_code.py beginner_source/audio_classifier_tutorial.py beginner_source/audio_classifier_tutorial.py || true

README.md

@@ -35,4 +35,3 @@ In case you prefer to write your tutorial in jupyter, you can use [this script](
 * You can find information about contributing to PyTorch documentation in the 
 PyTorch Repo [README.md](https://github.com/pytorch/pytorch/blob/master/README.md) file. 
 * Additional information can be found in [PyTorch CONTRIBUTING.md](https://github.com/pytorch/pytorch/blob/master/CONTRIBUTING.md).
-

_static/torchvision_finetuning_instance_segmentation.ipynb

@@ -1448,7 +1448,7 @@
         "        self.masks = list(sorted(os.listdir(os.path.join(root, \"PedMasks\"))))\n",
         "\n",
         "    def __getitem__(self, idx):\n",
-        "        # load images ad masks\n",
+        "        # load images and masks\n",
         "        img_path = os.path.join(self.root, \"PNGImages\", self.imgs[idx])\n",
         "        mask_path = os.path.join(self.root, \"PedMasks\", self.masks[idx])\n",
         "        img = Image.open(img_path).convert(\"RGB\")\n",

_static/tv-training-code.py

@@ -25,7 +25,7 @@ def __init__(self, root, transforms):
         self.masks = list(sorted(os.listdir(os.path.join(root, "PedMasks"))))
 
     def __getitem__(self, idx):
-        # load images ad masks
+        # load images and masks
         img_path = os.path.join(self.root, "PNGImages", self.imgs[idx])
         mask_path = os.path.join(self.root, "PedMasks", self.masks[idx])
         img = Image.open(img_path).convert("RGB")

advanced_source/cpp_extension.rst

@@ -326,7 +326,7 @@ For our extensions, the necessary binding code spans only four lines:
 
 One bit to note here is the macro ``TORCH_EXTENSION_NAME``. The torch extension
 build will define it as the name you give your extension in the ``setup.py``
-script. In this case, the value of ``TORCH_EXTENSION_NAME`` would be "lltm".
+script. In this case, the value of ``TORCH_EXTENSION_NAME`` would be "lltm_cpp".
 This is to avoid having to maintain the name of the extension in two places
 (the build script and your C++ code), as a mismatch between the two can lead to
 nasty and hard to track issues.