From db843b92a42d08d55bd9b06e5c9ce31a4545560f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EA=B9=80=EC=9A=A9=EC=84=AD/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Fri, 15 Jun 2018 15:59:44 +0900 Subject: [PATCH] Revert "[Demo] Enable extended op for android jni (#1653)" (#1685) This reverts commit eded8f893006b679c4d259632523a1f108feb3b7. Now this is not needed becasue upstream TFLite would be changed. Signed-off-by: Yongseop Kim --- externals/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d8a5f23..131db75 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -87,9 +87,12 @@ if("${TARGET_OS}" STREQUAL "android") ) set(TFLITE_JNI_INCLUDES ${TENSORFLOW_LITE_BASE}/java/src/native) + # We need this for running vanilla tflite + # TODO remove this when nnfw is used + set(TFLITE_SRCS_V ${TENSORFLOW_LITE_BASE}/kernels/register.cc) + # TODO use tensorflow-lite static library instead of compiling all the sources again add_library(tensorflowlite_jni SHARED ${TFLITE_JNI_SRCS} ${TFLITE_SRCS} ${TFLITE_SRCS_V}) target_include_directories(tensorflowlite_jni PUBLIC ${TFLITE_JNI_INCLUDES} ${TFLITE_INCLUDES}) target_link_libraries(tensorflowlite_jni eigen3 ${LIB_PTHREAD} dl) - target_link_libraries(tensorflowlite_jni nnfw_support_tflite) endif() -- 2.7.4