aboutsummaryrefslogtreecommitdiff
path: root/tests/framework
diff options
context:
space:
mode:
authorDiego Lopez Recas <Diego.LopezRecas@arm.com>2017-12-11 12:36:55 +0000
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:43:42 +0000
commit61ef5bf586606d6282526641cf2244121d07c6fd (patch)
tree6c113ebeba8dd17e653fade213afeff3e2ed95d4 /tests/framework
parent9c42de9e4c7061ea0431f2ef2ecf8984e0d9c89b (diff)
downloadComputeLibrary-61ef5bf586606d6282526641cf2244121d07c6fd.tar.gz
IVGCVSW-847 Fix {NEON/CL}PoolingLayerKernel config
Also, add validation test that hits the discovered failure for CL. Change-Id: I5573e0a3f169b85d5fb7299e7c48d74be7165208 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/112717 Tested-by: Jenkins <bsgcomp@arm.com> Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/framework')
-rw-r--r--tests/framework/datasets/JoinDataset.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/framework/datasets/JoinDataset.h b/tests/framework/datasets/JoinDataset.h
index eded6e0259..d682c19d6b 100644
--- a/tests/framework/datasets/JoinDataset.h
+++ b/tests/framework/datasets/JoinDataset.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -47,8 +47,10 @@ template <typename T, typename U>
class JoinDataset : public Dataset
{
private:
- using iter1_type = typename T::iterator;
- using iter2_type = typename U::iterator;
+ using T_noref = typename std::remove_reference<T>::type;
+ using U_noref = typename std::remove_reference<U>::type;
+ using iter1_type = typename T_noref::iterator;
+ using iter2_type = typename U_noref::iterator;
public:
/** Construct dataset from the given datasets.
@@ -65,12 +67,12 @@ public:
JoinDataset(JoinDataset &&) = default;
/** Type of the dataset. */
- using type = typename T::type;
+ using type = typename T_noref::type;
/** Iterator for the dataset. */
struct iterator
{
- iterator(const T *dataset1, const U *dataset2)
+ iterator(const T_noref *dataset1, const U_noref *dataset2)
: _iter1{ dataset1->begin() }, _iter2{ dataset2->begin() }, _first_size{ dataset1->size() }
{
}