From c01da459e63461dc0ecfe855fd3254c938689386 Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Mon, 23 Jan 2023 10:20:04 +0000 Subject: Refactor TOSA Common to be built without enabling the TOSA Reference backend * The only way to build TOSA common was to enable ARMNNTOSAREF. * Only include and link the required headers/libraries for TOSA Common. * Remove duplicate include_directories calls. Signed-off-by: Matthew Sloyan Change-Id: Ia5a19bf5b0bb903be0248ac550439df1e8ac5aa7 --- src/backends/tosaCommon/CMakeLists.txt | 6 +----- src/backends/tosaCommon/common.cmake | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/backends/tosaCommon') diff --git a/src/backends/tosaCommon/CMakeLists.txt b/src/backends/tosaCommon/CMakeLists.txt index 1b1cc55eab..4a9cd574a9 100644 --- a/src/backends/tosaCommon/CMakeLists.txt +++ b/src/backends/tosaCommon/CMakeLists.txt @@ -1,12 +1,8 @@ # -# Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +# Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # -include_directories(SYSTEM ${FLATBUFFERS_INCLUDE_PATH}) -include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/half) -include_directories(SYSTEM ${TOSA_SERIALIZATION_LIB_INCLUDE}) - list(APPEND armnnTosaBackend_sources TosaMappings.hpp TosaMappings.cpp diff --git a/src/backends/tosaCommon/common.cmake b/src/backends/tosaCommon/common.cmake index f15c063700..3823cf1d72 100644 --- a/src/backends/tosaCommon/common.cmake +++ b/src/backends/tosaCommon/common.cmake @@ -1,9 +1,9 @@ # -# Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +# Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # -if(ARMNNTOSAREF) +if(ARMNNTOSACOMMON) add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/tosaCommon) list(APPEND armnnLibraries armnnTosaBackend) list(APPEND armnnLibraries armnnTosaBackendOperators) -- cgit v1.2.1