From 28301e418d601ac6f1c9217508c97a3faf3c1b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=96=96=20Randall=20Hunt=F0=9F=96=96?= <ranman@fb.com>
Date: Tue, 23 Feb 2021 11:56:38 -0800
Subject: [PATCH 1/2] use more modern python for devcontainer

---
 .devcontainer/Dockerfile        |  7 ++++---
 .devcontainer/devcontainer.json | 37 +++++++++++++++------------------
 build.sh                        |  0
 3 files changed, 21 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 build.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3ca67455049..4928e536acf 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,7 +1,8 @@
-FROM python:3.6-slim
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.8
 
-COPY requirements.txt requirements.txt
+COPY requirements.txt /tmp/pip-tmp/
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get install git gcc unzip make -y \
-    && pip install --no-cache-dir -r requirements.txt
\ No newline at end of file
+    && pip3 install --disable-pip-version-check --no-cache-dir -r /tmp/pip-tmp/requirements.txt \
+    && rm -rf /tmp/pip-tmp
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a0212d506ff..86fe20483c5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,21 +1,18 @@
 {
-    "name": "PyTorch",
-    "build": { 
-		"context": "..",
-		"dockerfile": "Dockerfile",
-		"args": { }
-	},
-	"settings": { 
-        "terminal.integrated.shell.linux": "/bin/bash",
-        "workbench.startupEditor": "none",
-        "files.autoSave": "afterDelay",
-        "python.dataScience.enabled": true,
-        "python.dataScience.alwaysTrustNotebooks": true,
-        "python.insidersChannel": "weekly",
-        "python.showStartPage": false
-	},
-	"extensions": [
-        "ms-python.python",
-        "lextudio.restructuredtext"
-	]
-}
\ No newline at end of file
+  "name": "PyTorch Tutorials",
+  "build": {
+    "context": "..",
+    "dockerfile": "Dockerfile",
+    "args": {}
+  },
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "workbench.startupEditor": "none",
+    "files.autoSave": "afterDelay",
+    "python.dataScience.enabled": true,
+    "python.dataScience.alwaysTrustNotebooks": true,
+    "python.insidersChannel": "weekly",
+    "python.showStartPage": false
+  },
+  "extensions": ["ms-python.python", "lextudio.restructuredtext"]
+}
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755

From bc5263995ee5e7e4063a9d413fcdef39bf2b4fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=96=96=20Randall=20Hunt=F0=9F=96=96?= <ranman@fb.com>
Date: Tue, 23 Feb 2021 14:50:50 -0800
Subject: [PATCH 2/2] update to cuda10.2 for circleci builds

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b98224b82f4..fe1c5aa96df 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,7 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
         sudo pip -q install awscli==1.16.35
 
         if [ -n "${CUDA_VERSION}" ]; then
-          DRIVER_FN="NVIDIA-Linux-x86_64-440.59.run"
+          DRIVER_FN="NVIDIA-Linux-x86_64-460.39.run"
           wget "https://s3.amazonaws.com/ossci-linux/nvidia_driver/$DRIVER_FN"
           sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
           nvidia-smi
@@ -122,7 +122,7 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
       command: |
         set -e
 
-        export pyTorchDockerImageTag=291
+        export pyTorchDockerImageTag=9de29bef4a5dc0dd1dd19428d83e5a66a44a1ed2
         echo "PyTorchDockerImageTag: "${pyTorchDockerImageTag}
 
         cat >/home/circleci/project/ci_build_script.sh \<<EOL
@@ -171,14 +171,14 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
 
 pytorch_tutorial_build_worker_defaults: &pytorch_tutorial_build_worker_defaults
   environment:
-    DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
+    DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7"
     CUDA_VERSION: "9"
   resource_class: gpu.medium
   <<: *pytorch_tutorial_build_defaults
 
 pytorch_tutorial_build_manager_defaults: &pytorch_tutorial_build_manager_defaults
   environment:
-    DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
+    DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7"
   resource_class: medium
   <<: *pytorch_tutorial_build_defaults