diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-08 18:14:53 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-11 10:07:32 +0000 |
| commit | 265d1ad1c66eefc5c45025c314e2e2ac49a15949 (patch) | |
| tree | ca19e7651e94ae29aad747f6a02ff5f648ebb293 /1.1 | |
| parent | 2c444fc7725f06e337be8008b88895851b447c61 (diff) | |
| download | android-nn-driver-265d1ad1c66eefc5c45025c314e2e2ac49a15949.tar.gz | |
IVGCVSW-2454 Merge together the pluggable backends work (was in a
separate branch) and master
* Minor fixes to make the NN Driver build with the merged changes
* Passed missing ReshapeDescriptor to the layer support function
!armnn:491
Change-Id: I61fb6ed8df6895bd5a12c6f2b1c322929eebe176
Diffstat (limited to '1.1')
| -rw-r--r-- | 1.1/HalPolicy.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp index 91cce526..64b7d2ae 100644 --- a/1.1/HalPolicy.cpp +++ b/1.1/HalPolicy.cpp @@ -431,7 +431,8 @@ bool HalPolicy::ConvertSqueeze(const Operation& operation, const Model& model, C if (!IsLayerSupported(__func__, armnn::IsReshapeSupported, data.m_Compute, - inputInfo)) + inputInfo, + reshapeDesc)) { return false; } @@ -675,4 +676,4 @@ bool HalPolicy::ConvertBatchToSpaceNd(const Operation& operation, const Model& m } // namespace hal_1_1 -} // namespace armnn_driver
\ No newline at end of file +} // namespace armnn_driver |