From a629da13544c361ba9580a233109b2418fd6bb73 Mon Sep 17 00:00:00 2001
From: steniu01 <steven.niu@arm.com>
Date: Fri, 28 Jul 2017 14:40:58 +0100
Subject: COMPMID-458 add direct convolution to benchmark

Change-Id: I475cb1e3c69831aa5574305e9188251846cee6ba
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/82008
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
---
 tests/fixtures_new/AlexNetFixture.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests/fixtures_new/AlexNetFixture.h')

diff --git a/tests/fixtures_new/AlexNetFixture.h b/tests/fixtures_new/AlexNetFixture.h
index 75384e53f0..0fbc1b77e3 100644
--- a/tests/fixtures_new/AlexNetFixture.h
+++ b/tests/fixtures_new/AlexNetFixture.h
@@ -39,6 +39,7 @@ template <typename ITensorType,
           typename Accessor,
           typename ActivationLayerFunction,
           typename ConvolutionLayerFunction,
+          typename DirectConvolutionLayerFunction,
           typename FullyConnectedLayerFunction,
           typename NormalizationLayerFunction,
           typename PoolingLayerFunction,
@@ -50,10 +51,10 @@ public:
     template <typename...>
     void setup(DataType data_type, int batches)
     {
-        constexpr bool weights_transposed   = true;
+        constexpr bool weights_reshaped     = true;
         constexpr int  fixed_point_position = 4;
 
-        network.init(data_type, fixed_point_position, batches, weights_transposed);
+        network.init(data_type, fixed_point_position, batches, weights_reshaped);
         network.build();
         network.allocate();
         network.fill_random();
@@ -76,6 +77,7 @@ private:
              Accessor,
              ActivationLayerFunction,
              ConvolutionLayerFunction,
+             DirectConvolutionLayerFunction,
              FullyConnectedLayerFunction,
              NormalizationLayerFunction,
              PoolingLayerFunction,
-- 
cgit v1.2.1