From 62d5bdcb7fb1781cdc1cefe4fd0743746a3e451f Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Mon, 25 Jan 2021 03:45:40 -0600
Subject: [PATCH] Reduced the number of default knobs

---
 predtuner/approxes/default_approx_params.json | 208 ------------------
 test/test_torchapp.py                         |   2 +-
 2 files changed, 1 insertion(+), 209 deletions(-)

diff --git a/predtuner/approxes/default_approx_params.json b/predtuner/approxes/default_approx_params.json
index b0046a7..8e55440 100644
--- a/predtuner/approxes/default_approx_params.json
+++ b/predtuner/approxes/default_approx_params.json
@@ -5,150 +5,6 @@
     "class": "FP16Approx",
     "name": "12",
     "exp_speedup": 1.5
-}, {
-    "direction_is_row": false,
-    "stride": 2,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "121",
-    "exp_speedup": 2.0
-}, {
-    "direction_is_row": false,
-    "stride": 2,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "122",
-    "exp_speedup": 2.0
-}, {
-    "direction_is_row": true,
-    "stride": 2,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "123",
-    "exp_speedup": 2.0
-}, {
-    "direction_is_row": true,
-    "stride": 2,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "124",
-    "exp_speedup": 2.0
-}, {
-    "direction_is_row": false,
-    "stride": 3,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "125",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": false,
-    "stride": 3,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "126",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": false,
-    "stride": 3,
-    "offset": 2,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "127",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": true,
-    "stride": 3,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "128",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": true,
-    "stride": 3,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "129",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": true,
-    "stride": 3,
-    "offset": 2,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "130",
-    "exp_speedup": 1.5
-}, {
-    "direction_is_row": false,
-    "stride": 4,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "131",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": false,
-    "stride": 4,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "132",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": false,
-    "stride": 4,
-    "offset": 2,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "133",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": false,
-    "stride": 4,
-    "offset": 3,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "134",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": true,
-    "stride": 4,
-    "offset": 0,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "135",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": true,
-    "stride": 4,
-    "offset": 1,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "136",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": true,
-    "stride": 4,
-    "offset": 2,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "137",
-    "exp_speedup": 1.33
-}, {
-    "direction_is_row": true,
-    "stride": 4,
-    "offset": 3,
-    "use_fp16": false,
-    "class": "PerforateConv2dStride",
-    "name": "138",
-    "exp_speedup": 1.33
 }, {
     "direction_is_row": false,
     "stride": 2,
@@ -293,70 +149,6 @@
     "class": "PerforateConv2dStride",
     "name": "168",
     "exp_speedup": 2.0
-}, {
-    "skip_every": 2,
-    "skip_offset": 0,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "231",
-    "exp_speedup": 2.0
-}, {
-    "skip_every": 2,
-    "skip_offset": 1,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "232",
-    "exp_speedup": 2.0
-}, {
-    "skip_every": 3,
-    "skip_offset": 0,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "233",
-    "exp_speedup": 1.5
-}, {
-    "skip_every": 3,
-    "skip_offset": 1,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "234",
-    "exp_speedup": 1.5
-}, {
-    "skip_every": 3,
-    "skip_offset": 2,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "235",
-    "exp_speedup": 1.5
-}, {
-    "skip_every": 4,
-    "skip_offset": 0,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "236",
-    "exp_speedup": 1.33
-}, {
-    "skip_every": 4,
-    "skip_offset": 1,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "237",
-    "exp_speedup": 1.33
-}, {
-    "skip_every": 4,
-    "skip_offset": 2,
-    "interp_rate": 1.0,
-    "use_fp16": false,
-    "class": "Conv2dSampling",
-    "name": "238",
-    "exp_speedup": 1.33
 }, {
     "skip_every": 4,
     "skip_offset": 3,
diff --git a/test/test_torchapp.py b/test/test_torchapp.py
index 98b941b..12c9121 100644
--- a/test/test_torchapp.py
+++ b/test/test_torchapp.py
@@ -35,7 +35,7 @@ class TestTorchAppTuning(TorchAppSetUp):
         self.assertEqual(len(n_knobs), 34)
         for op_name, op in self.app.midx.name_to_module.items():
             if isinstance(op, Conv2d):
-                nknob = 56
+                nknob = 30
             elif isinstance(op, Linear):
                 nknob = 2
             else:
-- 
GitLab