From 626e410e1dedcdb9d5a410a8827cc7a8a9fbcce1 Mon Sep 17 00:00:00 2001
From: Natalia Gimelshein <ngimel@fb.com>
Date: Sun, 6 Sep 2020 20:59:30 -0700
Subject: [PATCH] Revert D23544563: Benchmarks: re-enable profiling-te
 configuration.

Test Plan: revert-hammer

Differential Revision:
D23544563 (https://github.com/pytorch/pytorch/commit/ac1f471fe20faf96282b4143e4193759f01a7d41)

Original commit changeset: 98659e8860fa

fbshipit-source-id: 5dab7044699f59c709e64d178758f5f462ebb788
---
 .jenkins/pytorch/test.sh          |  6 ++----
 benchmarks/fastrnns/conftest.py   | 17 -----------------
 benchmarks/fastrnns/test_bench.py | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 benchmarks/fastrnns/conftest.py

diff --git a/.jenkins/pytorch/test.sh b/.jenkins/pytorch/test.sh
index 12ebe6298a1..ec411ac4a14 100755
--- a/.jenkins/pytorch/test.sh
+++ b/.jenkins/pytorch/test.sh
@@ -338,10 +338,8 @@ test_benchmarks() {
     pip_install --user "requests"
     BENCHMARK_DATA="benchmarks/.data"
     mkdir -p ${BENCHMARK_DATA}
-    pytest benchmarks/fastrnns/test_bench.py --benchmark-sort=Name --benchmark-json=${BENCHMARK_DATA}/fastrnns_legacy_old.json --fuser=old --executor=legacy
-    python benchmarks/upload_scribe.py --pytest_bench_json ${BENCHMARK_DATA}/fastrnns_legacy_old.json
-    pytest benchmarks/fastrnns/test_bench.py --benchmark-sort=Name --benchmark-json=${BENCHMARK_DATA}/fastrnns_profiling_te.json --fuser=te --executor=profiling
-    python benchmarks/upload_scribe.py --pytest_bench_json ${BENCHMARK_DATA}/fastrnns_profiling_te.json
+    pytest benchmarks/fastrnns/test_bench.py --benchmark-sort=Name --benchmark-json=${BENCHMARK_DATA}/fastrnns.json
+    python benchmarks/upload_scribe.py --pytest_bench_json ${BENCHMARK_DATA}/fastrnns.json
     assert_git_not_dirty
   fi
 }
diff --git a/benchmarks/fastrnns/conftest.py b/benchmarks/fastrnns/conftest.py
deleted file mode 100644
index b72d729718a..00000000000
--- a/benchmarks/fastrnns/conftest.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import pytest  # noqa: F401
-
-default_rnns = ['cudnn', 'aten', 'jit', 'jit_premul', 'jit_premul_bias', 'jit_simple',
-                         'jit_multilayer', 'py']
-default_cnns = ['resnet18', 'resnet18_jit', 'resnet50', 'resnet50_jit']
-all_nets = default_rnns + default_cnns
-
-def pytest_generate_tests(metafunc):
-    # This creates lists of tests to generate, can be customized
-    if metafunc.cls.__name__ == "TestBenchNetwork":
-        metafunc.parametrize('net_name', all_nets, scope="class")
-        metafunc.parametrize("executor", [metafunc.config.getoption("executor")], scope="class")
-        metafunc.parametrize("fuser", [metafunc.config.getoption("fuser")], scope="class")
-
-def pytest_addoption(parser):
-    parser.addoption("--fuser", default="old", help="fuser to use for benchmarks")
-    parser.addoption("--executor", default="legacy", help="executor to use for benchmarks")
diff --git a/benchmarks/fastrnns/test_bench.py b/benchmarks/fastrnns/test_bench.py
index e21f35316bf..6063626d7df 100644
--- a/benchmarks/fastrnns/test_bench.py
+++ b/benchmarks/fastrnns/test_bench.py
@@ -4,8 +4,20 @@ import torch
 from .fuser import set_fuser
 from .runner import get_nn_runners
 
+default_rnns = ['cudnn', 'aten', 'jit', 'jit_premul', 'jit_premul_bias', 'jit_simple',
+                         'jit_multilayer', 'py']
+default_cnns = ['resnet18', 'resnet18_jit', 'resnet50', 'resnet50_jit']
+all_nets = default_rnns + default_cnns
+
+def pytest_generate_tests(metafunc):
+    # This creates lists of tests to generate, can be customized
+    if metafunc.cls.__name__ == "TestBenchNetwork":
+        metafunc.parametrize('net_name', all_nets, scope="class")
+        metafunc.parametrize("executor_and_fuser", ["legacy-old"], scope="class")
+
 @pytest.fixture(scope='class')
-def modeldef(request, net_name, executor, fuser):
+def modeldef(request, net_name, executor_and_fuser):
+    executor, fuser = executor_and_fuser.split("-")
     set_fuser(fuser, executor)
 
     # Given a 'net_name' provided by generate_tests, build the thing