commit b54c644f1186018b9a3a93fa94c351cc3f1a68f0
author Georgios Pinitas <georgios.pinitas@arm.com> Wed Apr 03 13:18:14 2019 +0100
committer Georgios Pinitas <georgios.pinitas@arm.com> Wed Apr 03 15:18:14 2019 +0000
tree 20524b8f6bc62d1b8a760488e827bd158ee5d44c
parent 6afea90d8e60d04e833988d3969af1336b4b8b33

COMPMID-2011: ResNet50 returns wrong result

Change-Id: I55449d2ae834c27d6d8b49db93a3f0b00b5b7e3e
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/940
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

examples/graph_ssd_mobilenet.cpp

diff --git a/examples/graph_ssd_mobilenet.cpp b/examples/graph_ssd_mobilenet.cpp
index 92abd6a..7fcc280 100644
--- a/examples/graph_ssd_mobilenet.cpp
+++ b/examples/graph_ssd_mobilenet.cpp
@@ -80,7 +80,7 @@
 
         // Create a preprocessor object
         const std::array<float, 3> mean_rgb{ { 127.5f, 127.5f, 127.5f } };
-        std::unique_ptr<IPreprocessor> preprocessor = arm_compute::support::cpp14::make_unique<CaffePreproccessor>(mean_rgb, 0.007843f);
+        std::unique_ptr<IPreprocessor> preprocessor = arm_compute::support::cpp14::make_unique<CaffePreproccessor>(mean_rgb, true, 0.007843f);
 
         // Get trainable parameters data path
         std::string data_path = common_params.data_path;

utils/GraphUtils.cpp

diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp
index 26ea02a..6be289a 100644
--- a/utils/GraphUtils.cpp
+++ b/utils/GraphUtils.cpp
@@ -77,8 +77,8 @@
     });
 }
 
-CaffePreproccessor::CaffePreproccessor(std::array<float, 3> mean, float scale, bool bgr)
-    : _mean(mean), _scale(scale), _bgr(bgr)
+CaffePreproccessor::CaffePreproccessor(std::array<float, 3> mean, bool bgr, float scale)
+    : _mean(mean), _bgr(bgr), _scale(scale)
 {
     if(_bgr)
     {

utils/GraphUtils.h

diff --git a/utils/GraphUtils.h b/utils/GraphUtils.h
index 4ae484f..88221c7 100644
--- a/utils/GraphUtils.h
+++ b/utils/GraphUtils.h
@@ -62,17 +62,17 @@
 public:
     /** Default Constructor
      *
-     * @param mean Mean array in RGB ordering
-     * @param scale Scale value
-     * @param bgr  Boolean specifying if the preprocessing should assume BGR format
+     * @param[in] mean  Mean array in RGB ordering
+     * @param[in] bgr   Boolean specifying if the preprocessing should assume BGR format
+     * @param[in] scale Scale value
      */
-    CaffePreproccessor(std::array<float, 3> mean = std::array<float, 3> { { 0, 0, 0 } }, float scale = 1.f, bool bgr = true);
+    CaffePreproccessor(std::array<float, 3> mean = std::array<float, 3> { { 0, 0, 0 } }, bool bgr = true, float scale = 1.f);
     void preprocess(ITensor &tensor) override;
 
 private:
     std::array<float, 3> _mean;
-    float _scale;
     bool  _bgr;
+    float _scale;
 };
 
 /** TF preproccessor */