From 5ec1c383c8adb0078c025b9fec6fa3dea254034a Mon Sep 17 00:00:00 2001 From: Artem Kopytin Date: Sun, 15 Sep 2024 19:45:52 +0400 Subject: [PATCH] Build if supporting __ARM_FEATURE_FP16_VECTOR_ARITHMETIC (#1436) * acl_executor.cc fixed bug: scratch_mem invalid memory released condition * fc_hcl_arm.c fixed bug: failed build if supporting __ARM_FEATURE_FP16_VECTOR_ARITHMETIC * Fixed build for TENGINE_ARCH_ARM_82 --------- Co-authored-by: Artem Kopytin --- .../cpu/op/conv/cortex-a/armv8.2/conv_dw_kernel_fp16_arm82.c | 4 +++- .../cpu/op/conv/cortex-a/armv8.2/conv_kernel_fp16_arm82.c | 4 ++-- source/device/cpu/op/fc/cortex-a/fc_hcl_arm.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/device/cpu/op/conv/cortex-a/armv8.2/conv_dw_kernel_fp16_arm82.c b/source/device/cpu/op/conv/cortex-a/armv8.2/conv_dw_kernel_fp16_arm82.c index db451322f..2758d0b09 100644 --- a/source/device/cpu/op/conv/cortex-a/armv8.2/conv_dw_kernel_fp16_arm82.c +++ b/source/device/cpu/op/conv/cortex-a/armv8.2/conv_dw_kernel_fp16_arm82.c @@ -25,7 +25,9 @@ #include #include #include -#include "compiler_fp16.h" +#include "graph/tensor.h" +#include "utility/log.h" +#include "common/compiler_fp16.h" #include "conv_dw_kernel_fp16_arm82.h" void dw_k3s1p1_fp16_a76(__fp16* input, __fp16* kernel, __fp16* output, long channel_number, long input_w, long input_h, __fp16* bias); diff --git a/source/device/cpu/op/conv/cortex-a/armv8.2/conv_kernel_fp16_arm82.c b/source/device/cpu/op/conv/cortex-a/armv8.2/conv_kernel_fp16_arm82.c index 3e9a92944..66554a41e 100644 --- a/source/device/cpu/op/conv/cortex-a/armv8.2/conv_kernel_fp16_arm82.c +++ b/source/device/cpu/op/conv/cortex-a/armv8.2/conv_kernel_fp16_arm82.c @@ -27,8 +27,8 @@ #include #include -#include "conv_kernel_arm.h" -#include "compiler_fp16.h" +#include "../conv_kernel_arm.h" +#include "common/compiler_fp16.h" #define PER_OUT_CHAN 16 diff --git a/source/device/cpu/op/fc/cortex-a/fc_hcl_arm.c b/source/device/cpu/op/fc/cortex-a/fc_hcl_arm.c index d9322b864..bc0319eea 100644 --- a/source/device/cpu/op/fc/cortex-a/fc_hcl_arm.c +++ b/source/device/cpu/op/fc/cortex-a/fc_hcl_arm.c @@ -42,7 +42,7 @@ #include #if __ARM_FEATURE_FP16_VECTOR_ARITHMETIC -#include "cortex_a/fc_kernel_fp16_arm82.h" +#include "armv8.2/fc_kernel_fp16_arm82.h" #endif static int prerun(struct node_ops* node_ops, struct exec_node* exec_node, struct exec_graph* exec_graph)