diff options
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp b/src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp index 002115d78c..1905e1e9d6 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/pooling_fp32.cpp @@ -30,12 +30,12 @@ #include "kernels/cpp_nhwc_1x1_stride_any_depthfirst.hpp" #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) +#if defined(ARM_COMPUTE_ENABLE_SVE) #include "kernels/sve_fp32_nhwc_max_2x2_s1_output2x2_depthfirst.hpp" #include "kernels/sve_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst.hpp" #include "kernels/sve_fp32_nhwc_avg_generic_depthfirst.hpp" #include "kernels/sve_fp32_nhwc_max_generic_depthfirst.hpp" -#endif // defined(__ARM_FEATURE_SVE) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) #include "kernels/a64_fp32_nhwc_max_2x2_s1_output2x2_depthfirst.hpp" #include "kernels/a64_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst.hpp" #include "kernels/a64_fp32_nhwc_avg_generic_depthfirst.hpp" @@ -71,11 +71,13 @@ static const PoolingImplementation<float, float> pooling_fp32_methods[] = { }, }, #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) +#if defined(ARM_COMPUTE_ENABLE_SVE) { PoolingMethod::DEPTHFIRST, "sve_fp32_nhwc_max_2x2_s1_output2x2_depthfirst", - is_supported<sve_fp32_nhwc_max_2x2_s1_output2x2_depthfirst>, + [] (const PoolingArgs &args, const Nothing &unused) -> bool { + return args.cpu_info->has_sve() && is_supported<sve_fp32_nhwc_max_2x2_s1_output2x2_depthfirst>(args, unused); + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<float, float> * { return new PoolingDepthfirst<sve_fp32_nhwc_max_2x2_s1_output2x2_depthfirst>(args); @@ -84,7 +86,9 @@ static const PoolingImplementation<float, float> pooling_fp32_methods[] = { { PoolingMethod::DEPTHFIRST, "sve_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst", - is_supported<sve_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst>, + [] (const PoolingArgs &args, const Nothing &unused) -> bool { + return args.cpu_info->has_sve() && is_supported<sve_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst>(args, unused); + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<float, float> * { return new PoolingDepthfirst<sve_fp32_nhwc_avg_3x3_s1_output2x2_depthfirst>(args); @@ -93,7 +97,9 @@ static const PoolingImplementation<float, float> pooling_fp32_methods[] = { { PoolingMethod::DEPTHFIRST, "sve_fp32_nhwc_avg_generic_depthfirst", - [] (const PoolingArgs &args, const Nothing &) -> bool { return args.pool_type == PoolingType::AVERAGE; }, + [] (const PoolingArgs &args, const Nothing &) -> bool { + return args.cpu_info->has_sve() && args.pool_type == PoolingType::AVERAGE; + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<float, float> * { return new PoolingDepthfirstGeneric<sve_fp32_nhwc_avg_generic_depthfirst>(args); @@ -102,13 +108,15 @@ static const PoolingImplementation<float, float> pooling_fp32_methods[] = { { PoolingMethod::DEPTHFIRST, "sve_fp32_nhwc_max_generic_depthfirst", - [] (const PoolingArgs &args, const Nothing &) -> bool { return args.pool_type == PoolingType::MAX; }, + [] (const PoolingArgs &args, const Nothing &) -> bool { + return args.cpu_info->has_sve() && args.pool_type == PoolingType::MAX; + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<float, float> * { return new PoolingDepthfirstGeneric<sve_fp32_nhwc_max_generic_depthfirst>(args); }, }, -#endif // defined(__ARM_FEATURE_SVE) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) { PoolingMethod::DEPTHFIRST, "a64_fp32_nhwc_max_2x2_s1_output2x2_depthfirst", |