From e812c0cafc6f224ec9caca30c2e97ec062012d53 Mon Sep 17 00:00:00 2001 From: Jakub Sujak Date: Mon, 22 Jan 2024 10:32:38 +0000 Subject: Don't build CKW as part of Android.bp CKW support is still experimental. Change-Id: Iad98652b4b24acd918772edabc1b6bae4eeb259f Signed-off-by: Jakub Sujak Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10996 Benchmark: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- Android.bp | 31 ++----------------------------- scripts/generate_android_bp.py | 13 +++++-------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/Android.bp b/Android.bp index f7d4d257d6..2983e2e21d 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,5 @@ // -// Copyright © 2020-2023 Arm Ltd. All rights reserved. +// Copyright © 2020-2024 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -161,8 +161,7 @@ arm_compute_library_defaults { "-Wno-unused-parameter", "-DNO_DOT_IN_TOOLCHAIN", "-Wno-implicit-fallthrough", - "-fPIC", - "-DACL_INTERNAL_TEST_CKW_IN_DF" + "-fPIC" ], rtti: true, } @@ -173,8 +172,6 @@ cc_library_static { proprietary: true, local_include_dirs: ["build/android-arm64v8a/src/core", "build/android-arm64v8a/src/core/CL", - "compute_kernel_writer/prototype/include", - "compute_kernel_writer/prototype", "src/core/common", "src/core/helpers", "src/core/NEON/kernels/arm_gemm", @@ -184,15 +181,6 @@ cc_library_static { "src/cpu/kernels/assembly"], export_include_dirs: [".", "./include"], srcs: [ - "compute_kernel_writer/prototype/src/Kernel.cpp", - "compute_kernel_writer/prototype/src/KernelArgument.cpp", - "compute_kernel_writer/prototype/src/KernelWriter.cpp", - "compute_kernel_writer/prototype/src/OperandBase.cpp", - "compute_kernel_writer/prototype/src/TensorInfo.cpp", - "compute_kernel_writer/prototype/src/TensorOperand.cpp", - "compute_kernel_writer/prototype/src/TensorTileSampler.cpp", - "compute_kernel_writer/prototype/src/TileInfo.cpp", - "compute_kernel_writer/prototype/src/TileOperand.cpp", "src/c/AclContext.cpp", "src/c/AclOperator.cpp", "src/c/AclQueue.cpp", @@ -624,7 +612,6 @@ cc_library_static { "src/cpu/operators/internal/CpuGemmAssemblyDispatch.cpp", "src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.cpp", "src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp", - "src/dynamic_fusion/runtime/gpu/cl/ckw_driver/GpuCkwKernelArgumentsHelpers.cpp", "src/dynamic_fusion/sketch/attributes/CastAttributes.cpp", "src/dynamic_fusion/sketch/attributes/ClampAttributes.cpp", "src/dynamic_fusion/sketch/attributes/Conv2dAttributes.cpp", @@ -642,20 +629,6 @@ cc_library_static { "src/dynamic_fusion/sketch/gpu/GpuOperatorGroup.cpp", "src/dynamic_fusion/sketch/gpu/GpuWorkloadContext.cpp", "src/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwComponentArgument.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwKernelWriter.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwScopedKernelWriter.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwVariableTable.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwActivation.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwCast.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwDepthwiseConv2d.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwDirectConv2d.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwElementwiseBinary.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwMatMul.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwPool2d.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwResize.cpp", - "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwStore.cpp", "src/dynamic_fusion/sketch/gpu/components/cl/ClComponentActivation.cpp", "src/dynamic_fusion/sketch/gpu/components/cl/ClComponentCast.cpp", "src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDepthwiseConv2d.cpp", diff --git a/scripts/generate_android_bp.py b/scripts/generate_android_bp.py index 350b52f01c..f7ecbc468b 100755 --- a/scripts/generate_android_bp.py +++ b/scripts/generate_android_bp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2023 Arm Limited. +# Copyright (c) 2023-2024 Arm Limited. # # SPDX-License-Identifier: MIT # @@ -29,9 +29,9 @@ import datetime # Paths to exclude excluded_paths = ["build", - "compute_kernel_writer/build", - "compute_kernel_writer/src", - "compute_kernel_writer/validation", + "compute_kernel_writer/", + "src/dynamic_fusion/runtime/gpu/cl/ckw_driver/", + "src/dynamic_fusion/sketch/gpu/ckw_driver/", "docs/", "documentation/", "examples/", @@ -97,8 +97,7 @@ arm_compute_library_defaults { "-Wno-unused-parameter", "-DNO_DOT_IN_TOOLCHAIN", "-Wno-implicit-fallthrough", - "-fPIC", - "-DACL_INTERNAL_TEST_CKW_IN_DF" + "-fPIC" ], rtti: true, } @@ -109,8 +108,6 @@ cc_library_static { proprietary: true, local_include_dirs: ["build/android-arm64v8a/src/core", "build/android-arm64v8a/src/core/CL", - "compute_kernel_writer/prototype/include", - "compute_kernel_writer/prototype", "src/core/common", "src/core/helpers", "src/core/NEON/kernels/arm_gemm", -- cgit v1.2.1