diff options
Diffstat (limited to 'ConversionUtils_1_2.hpp')
| -rw-r--r-- | ConversionUtils_1_2.hpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ConversionUtils_1_2.hpp b/ConversionUtils_1_2.hpp index 171d61bd..ae24230c 100644 --- a/ConversionUtils_1_2.hpp +++ b/ConversionUtils_1_2.hpp @@ -1233,10 +1233,9 @@ bool ConvertGroupedConv2d(const HalOperation& operation, const HalModel& model, return false; } - ARMNN_NO_DEPRECATE_WARN_BEGIN - IConnectableLayer* convLayer = - data.m_Network->AddConvolution2dLayer(desc, groupWeights, Optional<ConstTensor>(groupBiases)); - ARMNN_NO_DEPRECATE_WARN_END + IConnectableLayer* weightsLayer = data.m_Network->AddConstantLayer(groupWeights); + IConnectableLayer* biasLayer = data.m_Network->AddConstantLayer(groupBiases); + IConnectableLayer* convLayer = data.m_Network->AddConvolution2dLayer(desc); if (!convLayer) { @@ -1244,6 +1243,11 @@ bool ConvertGroupedConv2d(const HalOperation& operation, const HalModel& model, } splitterLayer->GetOutputSlot(group).Connect(convLayer->GetInputSlot(0)); + weightsLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(1)); + biasLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(2)); + + weightsLayer->GetOutputSlot(0).SetTensorInfo(groupWeightsInfo); + biasLayer->GetOutputSlot(0).SetTensorInfo(groupBiasesInfo); convLayer->GetOutputSlot(0).SetTensorInfo(groupOutputInfo); if(isDynamic) |