diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-04 18:01:21 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-07 11:25:42 +0000 |
commit | d5b9e6497b03d58c671c15b9ebe8e35500171f06 (patch) | |
tree | bf1e995d1b88f75cf497e8fd5f52f5003272187e /src/armnnTfParser/TfParser.cpp | |
parent | 2ad6cb486164ff3aabe4e9ecabc47f08da48da35 (diff) | |
download | armnn-d5b9e6497b03d58c671c15b9ebe8e35500171f06.tar.gz |
IVGCVSW-2421 Remove the template-based version of armnnUtils::Permute
in favor of a type-indepent implementation that takes void-pointers
* The new implementation requires the size of the type to be passed
to the function
* Updated all the usages accordingly
* Removed the old implementation no longer used
!android-nn-driver:469
Change-Id: I37f4e6d62a38fbb8ec8c39bb559a2c54c83365d4
Diffstat (limited to 'src/armnnTfParser/TfParser.cpp')
-rwxr-xr-x | src/armnnTfParser/TfParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp index 2d31842205..3d0c72da4c 100755 --- a/src/armnnTfParser/TfParser.cpp +++ b/src/armnnTfParser/TfParser.cpp @@ -1232,7 +1232,7 @@ ParsedTfOperationPtr TfParser::ParseConv2D(const tensorflow::NodeDef& nodeDef, // Swizzles the content of the tensor's permanent storage into a local storage. std::vector<float> weightTensorSwizzledData(weightTensorInfo.GetNumElements()); armnnUtils::Permute(weightTensorSwizzledInfo.GetShape(), permutationVector, - weightNode->GetStorage(), weightTensorSwizzledData.data()); + weightNode->GetStorage(), weightTensorSwizzledData.data(), sizeof(float)); // Create a weight tensor with the newly swizzled data. ConstTensor weightTensor(weightTensorSwizzledInfo, weightTensorSwizzledData); @@ -1350,7 +1350,7 @@ ParsedTfOperationPtr TfParser::ParseDepthwiseConv2D(const tensorflow::NodeDef& n // Swizzles the content of the tensor's permanent storage into a local storage. std::vector<float> weightTensorSwizzledData(weightTensorInfo.GetNumElements()); armnnUtils::Permute(weightTensorSwizzledInfo.GetShape(), permutationVector, - weightNode->GetStorage(), weightTensorSwizzledData.data()); + weightNode->GetStorage(), weightTensorSwizzledData.data(), sizeof(float)); // Create a weight tensor with the newly swizzled data. ConstTensor weightTensor(weightTensorSwizzledInfo, weightTensorSwizzledData); |