diff options
| author | Kevin May <kevin.may@arm.com> | 2020-09-08 16:06:32 +0100 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2020-09-11 12:18:38 +0100 |
| commit | fcf2a15b0b4aa44530dc56c7a13bc685c687f87a (patch) | |
| tree | e33a598efd12efbf9b09f3ad2187dcea698baca0 /ConversionUtils_1_3.hpp | |
| parent | 6e4081f67e35427212bd3505180c9abb1ac52b23 (diff) | |
| download | android-nn-driver-fcf2a15b0b4aa44530dc56c7a13bc685c687f87a.tar.gz | |
IVGCVSW-5245 Support Fused Activations for Dynamic Tensors
* Move ProcessActivation from Convert<LayerName>
to SetupAndTrackLayerOutputSlot by passing optional ActivationFn
* Connect Activation after IsTensorInfoSet() is called
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I472bcb65b12ae6e934bd1e9af8a6f6aceb311c0e
Diffstat (limited to 'ConversionUtils_1_3.hpp')
| -rw-r--r-- | ConversionUtils_1_3.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ConversionUtils_1_3.hpp b/ConversionUtils_1_3.hpp index 445b9ea7..a7f00fc3 100644 --- a/ConversionUtils_1_3.hpp +++ b/ConversionUtils_1_3.hpp @@ -654,7 +654,8 @@ bool ConvertQuantizedLstm(const HalOperation& operation, const HalModel& model, return ( SetupAndTrackLayerOutputSlot<HalPolicy>( operation, 0, *layer, 0, model, data, &constOutputStateOutInfo) && SetupAndTrackLayerOutputSlot<HalPolicy>( - operation, 1, *layer, 1, model, data, nullptr, validateFunc, true) && + operation, 1, *layer, 1, model, data, nullptr, validateFunc, + ActivationFn::kActivationNone, true) && SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 2, *layer, 2, model, data, &constOutputInfo)); } } |