diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2021-06-07 14:23:57 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-06-23 12:25:50 +0000 |
commit | 20fca524baf99402f742ce38c538f2fd07d5fff9 (patch) | |
tree | b63d98383d1ba22bb3ca59d393e4ab9d47a9c762 /src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp | |
parent | 1d359279e22874121def2ce4bfdb633d94ea5ade (diff) | |
download | ComputeLibrary-20fca524baf99402f742ce38c538f2fd07d5fff9.tar.gz |
Create core library using high priority operators
A smaller core library is created using a subset of the operators.
Changed the structure of filelist.json in order to include more
information about the kernels and make the selection easier.
Resolves: COMPMID-4514
Change-Id: I079ca7d8e64346174eebdd13b834e1dd4dc36ca2
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5786
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp')
-rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp b/src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp index fd4e045035..bfc4dc0f15 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/pooling_s8q.cpp @@ -28,10 +28,10 @@ #include "pooling_depthfirst_generic_quantized.hpp" #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) && defined(SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) #include "kernels/sve_s8q_nhwc_avg_generic_depthfirst.hpp" #include "kernels/sve_s8q_nhwc_max_generic_depthfirst.hpp" -#endif // defined(__ARM_FEATURE_SVE) && defined(SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) #include "kernels/a64_s8q_nhwc_avg_generic_depthfirst.hpp" #include "kernels/a64_s8q_nhwc_max_generic_depthfirst.hpp" #endif // defined(__aarch64__) @@ -43,12 +43,12 @@ namespace pooling { static const PoolingImplementation<int8_t, int8_t, Requantize32> pooling_u8_methods[] = { #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) && defined(SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) { PoolingMethod::DEPTHFIRST, "sve_s8q_nhwc_avg_generic_depthfirst", [] (const PoolingArgs &args, const Requantize32 &) -> bool { - return args.pool_type == PoolingType::AVERAGE; + return args.cpu_info->has_sve2() && args.pool_type == PoolingType::AVERAGE; }, nullptr, [] (const PoolingArgs &args, const Requantize32 &rq) -> PoolingCommon<int8_t, int8_t, Requantize32> * { @@ -58,13 +58,13 @@ static const PoolingImplementation<int8_t, int8_t, Requantize32> pooling_u8_meth { PoolingMethod::DEPTHFIRST, "sve_s8q_nhwc_max_generic_depthfirst", - [] (const PoolingArgs &args, const Requantize32 &) -> bool { return args.pool_type == PoolingType::MAX; }, + [] (const PoolingArgs &args, const Requantize32 &) -> bool { return args.cpu_info->has_sve2() && args.pool_type == PoolingType::MAX; }, nullptr, [] (const PoolingArgs &args, const Requantize32 &rq) -> PoolingCommon<int8_t, int8_t, Requantize32> * { return new PoolingDepthfirstGenericQuantized<sve_s8q_nhwc_max_generic_depthfirst>(args, rq); }, }, -#endif // defined(__ARM_FEATURE_SVE) && defined(SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) { PoolingMethod::DEPTHFIRST, "a64_s8q_nhwc_avg_generic_depthfirst", |