From: 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 Date: Mon, 21 Oct 2019 05:59:21 +0000 (+0900) Subject: [nnfw-api] Merge custom op API implementation (#8340) X-Git-Tag: submit/tizen/20191205.083104~669 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf438e3fb9c39f64ab675e5a3570a23147084d6d;p=platform%2Fcore%2Fml%2Fnnfw.git [nnfw-api] Merge custom op API implementation (#8340) Move custom op API implementation into neurun/api Signed-off-by: Hyeongseok Oh --- diff --git a/runtimes/neurun/api/CMakeLists.txt b/runtimes/neurun/api/CMakeLists.txt index 2d1e55e..4ded7ad 100644 --- a/runtimes/neurun/api/CMakeLists.txt +++ b/runtimes/neurun/api/CMakeLists.txt @@ -8,5 +8,4 @@ target_link_libraries(${NEURUN_DEV} PUBLIC neurun_core) # TODO Link PRIVATE neur target_link_libraries(${NEURUN_DEV} PRIVATE jsoncpp tflite_loader circle_loader ${LIB_PTHREAD}) target_link_libraries(${NEURUN_DEV} PRIVATE nnfw_common) target_link_libraries(${NEURUN_DEV} PRIVATE nnfw_coverage) -target_link_libraries(${NEURUN_DEV} PRIVATE frontend_custom_op_common) install(TARGETS ${NEURUN_DEV} DESTINATION lib) diff --git a/runtimes/neurun/frontend/common/src/CustomKernel.cc b/runtimes/neurun/api/CustomKernel.cc similarity index 100% rename from runtimes/neurun/frontend/common/src/CustomKernel.cc rename to runtimes/neurun/api/CustomKernel.cc diff --git a/runtimes/neurun/frontend/common/include/CustomKernel.h b/runtimes/neurun/api/CustomKernel.h similarity index 100% rename from runtimes/neurun/frontend/common/include/CustomKernel.h rename to runtimes/neurun/api/CustomKernel.h diff --git a/runtimes/neurun/frontend/common/src/CustomKernelRegistry.cc b/runtimes/neurun/api/CustomKernelRegistry.cc similarity index 100% rename from runtimes/neurun/frontend/common/src/CustomKernelRegistry.cc rename to runtimes/neurun/api/CustomKernelRegistry.cc diff --git a/runtimes/neurun/frontend/common/include/CustomKernelRegistry.h b/runtimes/neurun/api/CustomKernelRegistry.h similarity index 100% rename from runtimes/neurun/frontend/common/include/CustomKernelRegistry.h rename to runtimes/neurun/api/CustomKernelRegistry.h diff --git a/runtimes/neurun/frontend/common/CMakeLists.txt b/runtimes/neurun/frontend/common/CMakeLists.txt deleted file mode 100644 index 1d8ab3a..0000000 --- a/runtimes/neurun/frontend/common/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -file(GLOB_RECURSE SOURCES_COMMON_CUSTOM_OP "src/*.cc") - -set(CUSTOM_OP_COMMON_NAME frontend_custom_op_common) - -add_library(${CUSTOM_OP_COMMON_NAME} STATIC ${SOURCES_COMMON_CUSTOM_OP}) -target_link_libraries(${CUSTOM_OP_COMMON_NAME} PRIVATE neurun_core) -target_link_libraries(${CUSTOM_OP_COMMON_NAME} PRIVATE nnfw-header) - -target_include_directories(${CUSTOM_OP_COMMON_NAME} PUBLIC include) - -set_property(TARGET ${CUSTOM_OP_COMMON_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)