commit fcf2a15b0b4aa44530dc56c7a13bc685c687f87a
author Kevin May <kevin.may@arm.com> Tue Sep 08 16:06:32 2020 +0100
committer Kevin May <kevin.may@arm.com> Fri Sep 11 12:18:38 2020 +0100
tree e33a598efd12efbf9b09f3ad2187dcea698baca0
parent 6e4081f67e35427212bd3505180c9abb1ac52b23

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

ConversionUtils_1_3.hpp

diff --git a/ConversionUtils_1_3.hpp b/ConversionUtils_1_3.hpp
index 445b9ea..a7f00fc 100644
--- a/ConversionUtils_1_3.hpp
+++ b/ConversionUtils_1_3.hpp
@@ -654,7 +654,8 @@
         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));
     }
 }