diff options
author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-06-15 16:23:54 +0000 |
---|---|---|
committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-06-15 16:23:54 +0000 |
commit | 532f6fe9797b7ab0da7fcbbe6641ec9cb5b2fee4 (patch) | |
tree | a202cb0c91535eb05ef9af4311f5b96d766afd89 /tensorflow_lite_support/java/src/native/task | |
parent | c4c5431ba6df2a76f55826da9520d0c61388b28c (diff) | |
parent | 456bf98dcc1a98a825c0d34cb374ba8bbf73083a (diff) | |
download | tflite-support-532f6fe9797b7ab0da7fcbbe6641ec9cb5b2fee4.tar.gz |
[automerge] Add version to AssociatedFile metadata 2p: 456bf98dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tflite-support/+/18748916
Bug: 232807230
Change-Id: I325255aa5fe773a09e82f51a1f226e805cc0234c
Diffstat (limited to 'tensorflow_lite_support/java/src/native/task')
3 files changed, 20 insertions, 6 deletions
diff --git a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/bert_nlclassifier/bert_nl_classifier_jni.cc b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/bert_nlclassifier/bert_nl_classifier_jni.cc index 0866764e..aef82408 100644 --- a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/bert_nlclassifier/bert_nl_classifier_jni.cc +++ b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/bert_nlclassifier/bert_nl_classifier_jni.cc @@ -27,7 +27,8 @@ using ::tflite::support::utils::kInvalidPointer; using ::tflite::support::utils::ThrowException; using ::tflite::task::text::nlclassifier::BertNLClassifier; using ::tflite::task::text::nlclassifier::RunClassifier; -using ::tflite::task::text::nlclassifier::GetVersionNative; +using ::tflite::task::text::nlclassifier::GetModelVersionNative; +using ::tflite::task::text::nlclassifier::GetLabelsVersionNative; extern "C" JNIEXPORT void JNICALL Java_org_tensorflow_lite_task_text_nlclassifier_BertNLClassifier_deinitJni( @@ -73,9 +74,15 @@ Java_org_tensorflow_lite_task_text_nlclassifier_BertNLClassifier_classifyNative( } extern "C" JNIEXPORT jstring JNICALL -Java_org_tensorflow_lite_task_text_nlclassifier_BertNLClassifier_getVersionNative( +Java_org_tensorflow_lite_task_text_nlclassifier_BertNLClassifier_getModelVersionNative( JNIEnv* env, jclass clazz, jlong native_handle) { - return GetVersionNative(env, native_handle); + return GetModelVersionNative(env, native_handle); +} + +extern "C" JNIEXPORT jstring JNICALL +Java_org_tensorflow_lite_task_text_nlclassifier_BertNLClassifier_getLabelsVersionNative( + JNIEnv* env, jclass clazz, jlong native_handle) { + return GetLabelsVersionNative(env, native_handle); } } // namespace diff --git a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.cc b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.cc index e6040674..6b002f71 100644 --- a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.cc +++ b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.cc @@ -50,9 +50,14 @@ jobject RunClassifier(JNIEnv* env, jlong native_handle, jstring text) { }); } -jstring GetVersionNative(JNIEnv* env, jlong native_handle) { +jstring GetModelVersionNative(JNIEnv* env, jlong native_handle) { auto* nl_classifier = reinterpret_cast<NLClassifier*>(native_handle); - return env->NewStringUTF(nl_classifier->GetVersion().c_str()); + return env->NewStringUTF(nl_classifier->GetModelVersion().c_str()); +} + +jstring GetLabelsVersionNative(JNIEnv* env, jlong native_handle) { + auto* nl_classifier = reinterpret_cast<NLClassifier*>(native_handle); + return env->NewStringUTF(nl_classifier->GetLabelsVersion().c_str()); } } // namespace nlclassifier diff --git a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.h b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.h index 2c8fbc07..c21eda70 100644 --- a/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.h +++ b/tensorflow_lite_support/java/src/native/task/text/nlclassifier/nl_classifier_jni_utils.h @@ -25,7 +25,9 @@ namespace nlclassifier { jobject RunClassifier(JNIEnv* env, jlong native_handle, jstring text); -jstring GetVersionNative(JNIEnv* env, jlong native_handle); +jstring GetModelVersionNative(JNIEnv* env, jlong native_handle); + +jstring GetLabelsVersionNative(JNIEnv* env, jlong native_handle); } // namespace nlclassifier } // namespace text |