From 79144a642b33ff1ac40a44aaa1881261d12e6376 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Mon, 8 Feb 2021 17:43:04 +0000 Subject: Decouple CpuPoolingKernel data type and data layout 1. Decouple data layout for CpuPoolingKernel: NCHW & NHWC 2. Decouple data type for CpuPoolingKernel NHWC Partially solves: COMPMID-3999 Signed-off-by: Sheri Zhang Change-Id: I3c6535eebdddeb467b7c68a7287a16959b5b9695 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5039 Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- scripts/arm_compute_library_nn_driver.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'scripts') diff --git a/scripts/arm_compute_library_nn_driver.go b/scripts/arm_compute_library_nn_driver.go index 8ff4f69495..d573c6a14a 100644 --- a/scripts/arm_compute_library_nn_driver.go +++ b/scripts/arm_compute_library_nn_driver.go @@ -48,6 +48,17 @@ func globalFlags(ctx android.BaseContext) []string { } } + data_layouts := strings.Split(ctx.AConfig().GetenvWithDefault("COMPUTE_LIB_DATA_LAYOUT", "ALL"), ",") + + for _, x := range data_layouts { + if strings.ToUpper(x) == "ALL" || strings.ToUpper(x) == "NHWC" { + cppflags = append(cppflags, "-DENABLE_NHWC_KERNELS") + } + if strings.ToUpper(x) == "ALL" || strings.ToUpper(x) == "NCHW" { + cppflags = append(cppflags, "-DENABLE_NCHW_KERNELS") + } + } + return cppflags } -- cgit v1.2.1