commit 6b06953732a7da4ff2446d69c2fcafed69c5008a
author John Richardson <john.richardson@arm.com> Fri Apr 27 12:55:37 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:50:16 2018 +0000
tree bc842877e317dc14c23fff55a4282b2272e4e88a
parent 9fb1159e2501f276a27d32264bece54b3d42d258

COMPMID-1087: Fix CLHOGDetector failure.

Change-Id: Ied0fbbd50f1e4dcf930798bc3b735cb70329017d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/129313
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>

src/runtime/CL/CLHOG.cpp

diff --git a/src/runtime/CL/CLHOG.cpp b/src/runtime/CL/CLHOG.cpp
index 3f5266c..c4ea639 100644
--- a/src/runtime/CL/CLHOG.cpp
+++ b/src/runtime/CL/CLHOG.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -74,11 +74,11 @@
 uint8_t *CLHOG::do_map(cl::CommandQueue &q, bool blocking)
 {
     ARM_COMPUTE_ERROR_ON(_buffer.get() == nullptr);
-    return static_cast<uint8_t *>(q.enqueueMapBuffer(_buffer, blocking ? CL_TRUE : CL_FALSE, CL_MAP_READ | CL_MAP_WRITE, 0, info()->descriptor_size()));
+    return static_cast<uint8_t *>(q.enqueueMapBuffer(_buffer, blocking ? CL_TRUE : CL_FALSE, CL_MAP_READ | CL_MAP_WRITE, 0, info()->descriptor_size() * sizeof(float)));
 }
 
 void CLHOG::do_unmap(cl::CommandQueue &q)
 {
     ARM_COMPUTE_ERROR_ON(_buffer.get() == nullptr);
     q.enqueueUnmapMemObject(_buffer, descriptor());
-}
\ No newline at end of file
+}

tests/validation/CL/HOGDetector.cpp

diff --git a/tests/validation/CL/HOGDetector.cpp b/tests/validation/CL/HOGDetector.cpp
index dcf3509..6c2c18c 100644
--- a/tests/validation/CL/HOGDetector.cpp
+++ b/tests/validation/CL/HOGDetector.cpp
@@ -65,25 +65,24 @@
                                                           uint8_t,
                                                           float>;
 
-// TODO (COMPMID-1087) : CLHOGDetector fails on hikey
-DISABLED_FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDetectorFixture, framework::DatasetMode::PRECOMMIT,
-                                combine(combine(combine(
-                                DetectionWindowStrideDataset,
-                                datasets::SmallHOGDescriptorDataset()),
-                                framework::dataset::make("Format", Format::U8)),
-                                framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
+FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDetectorFixture, framework::DatasetMode::PRECOMMIT,
+                       combine(combine(combine(
+                       DetectionWindowStrideDataset,
+                       datasets::SmallHOGDescriptorDataset()),
+                       framework::dataset::make("Format", Format::U8)),
+                       framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
 
 {
     // Validate output
     validate_detection_windows(_target.begin(), _target.end(), _reference.begin(), _reference.end(), tolerance);
 }
 
-DISABLED_FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDetectorFixture, framework::DatasetMode::NIGHTLY,
-                                combine(combine(combine(
-                                DetectionWindowStrideDataset,
-                                datasets::LargeHOGDescriptorDataset()),
-                                framework::dataset::make("Format", Format::U8)),
-                                framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
+FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDetectorFixture, framework::DatasetMode::NIGHTLY,
+                       combine(combine(combine(
+                       DetectionWindowStrideDataset,
+                       datasets::LargeHOGDescriptorDataset()),
+                       framework::dataset::make("Format", Format::U8)),
+                       framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
 {
     // Validate output
     validate_detection_windows(_target.begin(), _target.end(), _reference.begin(), _reference.end(), tolerance);