diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-03 13:18:14 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-03 15:18:14 +0000 |
| commit | b54c644f1186018b9a3a93fa94c351cc3f1a68f0 (patch) | |
| tree | 20524b8f6bc62d1b8a760488e827bd158ee5d44c | |
| parent | 6afea90d8e60d04e833988d3969af1336b4b8b33 (diff) | |
| download | ComputeLibrary-b54c644f1186018b9a3a93fa94c351cc3f1a68f0.tar.gz | |
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>
| -rw-r--r-- | examples/graph_ssd_mobilenet.cpp | 2 | ||||
| -rw-r--r-- | utils/GraphUtils.cpp | 4 | ||||
| -rw-r--r-- | utils/GraphUtils.h | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/graph_ssd_mobilenet.cpp b/examples/graph_ssd_mobilenet.cpp index 92abd6a213..7fcc2804a2 100644 --- a/examples/graph_ssd_mobilenet.cpp +++ b/examples/graph_ssd_mobilenet.cpp @@ -80,7 +80,7 @@ public: // 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; diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp index 26ea02a9ff..6be289a7e1 100644 --- a/utils/GraphUtils.cpp +++ b/utils/GraphUtils.cpp @@ -77,8 +77,8 @@ void TFPreproccessor::preprocess(ITensor &tensor) }); } -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) { diff --git a/utils/GraphUtils.h b/utils/GraphUtils.h index 4ae484f430..88221c7dc8 100644 --- a/utils/GraphUtils.h +++ b/utils/GraphUtils.h @@ -62,17 +62,17 @@ class CaffePreproccessor : public IPreprocessor 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 */ |