diff options
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 73 | ||||
| -rw-r--r-- | src/backends/cl/ClBackend.cpp | 2 | ||||
| -rw-r--r-- | src/backends/neon/NeonBackend.cpp | 5 | ||||
| -rw-r--r-- | src/backends/neon/NeonBackend.hpp | 3 |
4 files changed, 56 insertions, 27 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 37fda3e210..2194b487d3 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -107,18 +107,6 @@ void ValidateNumOutputs(const WorkloadInfo& workloadInfo, std::string const& des } //--------------------------------------------------------------- -void ValidateTensorNumDimensions(const TensorInfo& tensor, - std::string const& descName, - unsigned int numDimensions, - std::string const& tensorName) -{ - if (tensor.GetNumDimensions() != numDimensions) - { - throw InvalidArgumentException(descName + ": Expected " + to_string(numDimensions) + " but got " + - to_string(tensor.GetNumDimensions()) + " dimensions for " + - tensorName + " tensor."); - } -} //--------------------------------------------------------------- void ValidateTensorNumElements(const TensorInfo& tensor, @@ -135,17 +123,6 @@ void ValidateTensorNumElements(const TensorInfo& tensor, } //--------------------------------------------------------------- -void ValidateTensorNumDimNumElem(const TensorInfo& tensorInfo, - unsigned int numDimension, - unsigned int numElements, - std::string const& tensorName) -{ - const std::string functionName{"ValidateTensorNumDimNumElem"}; - ValidateTensorNumDimensions(tensorInfo, functionName, numDimension, tensorName); - ValidateTensorNumElements(tensorInfo, functionName, numElements, tensorName); -} - -//--------------------------------------------------------------- void ValidateTensorDataType(const TensorInfo& tensor, DataType dataType, const std::string& descName, std::string const& tensorName) { @@ -444,6 +421,56 @@ void ValidatePerAxisQuantization(const TensorInfo& inputInfo, } // anonymous namespace +//--------------------------------------------------------------- +void QueueDescriptor::ValidateTensorNumDimensions(const TensorInfo& tensor, + std::string const& descName, + unsigned int numDimensions, + std::string const& tensorName) const +{ + // If we're allowing expanded dimensions then numDimensions becomes the minimum number of Dimensions we can allow. + // Throw an Exception if the tensors has fewer than numDimensions or if the squeezed dimensions are greater than + // numDimensions. + if (m_AllowExpandedDims) + { + unsigned int squeezedDims = 0; + + for (unsigned int i = 0; i < tensor.GetNumDimensions(); ++i) + { + if (tensor.GetShape()[i] != 1) + { + ++squeezedDims; + } + } + if (tensor.GetNumDimensions() < numDimensions || squeezedDims > numDimensions) + { + throw InvalidArgumentException(descName + ": Expected " + to_string(numDimensions) + " or less but got " + + to_string(tensor.GetNumDimensions()) + " dimensions for " + + tensorName + " tensor."); + } + } + else + { + if (tensor.GetNumDimensions() != numDimensions) + { + throw InvalidArgumentException(descName + ": Expected " + to_string(numDimensions) + " but got " + + to_string(tensor.GetNumDimensions()) + " dimensions for " + + tensorName + " tensor."); + } + } +} + +//--------------------------------------------------------------- +void QueueDescriptor::ValidateTensorNumDimNumElem(const TensorInfo& tensorInfo, + unsigned int numDimension, + unsigned int numElements, + std::string const& tensorName) const +{ + const std::string functionName{"ValidateTensorNumDimNumElem"}; + ValidateTensorNumDimensions(tensorInfo, functionName, numDimension, tensorName); + ValidateTensorNumElements(tensorInfo, functionName, numElements, tensorName); +} + +//--------------------------------------------------------------- void QueueDescriptor::ValidateInputsOutputs(const std::string& descName, unsigned int numExpectedIn, unsigned int numExpectedOut) const { diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index bd1b94e79f..1fe53de62a 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -276,7 +276,7 @@ std::unique_ptr<ICustomAllocator> ClBackend::GetDefaultAllocator() const OptimizationViews ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph, const ModelOptions& modelOptions) const { - OptimizationViews optimizationViews; + OptimizationViews optimizationViews(modelOptions); auto it = subgraph.endIConnectable(); bool isFastMathEnabled = false; diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp index 24336426ea..968bce48c8 100644 --- a/src/backends/neon/NeonBackend.cpp +++ b/src/backends/neon/NeonBackend.cpp @@ -139,9 +139,10 @@ IBackendInternal::ILayerSupportSharedPtr NeonBackend::GetLayerSupport(const Mode return layerSupport; } -OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph) const +OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph, + const ModelOptions& modelOptions) const { - OptimizationViews optimizationViews; + OptimizationViews optimizationViews(modelOptions); auto it = subgraph.endIConnectable(); std::map<LayerGuid, Layer*> untouched; diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp index e3e3782a7f..d407368d19 100644 --- a/src/backends/neon/NeonBackend.hpp +++ b/src/backends/neon/NeonBackend.hpp @@ -52,7 +52,8 @@ public: IBackendInternal::ILayerSupportSharedPtr GetLayerSupport() const override; IBackendInternal::ILayerSupportSharedPtr GetLayerSupport(const ModelOptions& modelOptions) const override; - OptimizationViews OptimizeSubgraphView(const SubgraphView& subgraph) const override; + OptimizationViews OptimizeSubgraphView(const SubgraphView& subgraph, + const ModelOptions& modelOptions) const override; std::vector<ITensorHandleFactory::FactoryId> GetHandleFactoryPreferences() const override; |