Fix strict_glue_format filename clash (#880)

* Rename namespaces to suppress warnings.

* Revert "Rename namespaces to suppress warnings."

This reverts commit 0cf7b23.

* Initial attempt.

* Fix write_strict_glue_format filename clash

* Whitespace

Author: sleepinyourhat

config/defaults.conf

@@ -204,8 +204,8 @@ write_preds = 0  // 0 _or_ comma-separated list of splits (without spaces, optio
                  // Supported for GLUE tasks and a few others. You should see errors with
                  // unsupported tasks.
 write_strict_glue_format = 0  // If true, write_preds will only write the 'index' and 'prediction'
-                              // columns for GLUE tasks, and will use the filenames expected by
-                              // the GLUE evaluation server.
+                              // columns for GLUE/SuperGLUE tasks, and will use the test filenames
+                              // expected by the GLUE evaluation server.
 
 
 // Preprocessing //

jiant/evaluate.py

@@ -246,9 +246,15 @@ def write_preds(
 
 def _get_pred_filename(task_name, pred_dir, split_name, strict_glue_format):
     if strict_glue_format and task_name in GLUE_NAME_MAP:
-        file = GLUE_NAME_MAP[task_name] + ".tsv"
+        if split_name == "test":
+            file = "%s.tsv" % (GLUE_NAME_MAP[task_name])
+        else:
+            file = "%s_%s.tsv" % (GLUE_NAME_MAP[task_name], split_name)
     elif strict_glue_format and task_name in SUPERGLUE_NAME_MAP:
-        file = SUPERGLUE_NAME_MAP[task_name] + ".jsonl"
+        if split_name == "test":
+            file = "%s.jsonl" % (SUPERGLUE_NAME_MAP[task_name])
+        else:
+            file = "%s_%s.jsonl" % (SUPERGLUE_NAME_MAP[task_name], split_name)
     else:
         file = "%s_%s.tsv" % (task_name, split_name)
     return os.path.join(pred_dir, file)