break;
}
- DataType weightAclOrder[height*width*inputChannels*multiplier];
+ std::vector<DataType> weightAclOrder(height*width*inputChannels*multiplier);
unsigned int destinationWeightsChannel;
unsigned int totalChannels = inputChannels * multiplier;
unsigned int channelSize = height * width;
}
}
- ::memcpy(permuteBuffer, weightAclOrder, weightHandle.GetInfo().GetNumBytes());
+ ::memcpy(permuteBuffer, weightAclOrder.data(), weightHandle.GetInfo().GetNumBytes());
return ConstTensor(weightHandle.GetInfo(), permuteBuffer);
}
ConstTensor weightPermuted = PermuteTensor(weightTensor, permutationVector, permuteBuffer);
// Shuffle the weights data to obtain the channel order needed used by Acl
- if (multiplier > 1 and inputChannels > 1 and dataLayout == DataLayout::NCHW)
+ if (multiplier > 1 && inputChannels > 1 && dataLayout == DataLayout::NCHW)
{
switch (weightPermuted.GetDataType())
{
[&quantizationScale, &quantizationOffset](const std::string & s)
{
return boost::numeric_cast<uint8_t>(
- armnn::Quantize<u_int8_t>(std::stof(s),
+ armnn::Quantize<uint8_t>(std::stof(s),
quantizationScale,
quantizationOffset));
});