diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-08-12 12:58:50 +0100 |
|---|---|---|
| committer | Finn Williams <Finn.Williams@arm.com> | 2020-08-14 19:35:43 +0100 |
| commit | 4bd9a745df49bdf11e03f932af6eca6b61ddb0a1 (patch) | |
| tree | d6b596ed4d5d9bc0172ebdb4a60174fbbbec867c /ConversionUtils_1_3.hpp | |
| parent | a4983cec09a3e24bf4e99abd31aa11842e8b365f (diff) | |
| download | android-nn-driver-4bd9a745df49bdf11e03f932af6eca6b61ddb0a1.tar.gz | |
IVGCVSW-5182 Update Convert functions to use ShapeInferenceMethod. 1/2.
* ConvertToActivation
* ConvertAdd
* ConvertArgMinMax
* ConvertConv2d
* ConvertDepthToSpace
* ConvertDepthwiseConv2d
* ConvertDiv
* ConvertFloor
* ConvertFullyConnected
* ConvertL2Normalization
* ConvertLocalResponseNormalization
* ConvertMean
* ConvertMul
* ConvertPad
* ConvertReshape
* ConvertSub
* ConvertStridedSlice
* ConvertTranspose
* ConvertBatchToSpaceNd
* ConvertSpaceToBatchNd
* ConvertComparison_1_2
* ConvertConv2d_1_2
* ConvertDepthwiseConv2d_1_2
* ConvertElementwiseUnary
* ConvertExpandDims
* ConvertGather
* ConvertGroupedConv2d
* ConvertInstanceNormalization
* ConvertLogSoftmax
* ConvertMaximum
* ConvertMinimum
* ConvertPadV2
* ConvertPrelu
* ConvertQuantize
* ConvertResize
* ConvertSpaceToDepth
* ConvertSoftmax
* ConvertTransposeConv2d
Signed-off-by: Finn Williams <Finn.Williams@Arm.com>
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Idacf16e5eab56d83fce293570bbc89381ae056dc
Diffstat (limited to 'ConversionUtils_1_3.hpp')
| -rw-r--r-- | ConversionUtils_1_3.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ConversionUtils_1_3.hpp b/ConversionUtils_1_3.hpp index d5d89df1..e6961253 100644 --- a/ConversionUtils_1_3.hpp +++ b/ConversionUtils_1_3.hpp @@ -146,7 +146,6 @@ bool ConvertFill(const HalOperation& operation, const HalModel& model, Conversio IConnectableLayer* const layer = data.m_Network->AddFillLayer(descriptor); assert(layer != nullptr); input.Connect(layer->GetInputSlot(0)); - layer->GetOutputSlot(0).SetTensorInfo(outputInfo); return SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 0, *layer, model, data); } @@ -667,6 +666,10 @@ bool ConvertRank(const HalOperation& operation, const HalModel& model, Conversio } armnn::TensorInfo outInfo = GetTensorInfoForOperand(*outputOperand); + if (IsDynamicTensor(outInfo)) + { + return Fail("%s: Dynamic output tensors are not supported", __func__); + } bool isSupported = false; FORWARD_LAYER_SUPPORT_FUNC(__func__, |