diff options
Diffstat (limited to 'src/armnn/layers/MultiplicationLayer.cpp')
-rw-r--r-- | src/armnn/layers/MultiplicationLayer.cpp | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/src/armnn/layers/MultiplicationLayer.cpp b/src/armnn/layers/MultiplicationLayer.cpp index ed7683da5f..6970b3f7f4 100644 --- a/src/armnn/layers/MultiplicationLayer.cpp +++ b/src/armnn/layers/MultiplicationLayer.cpp @@ -14,15 +14,14 @@ namespace armnn { MultiplicationLayer::MultiplicationLayer(const char* name) - : Layer(2, 1, LayerType::Multiplication, name) + : ArithmeticBaseLayer(2, 1, LayerType::Multiplication, name) { } -std::unique_ptr<IWorkload> MultiplicationLayer::CreateWorkload(const Graph& graph, +std::unique_ptr<IWorkload> MultiplicationLayer::CreateWorkload(const Graph& graph, const IWorkloadFactory& factory) const { MultiplicationQueueDescriptor descriptor; - return factory.CreateMultiplication(descriptor, PrepInfoAndDesc(descriptor, graph)); } @@ -31,51 +30,4 @@ MultiplicationLayer* MultiplicationLayer::Clone(Graph& graph) const return CloneBase<MultiplicationLayer>(graph, GetName()); } -std::vector<TensorShape> MultiplicationLayer::InferOutputShapes(const std::vector<TensorShape>& inputShapes) const -{ - BOOST_ASSERT(inputShapes.size() == 2); - auto& input0 = inputShapes[0]; - auto& input1 = inputShapes[1]; - - // Get the max of the inputs. - BOOST_ASSERT(input0.GetNumDimensions() == input1.GetNumDimensions()); - unsigned int numDims = input0.GetNumDimensions(); - std::vector<unsigned int> dims(numDims); - - for (unsigned int i = 0; i < numDims; i++) - { - unsigned int dim0 = input0[i]; - unsigned int dim1 = input1[i]; - - // Validates inputs are broadcast compatible. -#if !NDEBUG - if (dim0 != dim1) - { - BOOST_ASSERT_MSG(dim0 == 1 || dim1 == 1, "Dimensions should either match or one should be of size 1."); - } -#endif - - dims[i] = std::max(dim0, dim1); - } - - return std::vector<TensorShape>({ TensorShape(numDims, dims.data()) }); -} - -void MultiplicationLayer::ValidateTensorShapesFromInputs() -{ - VerifyLayerConnections(2, CHECK_LOCATION()); - - auto inferredShapes = InferOutputShapes({ - GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), - GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape() - }); - - BOOST_ASSERT(inferredShapes.size() == 1); - - ConditionalThrowIfNotEqual<LayerValidationException>( - "MultiplicationLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); -} - } // namespace armnn |