From ddf115c2203f2731fd36cc7e85dd3ac9fe6fb245 Mon Sep 17 00:00:00 2001
From: Hyeongseok Oh <hseok82.oh@samsung.com>
Date: Tue, 17 Dec 2024 19:10:45 +0900
Subject: [PATCH] [infra/onert] Update coverage and strict build target

This commit updates coverage and strict build target
- Remove coverage build for test and contrib
- Add coverage and strict build for release libraries (python, cl_common)
- Fix build error by strict build option

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
---
 runtime/contrib/gpu_cl/CMakeLists.txt            | 1 -
 runtime/onert/api/python/CMakeLists.txt          | 1 +
 runtime/onert/api/python/src/nnfw_api_wrapper.cc | 5 ++++-
 runtime/onert/backend/cl_common/CMakeLists.txt   | 1 +
 tests/libs/nnapi/CMakeLists.txt                  | 1 -
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/runtime/contrib/gpu_cl/CMakeLists.txt b/runtime/contrib/gpu_cl/CMakeLists.txt
index bf65fce93ef..8f90fce5aa9 100644
--- a/runtime/contrib/gpu_cl/CMakeLists.txt
+++ b/runtime/contrib/gpu_cl/CMakeLists.txt
@@ -27,7 +27,6 @@ target_link_libraries(${LIB_ONERT_BACKEND_GPU_CL} PRIVATE tflite-gpu-delegate)
 target_link_libraries(${LIB_ONERT_BACKEND_GPU_CL} PRIVATE onert_core)
 target_link_libraries(${LIB_ONERT_BACKEND_GPU_CL} PRIVATE ${LIB_ONERT_BACKEND_CL_COMMON})
 target_link_libraries(${LIB_ONERT_BACKEND_GPU_CL} PRIVATE nnfw_common)
-target_link_libraries(${LIB_ONERT_BACKEND_GPU_CL} PRIVATE nnfw_coverage)
 
 set_target_properties(${LIB_ONERT_BACKEND_GPU_CL} PROPERTIES OUTPUT_NAME backend_gpu_cl)
 
diff --git a/runtime/onert/api/python/CMakeLists.txt b/runtime/onert/api/python/CMakeLists.txt
index 50e2a3ab070..25af51f6e3c 100644
--- a/runtime/onert/api/python/CMakeLists.txt
+++ b/runtime/onert/api/python/CMakeLists.txt
@@ -30,6 +30,7 @@ file(GLOB_RECURSE NNFW_API_PYBIND_SOURCES "src/*.cc")
 pybind11_add_module(nnfw_api_pybind ${NNFW_API_PYBIND_SOURCES})
 target_include_directories(nnfw_api_pybind PRIVATE include)
 target_link_libraries(nnfw_api_pybind PRIVATE nnfw-dev)
+target_link_libraries(nnfw_api_pybind PRIVATE nnfw_common nnfw_coverage)
 
 # Install the Python module
 install(TARGETS nnfw_api_pybind DESTINATION lib)
diff --git a/runtime/onert/api/python/src/nnfw_api_wrapper.cc b/runtime/onert/api/python/src/nnfw_api_wrapper.cc
index 64e4fc5cfc8..513311fd367 100644
--- a/runtime/onert/api/python/src/nnfw_api_wrapper.cc
+++ b/runtime/onert/api/python/src/nnfw_api_wrapper.cc
@@ -39,6 +39,9 @@ void ensure_status(NNFW_STATUS status)
     case NNFW_STATUS::NNFW_STATUS_INSUFFICIENT_OUTPUT_SIZE:
       std::cout << "[ERROR]\tNNFW_STATUS_INSUFFICIENT_OUTPUT_SIZE\n";
       exit(1);
+    case NNFW_STATUS::NNFW_STATUS_DEPRECATED_API:
+      std::cout << "[ERROR]\tNNFW_STATUS_DEPRECATED_API\n";
+      exit(1);
   }
 }
 
@@ -129,7 +132,7 @@ const char *getStringType(NNFW_TYPE type)
 uint64_t num_elems(const nnfw_tensorinfo *tensor_info)
 {
   uint64_t n = 1;
-  for (uint32_t i = 0; i < tensor_info->rank; ++i)
+  for (int32_t i = 0; i < tensor_info->rank; ++i)
   {
     n *= tensor_info->dims[i];
   }
diff --git a/runtime/onert/backend/cl_common/CMakeLists.txt b/runtime/onert/backend/cl_common/CMakeLists.txt
index c7512969612..263c33fafb7 100644
--- a/runtime/onert/backend/cl_common/CMakeLists.txt
+++ b/runtime/onert/backend/cl_common/CMakeLists.txt
@@ -5,3 +5,4 @@ add_library(${LIB_ONERT_BACKEND_CL_COMMON} STATIC ${SOURCES})
 target_include_directories(${LIB_ONERT_BACKEND_CL_COMMON} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set_target_properties(${LIB_ONERT_BACKEND_CL_COMMON} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(${LIB_ONERT_BACKEND_CL_COMMON} PUBLIC onert_core)
+target_link_libraries(${LIB_ONERT_BACKEND_CL_COMMON} PRIVATE nnfw_common nnfw_coverage)
diff --git a/tests/libs/nnapi/CMakeLists.txt b/tests/libs/nnapi/CMakeLists.txt
index eb48a7beac1..8aec686d278 100644
--- a/tests/libs/nnapi/CMakeLists.txt
+++ b/tests/libs/nnapi/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(${LIB_NNAPI} STATIC ${SOURCES_FRONTEND})
 target_include_directories(${LIB_NNAPI} PUBLIC include)
 target_link_libraries(${LIB_NNAPI} PUBLIC onert_core) # TODO Link PRIVATE onert_core
 target_link_libraries(${LIB_NNAPI} PRIVATE nnfw_common)
-target_link_libraries(${LIB_NNAPI} PRIVATE nnfw_coverage)
 
 if(NOT ENABLE_TEST)
   return()