diff options
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Tensor.cpp | 15 | ||||
| -rw-r--r-- | src/armnn/Threadpool.cpp | 5 | ||||
| -rw-r--r-- | src/armnn/layers/SplitterLayer.cpp | 21 | ||||
| -rw-r--r-- | src/armnn/test/RuntimeTests.cpp | 6 |
4 files changed, 16 insertions, 31 deletions
diff --git a/src/armnn/Tensor.cpp b/src/armnn/Tensor.cpp index f75fc60ef7..650b93835f 100644 --- a/src/armnn/Tensor.cpp +++ b/src/armnn/Tensor.cpp @@ -465,15 +465,12 @@ float TensorInfo::GetQuantizationScale() const // NOTE: old default for backward compatibility return 1.0f; } - // If this tensor includes multiples scales then you should be calling GetQuantizationScales. - // This should be an exception not an assert but unfortunately it breaks many tests. - // ToDo: IVGCVSW-8323 - ARMNN_ASSERT(!HasMultipleQuantizationScales()); -// if (HasMultipleQuantizationScales()) -// { -// throw RuntimeException("Invalid call to GetQuantizationScale on a tensor with multiple scale values. Use " -// "GetQuantizationScales instead."); -// } + + if (HasMultipleQuantizationScales()) + { + throw RuntimeException("Invalid call to GetQuantizationScale on a tensor with multiple scale values. Use " + "GetQuantizationScales instead."); + } return m_Quantization.m_Scales[0]; } diff --git a/src/armnn/Threadpool.cpp b/src/armnn/Threadpool.cpp index df4ff84fb5..9cd8be9dfb 100644 --- a/src/armnn/Threadpool.cpp +++ b/src/armnn/Threadpool.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021, 2024 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #if !defined(ARMNN_DISABLE_THREADS) @@ -188,11 +188,12 @@ void Threadpool::ProcessExecPriorities(uint32_t index) try // executing the inference { IWorkingMemHandle& memHandle = *(m_WorkingMemHandleMap.at(networkId))[index]; - +ARMNN_NO_DEPRECATE_WARN_BEGIN // Execute and populate the time at end of inference in the callback m_RuntimePtr->Execute(memHandle, inputTensors, outputTensors) == Status::Success ? cb->Notify(Status::Success, std::make_pair(startTime, armnn::GetTimeNow())) : cb->Notify(Status::Failure, std::make_pair(startTime, armnn::GetTimeNow())); +ARMNN_NO_DEPRECATE_WARN_END } catch (const RuntimeException&) { diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 8a24e0df1f..b04614b31b 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -9,6 +9,7 @@ #include <armnn/TypesUtils.hpp> #include <armnn/backends/WorkloadData.hpp> #include <armnn/backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadUtils.hpp> namespace armnn { @@ -57,26 +58,6 @@ void SplitterLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, // check if split is along the x or y (2 innermost dimensions) auto numberOfDimensions = m_Param.GetNumDimensions(); - // Compute split axis within class as aclCommon function causes header issues when included - auto ComputeSplitAxis = [&](const armnn::SplitterDescriptor& desc, const TensorShape& input) - { - unsigned int numSplit = desc.GetNumViews(); - unsigned int numDimensions = desc.GetNumDimensions(); - std::set<unsigned int> splitAxis; - - for (unsigned int i = 0; i < numSplit; ++i) - { - for (unsigned int dimIdx = 0; dimIdx < numDimensions; ++dimIdx) - { - if (desc.GetViewSizes(i)[dimIdx] != input[dimIdx]) - { - splitAxis.insert(dimIdx); - } - } - } - return splitAxis; - }; - std::set<unsigned int> axis = ComputeSplitAxis(m_Param, parentInfo.GetShape()); std::set<unsigned int>::iterator axisIt = axis.begin(); diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index 6d5e2ae2b5..4bb2f44357 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -116,7 +116,9 @@ TEST_CASE("RuntimePreImportInputs") auto memHandle = runtime->CreateWorkingMemHandle(networkId); +ARMNN_NO_DEPRECATE_WARN_BEGIN runtime->Execute(*memHandle.get(), {{1, inputTensor2}}, {{2, outputTensor}}, {0 /* pre-imported id */}); +ARMNN_NO_DEPRECATE_WARN_END for (auto val: output) { CHECK(val == 30); } @@ -125,12 +127,16 @@ TEST_CASE("RuntimePreImportInputs") CHECK(importedInputVec2.size() == 1); CHECK(importedInputVec2[0] == 1); +ARMNN_NO_DEPRECATE_WARN_BEGIN runtime->Execute(*memHandle.get(), {{0, inputTensor1}}, {{2, outputTensor}}, {1 /* pre-imported id */}); +ARMNN_NO_DEPRECATE_WARN_END for (auto val: output) { CHECK(val == 30); } +ARMNN_NO_DEPRECATE_WARN_BEGIN runtime->Execute(*memHandle.get(), {}, {{2, outputTensor}}, {0, 1}); +ARMNN_NO_DEPRECATE_WARN_BEGIN for (auto val: output) { CHECK(val == 30); } |