diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-21 15:55:28 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
commit | e49e26613264842f91d29a32be3a226a0d6adb42 (patch) | |
tree | 78d88bded1f178d06b9dbfe3950ba716ef229599 /tests/validation_new | |
parent | 27b386cb7596542a3296c32e41f7a5168b4d53be (diff) | |
download | ComputeLibrary-e49e26613264842f91d29a32be3a226a0d6adb42.tar.gz |
COMPMID-415: Use half_float library for F16
3RDPARTY_UPDATE
Change-Id: Iee572e18d5b1df71300d738cc8690f49d7203d5c
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81353
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/validation_new')
-rw-r--r-- | tests/validation_new/Helpers.h | 49 | ||||
-rw-r--r-- | tests/validation_new/Validation.cpp | 9 | ||||
-rw-r--r-- | tests/validation_new/Validation.h | 8 |
3 files changed, 55 insertions, 11 deletions
diff --git a/tests/validation_new/Helpers.h b/tests/validation_new/Helpers.h new file mode 100644 index 0000000000..e25b684c11 --- /dev/null +++ b/tests/validation_new/Helpers.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2017 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_TEST_VALIDATION_HELPERS_H__ +#define __ARM_COMPUTE_TEST_VALIDATION_HELPERS_H__ + +#include "tests/validation/half.h" + +#include <type_traits> + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template <typename T> +struct is_floating_point : public std::is_floating_point<T> +{ +}; + +template <> +struct is_floating_point<half_float::half> : public std::true_type +{ +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_VALIDATION_HELPERS_H__ */ diff --git a/tests/validation_new/Validation.cpp b/tests/validation_new/Validation.cpp index 8ab8274d2a..9071663e7c 100644 --- a/tests/validation_new/Validation.cpp +++ b/tests/validation_new/Validation.cpp @@ -27,16 +27,13 @@ #include "arm_compute/core/Error.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/runtime/Tensor.h" +#include "tests/validation/half.h" #include <array> #include <cmath> #include <cstddef> #include <cstdint> -#ifdef ARM_COMPUTE_ENABLE_FP16 -#include <arm_fp16.h> // needed for float16_t -#endif /* ARM_COMPUTE_ENABLE_FP16 */ - namespace arm_compute { namespace test @@ -81,10 +78,8 @@ double get_double_data(const void *ptr, DataType data_type) return *reinterpret_cast<const uint64_t *>(ptr); case DataType::S64: return *reinterpret_cast<const int64_t *>(ptr); -#ifdef ARM_COMPUTE_ENABLE_FP16 case DataType::F16: - return *reinterpret_cast<const float16_t *>(ptr); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ + return *reinterpret_cast<const half_float::half *>(ptr); case DataType::F32: return *reinterpret_cast<const float *>(ptr); case DataType::F64: diff --git a/tests/validation_new/Validation.h b/tests/validation_new/Validation.h index 5e947caf8d..7db7b00886 100644 --- a/tests/validation_new/Validation.h +++ b/tests/validation_new/Validation.h @@ -85,8 +85,8 @@ void validate(const arm_compute::PaddingSize &padding, const arm_compute::Paddin * reference tensor and test tensor is multiple of wrap_range), but such errors would be detected by * other test cases. */ -template <typename T, typename U> -void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, U tolerance_value = 0, float tolerance_number = 0.f); +template <typename T, typename U = T> +void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, U tolerance_value = U(0), float tolerance_number = 0.f); /** Validate tensors with valid region. * @@ -98,8 +98,8 @@ void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, U toler * reference tensor and test tensor is multiple of wrap_range), but such errors would be detected by * other test cases. */ -template <typename T, typename U> -void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const ValidRegion &valid_region, U tolerance_value = 0, float tolerance_number = 0.f); +template <typename T, typename U = T> +void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const ValidRegion &valid_region, U tolerance_value = U(0), float tolerance_number = 0.f); /** Validate tensors against constant value. * |