From 023b1eb953873ed5d813e4cbcb5b0bf63eb70568 Mon Sep 17 00:00:00 2001 From: Kristofer Jonsson Date: Wed, 23 Nov 2022 13:06:13 +0100 Subject: Remove ethosu_core and ethosu_applications Interface libraries ethosu_core and ethosu_applications are removed. Each application shall depend directly on the libraries they need. Change-Id: I4d37c6c50aa276beaa8e2681a63cea90977477ce --- applications/CMakeLists.txt | 5 +---- applications/inference_process/CMakeLists.txt | 20 ++++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) (limited to 'applications') diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 88dd052..1f6f6aa 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2021 Arm Limited. All rights reserved. +# SPDX-FileCopyrightText: Copyright 2019-2022 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # @@ -16,8 +16,5 @@ # limitations under the License. # -add_library(ethosu_applications INTERFACE) - # Build inference process add_subdirectory(inference_process) -target_link_libraries(ethosu_applications INTERFACE inference_process) diff --git a/applications/inference_process/CMakeLists.txt b/applications/inference_process/CMakeLists.txt index 4142f11..a26a1e2 100644 --- a/applications/inference_process/CMakeLists.txt +++ b/applications/inference_process/CMakeLists.txt @@ -18,26 +18,18 @@ set(TR_PRINT_OUTPUT_BYTES "" CACHE STRING "Print output data.") -add_library(inference_process STATIC) +add_library(inference_process INTERFACE) -target_include_directories(inference_process PUBLIC include) +target_include_directories(inference_process INTERFACE include) -target_link_libraries(inference_process PRIVATE tflu cmsis_core cmsis_device ethosu_crc) - -if (TARGET layer_by_layer_profiler) - target_link_libraries(inference_process PRIVATE layer_by_layer_profiler) -endif() +target_link_libraries(inference_process INTERFACE tflu cmsis_core cmsis_device ethosu_crc) if (TARGET arm_profiler) - target_link_libraries(inference_process PRIVATE arm_profiler) + target_link_libraries(inference_process INTERFACE arm_profiler) endif() if (TARGET ethosu_log) - target_link_libraries(inference_process PRIVATE ethosu_log) + target_link_libraries(inference_process INTERFACE ethosu_log) endif() -target_sources(inference_process PRIVATE src/inference_process.cpp) - -if (DEFINED INFERENCE_PROCESS_OPS_RESOLVER) - target_compile_definitions(inference_process PRIVATE INFERENCE_PROCESS_OPS_RESOLVER=${INFERENCE_PROCESS_OPS_RESOLVER}) -endif() \ No newline at end of file +target_sources(inference_process INTERFACE src/inference_process.cpp) -- cgit v1.2.1