From 2a7ebe3045d766c7abdb3bca49e90f3f9afb8664 Mon Sep 17 00:00:00 2001 From: Tim Hall Date: Thu, 18 Jun 2020 11:42:21 +0100 Subject: vela: Fix block config override issue. - A blanket exception was preventing block config overrides from being used, from either code or command line. Change-Id: I1a7aa7771e077bcdb66886a6b637d099ae43d732 Signed-off-by: Tim Hall --- ethosu/vela/shared_buffer_allocation.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ethosu') diff --git a/ethosu/vela/shared_buffer_allocation.py b/ethosu/vela/shared_buffer_allocation.py index 040f2a3b..07637f36 100644 --- a/ethosu/vela/shared_buffer_allocation.py +++ b/ethosu/vela/shared_buffer_allocation.py @@ -22,7 +22,7 @@ from .architecture_features import Block from .architecture_features import Kernel from .architecture_features import SharedBufferArea from .architecture_features import SHRAMElements -from .errors import OptionError +from .errors import VelaError from .operation import NpuBlockType @@ -167,11 +167,9 @@ def find_block_configs_suitable_for_pass_and_shared_buffer(arch, ps): if arch.override_block_config: config = alloc.try_block(arch.override_block_config) - raise OptionError( - "--force-block-config", - str(arch.override_block_config), - "This forced block config value cannot be used; it is not compatible", - ) + if config is None: + raise VelaError("Block config override '{0}' cannot be allocated".format(arch.override_block_config) ) + return [config] # Constrain the search space if the OFM is smaller than the max block size # - Add other block search constraints here if required -- cgit v1.2.1