diff options
| author | Colm Donelan <colm.donelan@arm.com> | 2023-01-12 22:19:38 +0000 |
|---|---|---|
| committer | Colm Donelan <colm.donelan@arm.com> | 2023-01-16 11:45:06 +0000 |
| commit | 4e54e9c12e352883c81475adff677d54244757ee (patch) | |
| tree | ec6873ec8f59ed22d3ce56fc9960dc7578965dae | |
| parent | c074cdb1b035b0bcd0be9aa25feab97d2613140f (diff) | |
| download | armnn-4e54e9c12e352883c81475adff677d54244757ee.tar.gz | |
IVGCVSW-7435 Making optional some CL code in Acl Common.
* Some code was moved to aclcommon to facilitate GpuFsa. It causes
build problems when ACL is build without CL support.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: Ia49d1fb7e69aaa8a694f402968e9ae689c2a874c
| -rw-r--r-- | src/backends/aclCommon/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/backends/aclCommon/common.mk | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index b3bf89e750..eaaed65c17 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -8,14 +8,19 @@ list(APPEND armnnAclCommon_sources ArmComputeTensorHandle.hpp ArmComputeTensorUtils.hpp ArmComputeTensorUtils.cpp - ArmComputeTuningUtils.hpp - ArmComputeTuningUtils.cpp ArmComputeUtils.hpp BaseMemoryManager.cpp BaseMemoryManager.hpp IClTensorHandle.hpp ) +if(ARMCOMPUTECL) + list(APPEND armnnAclCommon_sources + ArmComputeTuningUtils.hpp + ArmComputeTuningUtils.cpp + ) +endif() + if(BUILD_UNIT_TESTS) add_subdirectory(test) endif() diff --git a/src/backends/aclCommon/common.mk b/src/backends/aclCommon/common.mk index b113269df9..a5ef90038a 100644 --- a/src/backends/aclCommon/common.mk +++ b/src/backends/aclCommon/common.mk @@ -1,5 +1,5 @@ # -# Copyright © 2017 ARM Ltd. All rights reserved. +# Copyright © 2017,2023 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # @@ -9,9 +9,13 @@ COMMON_SOURCES := \ ArmComputeTensorUtils.cpp \ - ArmComputeTuningUtils.cpp \ BaseMemoryManager.cpp +ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1) +COMMON_SOURCES += \ + ArmComputeTuningUtils.cpp +endif # ARMNN_COMPUTE_CL_ENABLED == 1 + # COMMON_TEST_SOURCES contains the list of files to be included # in the Android unit test build (armnn-tests) and it is picked # up by the Android.mk file in the root of ArmNN |