From e793a0f9946e852707f5ab50dada66c661714786 Mon Sep 17 00:00:00 2001
From: jeswan <57466294+jeswan@users.noreply.github.com>
Date: Mon, 26 Oct 2020 19:57:20 -0700
Subject: [PATCH] bump torch>=1.5.0. bump transformers==3.1.0. notebook
 installation switched to local pip install. (#1218)

---
 examples/notebooks/jiant_Basic_Example.ipynb  | 21 +++----------------
 .../jiant_MNLI_Diagnostic_Example.ipynb       | 21 +++----------------
 .../notebooks/jiant_Multi_Task_Example.ipynb  | 21 +++----------------
 examples/notebooks/jiant_STILTs_Example.ipynb | 21 +++----------------
 examples/notebooks/jiant_XNLI_Example.ipynb   | 21 +++----------------
 requirements-no-torch.txt                     |  2 +-
 requirements.txt                              |  2 +-
 setup.py                                      |  4 ++--
 8 files changed, 19 insertions(+), 94 deletions(-)

diff --git a/examples/notebooks/jiant_Basic_Example.ipynb b/examples/notebooks/jiant_Basic_Example.ipynb
index 09bb04d8c..30ef81a05 100644
--- a/examples/notebooks/jiant_Basic_Example.ipynb
+++ b/examples/notebooks/jiant_Basic_Example.ipynb
@@ -56,24 +56,9 @@
    "source": [
     "%%capture\n",
     "!git clone https://github.com/nyu-mll/jiant.git\n",
-    "%cd jiant && git checkout tags/2.0.0"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "hMUKEH2YvFPv"
-   },
-   "outputs": [],
-   "source": [
-    "%%capture\n",
-    "# This Colab notebook already has its CUDA-runtime compatible versions of torch and torchvision installed\n",
-    "!pip install -r jiant/requirements-no-torch.txt\n",
-    "# Install pyarrow for nlp\n",
-    "!pip install pyarrow==0.16.0"
+    "%cd jiant\n",
+    "!pip install -r requirements-no-torch.txt\n",
+    "!pip install --no-deps -e ./"
    ]
   },
   {
diff --git a/examples/notebooks/jiant_MNLI_Diagnostic_Example.ipynb b/examples/notebooks/jiant_MNLI_Diagnostic_Example.ipynb
index 182dd7a7b..5caec04ee 100644
--- a/examples/notebooks/jiant_MNLI_Diagnostic_Example.ipynb
+++ b/examples/notebooks/jiant_MNLI_Diagnostic_Example.ipynb
@@ -42,24 +42,9 @@
    "source": [
     "%%capture\n",
     "!git clone https://github.com/nyu-mll/jiant.git\n",
-    "%cd jiant && git checkout tags/2.0.0"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "hMUKEH2YvFPv"
-   },
-   "outputs": [],
-   "source": [
-    "%%capture\n",
-    "# This Colab notebook already has its CUDA-runtime compatible versions of torch and torchvision installed\n",
-    "!pip install -r jiant/requirements-no-torch.txt\n",
-    "# Install pyarrow for nlp\n",
-    "!pip install pyarrow==0.16.0"
+    "%cd jiant\n",
+    "!pip install -r requirements-no-torch.txt\n",
+    "!pip install --no-deps -e ./"
    ]
   },
   {
diff --git a/examples/notebooks/jiant_Multi_Task_Example.ipynb b/examples/notebooks/jiant_Multi_Task_Example.ipynb
index 184290429..d4b41e674 100644
--- a/examples/notebooks/jiant_Multi_Task_Example.ipynb
+++ b/examples/notebooks/jiant_Multi_Task_Example.ipynb
@@ -60,24 +60,9 @@
    "source": [
     "%%capture\n",
     "!git clone https://github.com/nyu-mll/jiant.git\n",
-    "%cd jiant && git checkout tags/2.0.0"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "hMUKEH2YvFPv"
-   },
-   "outputs": [],
-   "source": [
-    "%%capture\n",
-    "# This Colab notebook already has its CUDA-runtime compatible versions of torch and torchvision installed\n",
-    "!pip install -r jiant/requirements-no-torch.txt\n",
-    "# Install pyarrow for nlp\n",
-    "!pip install pyarrow==0.16.0"
+    "%cd jiant\n",
+    "!pip install -r requirements-no-torch.txt\n",
+    "!pip install --no-deps -e ./"
    ]
   },
   {
diff --git a/examples/notebooks/jiant_STILTs_Example.ipynb b/examples/notebooks/jiant_STILTs_Example.ipynb
index 9ff9f9cd6..03c32ca18 100644
--- a/examples/notebooks/jiant_STILTs_Example.ipynb
+++ b/examples/notebooks/jiant_STILTs_Example.ipynb
@@ -62,24 +62,9 @@
    "source": [
     "%%capture\n",
     "!git clone https://github.com/nyu-mll/jiant.git\n",
-    "%cd jiant && git checkout tags/2.0.0"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "hMUKEH2YvFPv"
-   },
-   "outputs": [],
-   "source": [
-    "%%capture\n",
-    "# This Colab notebook already has its CUDA-runtime compatible versions of torch and torchvision installed\n",
-    "!pip install -r jiant/requirements-no-torch.txt\n",
-    "# Install pyarrow for nlp\n",
-    "!pip install pyarrow==0.16.0"
+    "%cd jiant\n",
+    "!pip install -r requirements-no-torch.txt\n",
+    "!pip install --no-deps -e ./"
    ]
   },
   {
diff --git a/examples/notebooks/jiant_XNLI_Example.ipynb b/examples/notebooks/jiant_XNLI_Example.ipynb
index 02883af8a..d7e7e84da 100644
--- a/examples/notebooks/jiant_XNLI_Example.ipynb
+++ b/examples/notebooks/jiant_XNLI_Example.ipynb
@@ -63,24 +63,9 @@
    "source": [
     "%%capture\n",
     "!git clone https://github.com/nyu-mll/jiant.git\n",
-    "%cd jiant && git checkout tags/2.0.0"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "hMUKEH2YvFPv"
-   },
-   "outputs": [],
-   "source": [
-    "%%capture\n",
-    "# This Colab notebook already has its CUDA-runtime compatible versions of torch and torchvision installed\n",
-    "!pip install -r jiant/requirements-no-torch.txt\n",
-    "# Install pyarrow for nlp\n",
-    "!pip install pyarrow==0.16.0"
+    "%cd jiant\n",
+    "!pip install -r requirements-no-torch.txt\n",
+    "!pip install --no-deps -e ./"
    ]
   },
   {
diff --git a/requirements-no-torch.txt b/requirements-no-torch.txt
index 33619155d..b29eda527 100644
--- a/requirements-no-torch.txt
+++ b/requirements-no-torch.txt
@@ -15,4 +15,4 @@ scipy==1.4.1
 sentencepiece==0.1.86
 tokenizers==0.8.1.rc2
 tqdm==4.46.0
-transformers==3.0.2
+transformers==3.1.0
diff --git a/requirements.txt b/requirements.txt
index 618044889..99a76a076 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 -r requirements-no-torch.txt
-torch==1.5.0
+torch>=1.5.0
 torchvision==0.6.0
diff --git a/setup.py b/setup.py
index 1a627b8b2..f15d64133 100644
--- a/setup.py
+++ b/setup.py
@@ -68,9 +68,9 @@
         "scipy == 1.4.1",
         "sentencepiece == 0.1.86",
         "tokenizers == 0.8.1.rc2",
-        "torch == 1.5.0",
+        "torch >= 1.5.0",
         "tqdm == 4.46.0",
-        "transformers == 3.0.2",
+        "transformers == 3.1.0",
         "torchvision == 0.6.0",
     ],
     extras_require=extras,