diff options
author | Chunseok Lee <chunseok.lee@samsung.com> | 2019-07-22 18:24:09 +0900 |
---|---|---|
committer | Chunseok Lee <chunseok.lee@samsung.com> | 2019-07-22 18:24:09 +0900 |
commit | 3c59796b7eeac39a8e78bddd205c8463516ee863 (patch) | |
tree | 70e7ce8d47b363a8f12c99c752d471e84ce9baa0 | |
parent | a665ef755548d63c9e1878a8672d6b6cc0683735 (diff) | |
download | nnfw-submit/tizen/20190722.095424.tar.gz nnfw-submit/tizen/20190722.095424.tar.bz2 nnfw-submit/tizen/20190722.095424.zip |
Update TFLite version to v1.13.1submit/tizen/20190722.095424accepted/tizen/unified/20190723.112126
- Reflect recent update of tensorflow-lite-devel package
Change-Id: I06a6c199ff4e2270280139fef25276c84ec4f356
Signed-off-by: Chunseok Lee <chunseok.lee@samsung.com>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | libs/tflite/src/ext/kernels/register.cpp | 8 | ||||
-rw-r--r-- | libs/tflite/src/ext/nnapi_delegate.cpp | 8 | ||||
-rw-r--r-- | libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc | 2 | ||||
-rw-r--r-- | packaging/nnfw.spec | 4 |
5 files changed, 12 insertions, 12 deletions
@@ -11,7 +11,7 @@ BENCHMARK_ACL_BUILD?=0 OPTIONS?= GENERATE_NNAPI_TESTS?=1 TFLITE_MAJOR_VER?=1 -TFLITE_MINOR_VER?=12 +TFLITE_MINOR_VER?=13 # make TARGET and TYPE to lowercase TARGET_ARCH_LC=$(shell echo $(TARGET_ARCH) | tr A-Z a-z) diff --git a/libs/tflite/src/ext/kernels/register.cpp b/libs/tflite/src/ext/kernels/register.cpp index e354bbf57..b4bc4ca2c 100644 --- a/libs/tflite/src/ext/kernels/register.cpp +++ b/libs/tflite/src/ext/kernels/register.cpp @@ -90,7 +90,7 @@ TfLiteRegistration *Register_SLICE(); TfLiteRegistration *Register_SIN(); TfLiteRegistration *Register_TRANSPOSE_CONV(); TfLiteRegistration *Register_SPARSE_TO_DENSE(); -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 TfLiteRegistration *Register_SUM(); TfLiteRegistration *Register_REDUCE_MAX(); TfLiteRegistration *Register_REDUCE_MIN(); @@ -110,7 +110,7 @@ TfLiteRegistration *Register_UNPACK(); TfLiteRegistration *Register_FLOOR_DIV(); TfLiteRegistration *Register_SQUARE(); TfLiteRegistration *Register_ZEROS_LIKE(); -#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 } // namespace builtin } // namespace ops @@ -187,7 +187,7 @@ BuiltinOpResolver::BuiltinOpResolver() AddBuiltin(BuiltinOperator_SELECT, Register_SELECT()); AddBuiltin(BuiltinOperator_SLICE, Register_SLICE()); AddBuiltin(BuiltinOperator_SIN, Register_SIN()); -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 AddBuiltin(BuiltinOperator_SUM, Register_SUM()); AddBuiltin(BuiltinOperator_REDUCE_MAX, Register_REDUCE_MAX()); AddBuiltin(BuiltinOperator_REDUCE_MIN, Register_REDUCE_MIN()); @@ -209,7 +209,7 @@ BuiltinOpResolver::BuiltinOpResolver() AddBuiltin(BuiltinOperator_FLOOR_DIV, Register_FLOOR_DIV()); AddBuiltin(BuiltinOperator_SQUARE, Register_SQUARE()); AddBuiltin(BuiltinOperator_ZEROS_LIKE, Register_ZEROS_LIKE()); -#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 AddCustom("TensorFlowMax", nnfw::tflite::custom::Register_TensorFlowMax()); AddCustom("SquaredDifference", nnfw::tflite::custom::Register_SquaredDifference()); diff --git a/libs/tflite/src/ext/nnapi_delegate.cpp b/libs/tflite/src/ext/nnapi_delegate.cpp index b530dd725..58de95c42 100644 --- a/libs/tflite/src/ext/nnapi_delegate.cpp +++ b/libs/tflite/src/ext/nnapi_delegate.cpp @@ -765,7 +765,7 @@ TfLiteStatus AddOpsAndParams( augmented_inputs.data(), static_cast<uint32_t>(node.outputs->size), reinterpret_cast<uint32_t*>(node.outputs->data))); continue; -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 case tflite::BuiltinOperator_PACK: add_pack_ex_params(node.builtin_data); CHECK_NN(ANeuralNetworksModel_addOperationEx( @@ -888,7 +888,7 @@ TfLiteStatus AddOpsAndParams( //case tflite::BuiltinOperator_PRELU: case tflite::BuiltinOperator_MAXIMUM: case tflite::BuiltinOperator_MINIMUM: -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 case tflite::BuiltinOperator_ARG_MIN: #endif case tflite::BuiltinOperator_GREATER: @@ -899,11 +899,11 @@ TfLiteStatus AddOpsAndParams( case tflite::BuiltinOperator_SELECT: case tflite::BuiltinOperator_SLICE: case tflite::BuiltinOperator_SIN: -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 case tflite::BuiltinOperator_LOG: #endif //case tflite::BuiltinOperator_TRANSPOSE_CONV: -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 case tflite::BuiltinOperator_TILE: case tflite::BuiltinOperator_EXPAND_DIMS: case tflite::BuiltinOperator_SPARSE_TO_DENSE: diff --git a/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc b/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc index 7924bb2bc..d8ba8d62b 100644 --- a/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc +++ b/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc @@ -56,7 +56,7 @@ } }; -#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12 +#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13 auto add_pack_ex_params = [&add_scalar_int32](void* data) { auto builtin = reinterpret_cast<TfLitePackParams*>(data); add_scalar_int32(builtin->values_count); diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec index 6508d7907..203786db1 100644 --- a/packaging/nnfw.spec +++ b/packaging/nnfw.spec @@ -48,9 +48,9 @@ NNFW test rpm. It does not depends on nnfw rpm since it contains nnfw runtime. %{!?coverage_build: %define coverage_build 0} %if %{coverage_build} == 1 -%define build_options COVERAGE_BUILD=1 OBS_BUILD=1 BUILD_TYPE=Debug TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 +%define build_options COVERAGE_BUILD=1 OBS_BUILD=1 BUILD_TYPE=Debug TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=13 %else -%define build_options OBS_BUILD=1 BUILD_TYPE=%{build_type} INSTALL_PATH=%{buildroot}%{_prefix} TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 +%define build_options OBS_BUILD=1 BUILD_TYPE=%{build_type} INSTALL_PATH=%{buildroot}%{_prefix} TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=13 %endif %prep |