diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2020-07-23 12:55:12 +0100 |
|---|---|---|
| committer | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-08-12 17:06:37 +0100 |
| commit | a4983cec09a3e24bf4e99abd31aa11842e8b365f (patch) | |
| tree | 0a09be7cdad7ad5c15bb24c67abf0f4cd4d6e47e /ArmnnPreparedModel.cpp | |
| parent | bf866e2dc7bd5936788fe213b5c0f74483ec1532 (diff) | |
| download | android-nn-driver-a4983cec09a3e24bf4e99abd31aa11842e8b365f.tar.gz | |
IVGCVSW-4931 Update NN Driver to support dynamic tensors
* Change NN Driver m_Network to now have ShapeInferenceMethod::InferAndValidate
* Implement dynamic tensor support for:
- ArgMinMax layer
- Pooling2d layer
- Activation layer
* Skip dynamic tensor tests for any HAL other than 1.3
Change-Id: Icf66c968e49cdd4822b8c79c5f18b3f9e97dc53f
Signed-off-by: Finn Williams <Finn.Williams@Arm.com>
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Diffstat (limited to 'ArmnnPreparedModel.cpp')
| -rw-r--r-- | ArmnnPreparedModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp index f990d3bc..8aa28d7e 100644 --- a/ArmnnPreparedModel.cpp +++ b/ArmnnPreparedModel.cpp @@ -48,7 +48,7 @@ bool ValidateRequestArgument(const RequestArgument& requestArg, const armnn::Ten for (unsigned int d = 0; d < tensorInfo.GetNumDimensions(); ++d) { - if (requestArg.dimensions[d] != tensorInfo.GetShape()[d]) + if (requestArg.dimensions[d] != 0 && requestArg.dimensions[d] != tensorInfo.GetShape()[d]) { ALOGE("Mismatched size for dimension %d (request argument: %u, expected %u)", d, requestArg.dimensions[d], tensorInfo.GetShape()[d]); |