diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/validation/reference/ActivationLayer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/reference/ActivationLayer.h | 5 | ||||
-rw-r--r-- | tests/validation/reference/BatchNormalizationLayer.h | 4 | ||||
-rw-r--r-- | tests/validation/reference/NormalizationLayer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/reference/NormalizationLayer.h | 2 | ||||
-rw-r--r-- | tests/validation/reference/NormalizePlanarYUVLayer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/reference/NormalizePlanarYUVLayer.h | 2 | ||||
-rw-r--r-- | tests/validation/reference/PoolingLayer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/reference/PoolingLayer.h | 5 |
9 files changed, 8 insertions, 18 deletions
diff --git a/tests/validation/reference/ActivationLayer.cpp b/tests/validation/reference/ActivationLayer.cpp index 9750ea95a6..9887e42386 100644 --- a/tests/validation/reference/ActivationLayer.cpp +++ b/tests/validation/reference/ActivationLayer.cpp @@ -34,7 +34,7 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> +template <typename T> SimpleTensor<T> activation_layer(const SimpleTensor<T> &src, ActivationLayerInfo info) { // Create reference diff --git a/tests/validation/reference/ActivationLayer.h b/tests/validation/reference/ActivationLayer.h index c752e74733..77b353056e 100644 --- a/tests/validation/reference/ActivationLayer.h +++ b/tests/validation/reference/ActivationLayer.h @@ -83,10 +83,7 @@ inline T activate_float(T x, T a, T b, ActivationLayerInfo::ActivationFunction a return ret; } -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type = 0> -SimpleTensor<T> activation_layer(const SimpleTensor<T> &src, ActivationLayerInfo info); - -template <typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0> +template <typename T> SimpleTensor<T> activation_layer(const SimpleTensor<T> &src, ActivationLayerInfo info); } // namespace reference } // namespace validation diff --git a/tests/validation/reference/BatchNormalizationLayer.h b/tests/validation/reference/BatchNormalizationLayer.h index b45d820412..a5d99c162d 100644 --- a/tests/validation/reference/BatchNormalizationLayer.h +++ b/tests/validation/reference/BatchNormalizationLayer.h @@ -35,10 +35,6 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<std::is_integral<T>::value, int>::type * = nullptr> -SimpleTensor<T> batch_normalization_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &mean, const SimpleTensor<T> &var, const SimpleTensor<T> &beta, const SimpleTensor<T> &gamma, float epsilon, - ActivationLayerInfo act_info); - template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type * = nullptr> SimpleTensor<T> batch_normalization_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &mean, const SimpleTensor<T> &var, const SimpleTensor<T> &beta, const SimpleTensor<T> &gamma, float epsilon, ActivationLayerInfo act_info); diff --git a/tests/validation/reference/NormalizationLayer.cpp b/tests/validation/reference/NormalizationLayer.cpp index 2ae68c63cf..e6ca233e75 100644 --- a/tests/validation/reference/NormalizationLayer.cpp +++ b/tests/validation/reference/NormalizationLayer.cpp @@ -33,7 +33,7 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> +template <typename T> SimpleTensor<T> normalization_layer(const SimpleTensor<T> &src, NormalizationLayerInfo info) { // Create reference diff --git a/tests/validation/reference/NormalizationLayer.h b/tests/validation/reference/NormalizationLayer.h index 3448baf385..81b95cc18d 100644 --- a/tests/validation/reference/NormalizationLayer.h +++ b/tests/validation/reference/NormalizationLayer.h @@ -35,7 +35,7 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type = 0> +template <typename T> SimpleTensor<T> normalization_layer(const SimpleTensor<T> &src, NormalizationLayerInfo info); } // namespace reference diff --git a/tests/validation/reference/NormalizePlanarYUVLayer.cpp b/tests/validation/reference/NormalizePlanarYUVLayer.cpp index afb899220d..cdccaf49cd 100644 --- a/tests/validation/reference/NormalizePlanarYUVLayer.cpp +++ b/tests/validation/reference/NormalizePlanarYUVLayer.cpp @@ -34,7 +34,7 @@ namespace validation namespace reference { // NormalizePlanarYUV Layer for floating point type -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type *> +template <typename T> SimpleTensor<T> normalize_planar_yuv_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &mean, const SimpleTensor<T> &std) { SimpleTensor<T> result(src.shape(), src.data_type()); diff --git a/tests/validation/reference/NormalizePlanarYUVLayer.h b/tests/validation/reference/NormalizePlanarYUVLayer.h index 41ce48630c..95488f9122 100644 --- a/tests/validation/reference/NormalizePlanarYUVLayer.h +++ b/tests/validation/reference/NormalizePlanarYUVLayer.h @@ -35,7 +35,7 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type * = nullptr> +template <typename T> SimpleTensor<T> normalize_planar_yuv_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &mean, const SimpleTensor<T> &std); } // namespace reference } // namespace validation diff --git a/tests/validation/reference/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp index 02c430a64f..e617c939b0 100644 --- a/tests/validation/reference/PoolingLayer.cpp +++ b/tests/validation/reference/PoolingLayer.cpp @@ -37,7 +37,7 @@ namespace reference { using namespace arm_compute::misc::shape_calculator; -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> +template <typename T> SimpleTensor<T> pooling_layer(const SimpleTensor<T> &src, const PoolingLayerInfo &info) { ARM_COMPUTE_ERROR_ON(info.is_global_pooling() && (src.shape().x() != src.shape().y())); diff --git a/tests/validation/reference/PoolingLayer.h b/tests/validation/reference/PoolingLayer.h index b0d30af32a..00977896a8 100644 --- a/tests/validation/reference/PoolingLayer.h +++ b/tests/validation/reference/PoolingLayer.h @@ -35,10 +35,7 @@ namespace validation { namespace reference { -template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type = 0> -SimpleTensor<T> pooling_layer(const SimpleTensor<T> &src, const PoolingLayerInfo &info); - -template <typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0> +template <typename T> SimpleTensor<T> pooling_layer(const SimpleTensor<T> &src, const PoolingLayerInfo &info); } // namespace reference } // namespace validation |