From 284223e8e086dc6c7b7f1edf3b3555401e3d0a96 Mon Sep 17 00:00:00 2001
From: Tim Hall <tim.hall@arm.com>
Date: Tue, 9 Jun 2020 13:17:21 +0100
Subject: MLBEDSW-2471: Remove unused CLI options

 - Removed --inter-pass-cycle-delay
 - Removed --dram-bandwidth
 - Removed --batch-size

Signed-off-by: Tim Hall <tim.hall@arm.com>
Change-Id: Ib613f47a9e911c652e522b5aa9ec58ae5391b0fd
---
 ethosu/vela/architecture_features.py |  7 -------
 ethosu/vela/npu_performance.py       |  1 -
 ethosu/vela/vela.py                  | 17 +----------------
 3 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'ethosu/vela')

diff --git a/ethosu/vela/architecture_features.py b/ethosu/vela/architecture_features.py
index f1cabdd1..15cf0ea4 100644
--- a/ethosu/vela/architecture_features.py
+++ b/ethosu/vela/architecture_features.py
@@ -149,8 +149,6 @@ Note the difference between ArchitectureFeatures and CompilerOptions
         accelerator_config,
         system_config,
         permanent_storage,
-        inter_pass_cycle_delay,
-        dram_bandwidth,
         override_block_config,
         block_config_limit,
         global_memory_clock_scale,
@@ -212,9 +210,6 @@ Note the difference between ArchitectureFeatures and CompilerOptions
         self.memory_clocks = self.memory_clock_scales * self.npu_clock
         self.memory_bandwidths_per_cycle = self.memory_port_widths * self.memory_clock_scales / 8
 
-        if dram_bandwidth != 0:
-            self.memory_bandwidths_per_cycle[MemArea.Dram] = dram_bandwidth * 1e9 / self.npu_clock
-
         self.memory_bandwidths_per_second = self.memory_bandwidths_per_cycle * self.npu_clock
 
         # sizes as N x H x W x C. we need to round up to these when allocating storage
@@ -233,8 +228,6 @@ Note the difference between ArchitectureFeatures and CompilerOptions
             TensorFormat.NHCWB16: (1, 1, 1, 16),
         }
 
-        self.inter_pass_cycle_delay = inter_pass_cycle_delay
-
         self.default_weight_format = TensorFormat.WeightsCompressed
         self.default_feature_map_format = TensorFormat.NHWC
 
diff --git a/ethosu/vela/npu_performance.py b/ethosu/vela/npu_performance.py
index 57a72a6a..abe7134d 100644
--- a/ethosu/vela/npu_performance.py
+++ b/ethosu/vela/npu_performance.py
@@ -492,7 +492,6 @@ def calc_performance_for_network(nng, arch):
             total_bws += bws
             total_macs += macs
             total_cycles += cycles
-            total_cycles += arch.inter_pass_cycle_delay
 
     nng.bandwidths = total_bws
     nng.macs = total_macs
diff --git a/ethosu/vela/vela.py b/ethosu/vela/vela.py
index bd5409ce..8dda8606 100644
--- a/ethosu/vela/vela.py
+++ b/ethosu/vela/vela.py
@@ -123,7 +123,6 @@ def main(args=None):
         "--output-dir", type=str, default="output", help="Output directory to write files to (default: %(default)s)"
     )
     parser.add_argument("--config", type=str, help="Location of vela configuration file")
-    parser.add_argument("--batch-size", type=int, default=1, help="Batch size (default: %(default)s)")
 
     parser.add_argument("--verbose-graph", action="store_true", help="Verbose graph rewriter")
     parser.add_argument("--verbose-quantization", action="store_true", help="Verbose quantization")
@@ -166,12 +165,6 @@ def main(args=None):
         help="Controls the overlapping of IFM and OFM buffers (default: %(default)s)",
     )
     parser.add_argument("--force-block-config", type=str, default="", help="Force a specific block configuration HxWxC")
-    parser.add_argument(
-        "--inter-pass-cycle-delay",
-        type=int,
-        default=0,
-        help="Artificial delay between passes, measured in NPU cycles (default: %(default)s)",
-    )
     parser.add_argument("--timing", action="store_true", help="Time the compiler doing operations")
     parser.add_argument(
         "--accelerator-config",
@@ -186,12 +179,6 @@ def main(args=None):
         default="internal-default",
         help="System configuration to use (default: %(default)s)",
     )
-    parser.add_argument(
-        "--dram-bandwidth",
-        type=float,
-        default=0.0,
-        help="DRAM memory bandwidth in GB/s, use zero to select the value from system config (default: %(default)s)",
-    )
     parser.add_argument(
         "--permanent-storage",
         default=MemArea.OffChipFlash,
@@ -285,8 +272,6 @@ def main(args=None):
         system_config=args.system_config,
         accelerator_config=args.accelerator_config,
         permanent_storage=args.permanent_storage,
-        inter_pass_cycle_delay=args.inter_pass_cycle_delay,
-        dram_bandwidth=args.dram_bandwidth,
         override_block_config=force_block_config,
         block_config_limit=args.block_config_limit,
         global_memory_clock_scale=args.global_memory_clock_scale,
@@ -319,7 +304,7 @@ def main(args=None):
         pareto_metric=args.pareto_metric,
     )
 
-    model_reader_options = model_reader.ModelReaderOptions(batch_size=args.batch_size)
+    model_reader_options = model_reader.ModelReaderOptions()
 
     os.makedirs(args.output_dir, exist_ok=True)
 
-- 
cgit v1.2.1