diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-07-06 21:19:27 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-07-07 13:47:06 +0000 |
| commit | 45875943de2992731ce763a71ac65fb4943c71c8 (patch) | |
| tree | 6008b9530a014c62895ef0bdab72b16336bbac5f | |
| parent | 5e281814c5110724d99fe8ee64bdf42ef2c31bce (diff) | |
| download | ComputeLibrary-45875943de2992731ce763a71ac65fb4943c71c8.tar.gz | |
Validate unsupported data types with runtime information
Check for Fp16 and Bfloat16 support was done using compile time
information. Switch to use runtime information through CPUInfo
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ia3fa20c2b9b93be889667deb2e9366eb7cbe4aea
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5915
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | src/core/CPP/Validate.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/core/CPP/Validate.h b/src/core/CPP/Validate.h index 9e95f72c3f..4a97e4789e 100644 --- a/src/core/CPP/Validate.h +++ b/src/core/CPP/Validate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,6 +24,7 @@ #ifndef ARM_COMPUTE_CPP_VALIDATE_H #define ARM_COMPUTE_CPP_VALIDATE_H +#include "arm_compute/core/CPP/CPPTypes.h" #include "arm_compute/core/Validate.h" namespace arm_compute @@ -41,11 +42,9 @@ inline Status error_on_unsupported_cpu_fp16(const char *function, const char *fi const ITensorInfo *tensor_info) { ARM_COMPUTE_RETURN_ERROR_ON_LOC(tensor_info == nullptr, function, file, line); -#ifndef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC - ARM_COMPUTE_RETURN_ERROR_ON_LOC_MSG(tensor_info->data_type() == DataType::F16, + ARM_COMPUTE_RETURN_ERROR_ON_LOC_MSG((tensor_info->data_type() == DataType::F16) && !CPUInfo::get().has_fp16(), function, file, line, "This CPU architecture does not support F16 data type, you need v8.2 or above"); -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - return Status {}; + return Status{}; } /** Return an error if the data type of the passed tensor info is BFLOAT16 and BFLOAT16 support is not compiled in. @@ -61,11 +60,9 @@ inline Status error_on_unsupported_cpu_bf16(const char *function, const char *fi const ITensorInfo *tensor_info) { ARM_COMPUTE_RETURN_ERROR_ON_LOC(tensor_info == nullptr, function, file, line); -#if !(defined(__ARM_FEATURE_BF16_VECTOR_ARITHMETIC) || defined(ARM_COMPUTE_FORCE_BF16)) - ARM_COMPUTE_RETURN_ERROR_ON_LOC_MSG(tensor_info->data_type() == DataType::BFLOAT16, + ARM_COMPUTE_RETURN_ERROR_ON_LOC_MSG(tensor_info->data_type() == DataType::BFLOAT16 && !CPUInfo::get().has_bf16(), function, file, line, "This CPU architecture does not support BFloat16 data type, you need v8.6 or above"); -#endif /* !(defined(__ARM_FEATURE_BF16_VECTOR_ARITHMETIC) || defined(ARM_COMPUTE_FORCE_BF16)) */ - return Status {}; + return Status{}; } /** Return an error if the data type of the passed tensor is FP16 and FP16 support is not compiled in. |