[neurun] Change CMake target name for neurun core (#6782)

Change target name to `neurun_core` from `neurun-core` for consistency
of target name.

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>

diff --git a/runtimes/neurun/backend/acl_cl/CMakeLists.txt b/runtimes/neurun/backend/acl_cl/CMakeLists.txt
index cb0aae7..7d7b50c 100644 (file)
--- a/runtimes/neurun/backend/acl_cl/CMakeLists.txt
+++ b/runtimes/neurun/backend/acl_cl/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB_RECURSE SOURCES "*.cc")
 add_library(${LIB_NEURUN_BACKEND_ACL_CL} SHARED ${SOURCES})
 
 target_include_directories(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE neurun-core)
+target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE neurun_core)
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE ${LIB_NEURUN_BACKEND_ACL_COMMON})
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE nnfw_common)
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE nnfw_coverage)

diff --git a/runtimes/neurun/backend/acl_neon/CMakeLists.txt b/runtimes/neurun/backend/acl_neon/CMakeLists.txt
index 362caaf..bb23343 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/CMakeLists.txt
+++ b/runtimes/neurun/backend/acl_neon/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB_RECURSE SOURCES "*.cc")
 add_library(${LIB_NEURUN_BACKEND_ACL_NEON} SHARED ${SOURCES})
 
 target_include_directories(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE neurun-core)
+target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE neurun_core)
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE ${LIB_NEURUN_BACKEND_ACL_COMMON})
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE nnfw_common)
 target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE nnfw_coverage)

diff --git a/runtimes/neurun/backend/cpu/CMakeLists.txt b/runtimes/neurun/backend/cpu/CMakeLists.txt
index 47ae6ab..c7b9b4d 100644 (file)
--- a/runtimes/neurun/backend/cpu/CMakeLists.txt
+++ b/runtimes/neurun/backend/cpu/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(${LIB_NEURUN_BACKEND_CPU} SHARED ${SOURCES})
 
 target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PUBLIC nnfw_lib_cpp14)
 target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PRIVATE nnfw_lib_misc nnfw_lib_cker)
-target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PRIVATE neurun-core)
+target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PRIVATE neurun_core)
 target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PRIVATE nnfw_common)
 target_link_libraries(${LIB_NEURUN_BACKEND_CPU} PRIVATE nnfw_coverage)
 

diff --git a/runtimes/neurun/backend/hi_perf_cpu/CMakeLists.txt b/runtimes/neurun/backend/hi_perf_cpu/CMakeLists.txt
index ed2c83a..816edba 100644 (file)
--- a/runtimes/neurun/backend/hi_perf_cpu/CMakeLists.txt
+++ b/runtimes/neurun/backend/hi_perf_cpu/CMakeLists.txt
@@ -21,7 +21,7 @@ add_library(${LIB_NEURUN_BACKEND_HI_PERF_CPU} SHARED ${SOURCES})
 
 target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE nnfw_lib_misc)
 target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE nnfw_lib_cpp14)
-target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE neurun-core)
+target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE neurun_core)
 target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE nnfw_common)
 target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE nnpack pthreadpool cpuinfo)
 target_link_libraries(${LIB_NEURUN_BACKEND_HI_PERF_CPU} PRIVATE nnfw_coverage)

diff --git a/runtimes/neurun/core/CMakeLists.txt b/runtimes/neurun/core/CMakeLists.txt
index 6df1198..f4906ee 100644 (file)
--- a/runtimes/neurun/core/CMakeLists.txt
+++ b/runtimes/neurun/core/CMakeLists.txt
@@ -1,12 +1,12 @@
 file(GLOB_RECURSE SOURCES "src/*.cc")
 
-add_library(neurun-core STATIC ${SOURCES})
-set_target_properties(neurun-core PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(neurun-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_include_directories(neurun-core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_link_libraries(neurun-core PUBLIC nnfw_lib_misc)
-target_link_libraries(neurun-core PUBLIC nnfw_lib_cpp14)
-target_link_libraries(neurun-core PRIVATE nnfw_lib_cker)
-target_link_libraries(neurun-core PRIVATE nnfw_common)
-target_link_libraries(neurun-core PRIVATE nnfw_coverage)
-target_link_libraries(neurun-core PRIVATE dl)
+add_library(neurun_core STATIC ${SOURCES})
+set_target_properties(neurun_core PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(neurun_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(neurun_core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+target_link_libraries(neurun_core PUBLIC nnfw_lib_misc)
+target_link_libraries(neurun_core PUBLIC nnfw_lib_cpp14)
+target_link_libraries(neurun_core PRIVATE nnfw_lib_cker)
+target_link_libraries(neurun_core PRIVATE nnfw_common)
+target_link_libraries(neurun_core PRIVATE nnfw_coverage)
+target_link_libraries(neurun_core PRIVATE dl)

diff --git a/runtimes/neurun/frontend/api/CMakeLists.txt b/runtimes/neurun/frontend/api/CMakeLists.txt
index 4106b82..a79d92d 100644 (file)
--- a/runtimes/neurun/frontend/api/CMakeLists.txt
+++ b/runtimes/neurun/frontend/api/CMakeLists.txt
@@ -4,7 +4,7 @@ set(NEURUN_DEV nnfw-dev)
 add_library(${NEURUN_DEV} SHARED ${API_SRC})
 
 target_link_libraries(${NEURUN_DEV} PUBLIC nnfw-header)
-target_link_libraries(${NEURUN_DEV} PUBLIC neurun-core) # TODO Link PRIVATE neurun-core
+target_link_libraries(${NEURUN_DEV} PUBLIC neurun_core) # TODO Link PRIVATE neurun_core
 target_link_libraries(${NEURUN_DEV} PRIVATE jsoncpp tflite_loader pthread)
 target_link_libraries(${NEURUN_DEV} PRIVATE nnfw_common)
 target_link_libraries(${NEURUN_DEV} PRIVATE nnfw_coverage)

diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
index 394dd61..bd58de9 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/CMakeLists.txt
+++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
@@ -4,7 +4,7 @@ list(REMOVE_ITEM SOURCES_FRONTEND ${TESTS_FRONTEND})
 
 add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND})
 target_link_libraries(${LIB_NEURUN} PUBLIC nnfw-header)
-target_link_libraries(${LIB_NEURUN} PUBLIC neurun-core) # TODO Link PRIVATE neurun-core
+target_link_libraries(${LIB_NEURUN} PUBLIC neurun_core) # TODO Link PRIVATE neurun_core
 target_link_libraries(${LIB_NEURUN} PRIVATE nnfw_common)
 target_link_libraries(${LIB_NEURUN} PRIVATE nnfw_coverage)
 

diff --git a/runtimes/neurun/frontend/tflite/CMakeLists.txt b/runtimes/neurun/frontend/tflite/CMakeLists.txt
index 52450f7..738a692 100644 (file)
--- a/runtimes/neurun/frontend/tflite/CMakeLists.txt
+++ b/runtimes/neurun/frontend/tflite/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(tflite_loader SHARED ${SOURCES_TFLITE_LOADER})
 nnfw_find_package(FlatBuffersSource REQUIRED)
 target_include_directories(tflite_loader PUBLIC ${FlatBuffersSource_DIR}/include .)
 
-target_link_libraries(tflite_loader PUBLIC neurun-core) # TODO Link PRIVATE neurun-core
+target_link_libraries(tflite_loader PUBLIC neurun_core) # TODO Link PRIVATE neurun_core
 target_link_libraries(tflite_loader PUBLIC nnfw_lib_misc nnfw_lib_cpp14)
 target_link_libraries(tflite_loader PRIVATE nnfw_common)
 target_link_libraries(tflite_loader PRIVATE nnfw_coverage)

diff --git a/runtimes/neurun/test/CMakeLists.txt b/runtimes/neurun/test/CMakeLists.txt
index b29203f..f21caab 100644 (file)
--- a/runtimes/neurun/test/CMakeLists.txt
+++ b/runtimes/neurun/test/CMakeLists.txt
@@ -6,7 +6,7 @@ add_executable(${TEST_NEURUN} ${TESTS})
 
 target_include_directories(${TEST_NEURUN} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core/src)
 
-target_link_libraries(${TEST_NEURUN} neurun-core)
+target_link_libraries(${TEST_NEURUN} neurun_core)
 target_link_libraries(${TEST_NEURUN} gtest)
 target_link_libraries(${TEST_NEURUN} gtest_main)
 target_link_libraries(${TEST_NEURUN} ${LIB_PTHREAD})

diff --git a/tests/tools/nnpackage_run/CMakeLists.txt b/tests/tools/nnpackage_run/CMakeLists.txt
index 6900b76..95cf89f 100644 (file)
--- a/tests/tools/nnpackage_run/CMakeLists.txt
+++ b/tests/tools/nnpackage_run/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(nnpackage_run ${NNPACKAGE_RUN_SRCS})
 target_include_directories(nnpackage_run PRIVATE src)
 target_include_directories(nnpackage_run PRIVATE ${Boost_INCLUDE_DIRS})
 
-target_link_libraries(nnpackage_run neurun-core neurun tflite_loader)
+target_link_libraries(nnpackage_run neurun_core neurun tflite_loader)
 target_link_libraries(nnpackage_run tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_tflite)
 target_link_libraries(nnpackage_run nnfw-dev)
 target_link_libraries(nnpackage_run boost_program_options boost_system boost_filesystem)

diff --git a/tests/tools/tflite_loader/CMakeLists.txt b/tests/tools/tflite_loader/CMakeLists.txt
index 1523cde..2705537 100644 (file)
--- a/tests/tools/tflite_loader/CMakeLists.txt
+++ b/tests/tools/tflite_loader/CMakeLists.txt
@@ -16,7 +16,7 @@ nnfw_find_package(Boost REQUIRED)
 add_executable(tflite_loader_test_tool ${SOURCES})
 target_include_directories(tflite_loader_test_tool PRIVATE ${Boost_INCLUDE_DIRS})
 
-target_link_libraries(tflite_loader_test_tool neurun-core neurun tflite_loader)
+target_link_libraries(tflite_loader_test_tool neurun_core neurun tflite_loader)
 target_link_libraries(tflite_loader_test_tool nnfw_lib_tflite tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_misc)
 target_link_libraries(tflite_loader_test_tool boost_program_options boost_system boost_filesystem)