diff options
| author | Cathal Corbett <cathal.corbett@arm.com> | 2022-03-07 14:35:23 +0000 |
|---|---|---|
| committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-03-31 12:05:14 +0000 |
| commit | a6d99beb0dc6d31f958d262417877b0bcbd61b7c (patch) | |
| tree | 38d8381a28a8cd135052764c39304fa51ceff62c /ConversionUtils.hpp | |
| parent | 06a4a8b297aa3dc60ca8874b6d067cff1d44cb9d (diff) | |
| download | android-nn-driver-a6d99beb0dc6d31f958d262417877b0bcbd61b7c.tar.gz | |
IVGCVSW-6732 Tests surrounded in '#if defined(ARMNNREF_ENABLED)' in android-nn-driver do not execute.
* Change to ConvertionUtils.hpp fix ConcatTests_GpuAcc tests.
!armnn:7300
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I1543b57c6d1f9660916ca530b421c87e54b13f72
Diffstat (limited to 'ConversionUtils.hpp')
| -rw-r--r-- | ConversionUtils.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 8f7d5b9b..d06fad63 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -503,7 +503,7 @@ void SanitizeBiasQuantizationScale(armnn::TensorInfo& biasInfo, // 4D Tensor Permutations const armnn::PermutationVector IdentityPermutation4D({ 0U, 1U, 2U, 3U }); const armnn::PermutationVector IdentityPermutation3D({ 0U, 1U, 2U }); -const armnn::PermutationVector SwapDim1And2({ 0U, 2U, 1U, 3U }); +const armnn::PermutationVector SwapDim2And3({ 0U, 1U, 3U, 2U }); // 3D Permutation Vectors const armnn::PermutationVector RotateTensorLeft({ 1U, 2U, 0U }); @@ -651,8 +651,8 @@ bool CreateConcatPermutationParameters(const unsigned int numberOfDimensions, // or along dimension 0 or 2 for a 3-D tensor. if (numberOfDimensions == 4 && concatDimension == 2) { - concatDimension = 1; - permutationPair = std::make_pair(SwapDim1And2, SwapDim1And2); + concatDimension = 3; + permutationPair = std::make_pair(SwapDim2And3, SwapDim2And3); needPermute = true; } else if (numberOfDimensions == 3 && concatDimension == 1) |