From e7726a0a694f2fd56a6c753eaf18aa1d9e81fe85 Mon Sep 17 00:00:00 2001
From: Dirk Groeneveld <dirkg@allenai.org>
Date: Mon, 9 Mar 2020 13:38:51 -0700
Subject: [PATCH 1/2] Brings the qanet config up to date

---
 requirements.txt              |  2 +-
 setup.py                      |  2 +-
 training_config/qanet.jsonnet | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4c599847..c4abd2ee 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # To be changed to allennlp>=1.0 once that's released.
-git+https://github.com/allenai/allennlp.git@4749fc3
+git+https://github.com/allenai/allennlp.git@b420689
 
 word2number>=1.1
 py-rouge==1.1
diff --git a/setup.py b/setup.py
index 8de8e64b..65ce9eda 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
         #
         # As a mitigation, run `pip uninstall allennlp` before installing this
         # package.
-        sha = "4749fc3"
+        sha = "b420689"
         requirement = f"allennlp @ git+https://github.com/allenai/allennlp@{sha}#egg=allennlp"
         install_requirements.append(requirement)
 
diff --git a/training_config/qanet.jsonnet b/training_config/qanet.jsonnet
index 14de1352..739e8f2b 100644
--- a/training_config/qanet.jsonnet
+++ b/training_config/qanet.jsonnet
@@ -111,15 +111,17 @@
             "attention_dropout_prob": 0
         },
         "dropout_prob": 0.1,
-        "regularizer": [
-            [
-                ".*",
-                {
-                    "type": "l2",
-                    "alpha": 1e-07
-                }
+        "regularizer": {
+            "regexes": [
+                [
+                    ".*",
+                    {
+                        "type": "l2",
+                        "alpha": 1e-07
+                    }
+                ]
             ]
-        ]
+        }
     },
   "data_loader": {
     "batch_sampler": {
@@ -147,4 +149,4 @@
             "decay": 0.9999
         }
     }
-}
\ No newline at end of file
+}

From 0be9da73b463541ad0c005c668d87e6719c61460 Mon Sep 17 00:00:00 2001
From: Dirk Groeneveld <dirkg@allenai.org>
Date: Mon, 9 Mar 2020 13:56:09 -0700
Subject: [PATCH 2/2] Switch to version of allennlp that uses the new
 transformer

---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c4abd2ee..816906fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # To be changed to allennlp>=1.0 once that's released.
-git+https://github.com/allenai/allennlp.git@b420689
+git+https://github.com/allenai/allennlp.git@c5a56a1d68d2520978d1f03e4f8f2728991ab207
 
 word2number>=1.1
 py-rouge==1.1
diff --git a/setup.py b/setup.py
index 65ce9eda..99864049 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
         #
         # As a mitigation, run `pip uninstall allennlp` before installing this
         # package.
-        sha = "b420689"
+        sha = "c5a56a1d68d2520978d1f03e4f8f2728991ab207"
         requirement = f"allennlp @ git+https://github.com/allenai/allennlp@{sha}#egg=allennlp"
         install_requirements.append(requirement)