diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-12-05 16:45:50 +0000 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-12-05 20:09:47 +0000 |
| commit | e0fd650d00a4dfd8864834cefb77a9b4b238cfd9 (patch) | |
| tree | aeace901bc51df08d24e0e89e9c1e9d0774b95a5 | |
| parent | 7ff622ed2b62bbf7e387af4ff89ed06a6c65f6ed (diff) | |
| download | android-nn-driver-e0fd650d00a4dfd8864834cefb77a9b4b238cfd9.tar.gz | |
Bug fix gather for negative axis
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I556be062b6c16bb8c42fe4e219af85ad88015f41
| -rw-r--r-- | ConversionUtils_1_2.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ConversionUtils_1_2.hpp b/ConversionUtils_1_2.hpp index ae24230c..b1848e3e 100644 --- a/ConversionUtils_1_2.hpp +++ b/ConversionUtils_1_2.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2020,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -899,12 +899,13 @@ bool ConvertGather(const HalOperation& operation, const HalModel& model, Convers __func__, outputDimensions, inputDimensions, indicesDimensions); } - uint32_t axis; + int32_t axis; if (!GetInputScalar<HalPolicy>(operation, 1, HalOperandType::INT32, axis, model, data)) { return Fail("%s: Operation has invalid or unsupported axis operand", __func__); } - if (((axis < -inputDimensions) && (axis < 0)) || ((axis >= inputDimensions) && (axis > 0))) + int32_t inputDimensions_int = static_cast<int32_t>(inputDimensions); + if ((axis < -inputDimensions_int) || (inputDimensions_int <= axis)) { return Fail("%s: Operation has invalid axis: %d. It is out of bounds [-%d, %d))", __func__, axis, inputDimensions, inputDimensions); |