Use TfLiteOpaqueDelegate rather than TfLiteDelegate in xnnpackdelegate_jni.cc,
to match the documentation in Delegate.java.
Also, remove unnecessary #include.
PiperOrigin-RevId: 409368034
Change-Id: Icf48c0613c0bb813770d81a31e9e8798ec47cfde
diff --git a/tensorflow/lite/java/src/main/java/org/tensorflow/lite/XnnpackDelegate.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/XnnpackDelegate.java
index 73f8356..8552cf4 100644
--- a/tensorflow/lite/java/src/main/java/org/tensorflow/lite/XnnpackDelegate.java
+++ b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/XnnpackDelegate.java
@@ -35,6 +35,6 @@
// Apply deleteFunction to nativeHandle.
private static native void applyDeleteFunction(long deleteFunction, long nativeHandle);
- private long nativeHandle; // C/C++ type: "TFLiteDelegate *", i.e. pointer to TFLiteDelegate.
- private long deleteFunction; // C/C++ type: "void (*)(TFLiteDelegate*)": pointer to function.
+ private long nativeHandle; // C/C++ type: "TfLiteOpaqueDelegate *".
+ private long deleteFunction; // C/C++ type: "void (*)(TFLiteOpaqueDelegate *)": pointer to func.
}
diff --git a/tensorflow/lite/java/src/main/native/xnnpackdelegate_jni.cc b/tensorflow/lite/java/src/main/native/xnnpackdelegate_jni.cc
index 2412c37..80610cb 100644
--- a/tensorflow/lite/java/src/main/native/xnnpackdelegate_jni.cc
+++ b/tensorflow/lite/java/src/main/native/xnnpackdelegate_jni.cc
@@ -16,17 +16,17 @@
#include <jni.h>
#include "tensorflow/lite/core/shims/c/common.h"
-#include "tensorflow/lite/delegates/xnnpack/xnnpack_delegate.h"
#include "tensorflow/lite/java/src/main/native/jni_utils.h"
using tflite::jni::CastLongToPointer;
namespace {
-using DeleteFunction = void(TfLiteDelegate*);
+using DeleteFunction = void(TfLiteOpaqueDelegate*);
-TfLiteDelegate* convertLongToDelegate(JNIEnv* env, jlong delegate_handle) {
- return CastLongToPointer<TfLiteDelegate>(env, delegate_handle);
+TfLiteOpaqueDelegate* convertLongToDelegate(JNIEnv* env,
+ jlong delegate_handle) {
+ return CastLongToPointer<TfLiteOpaqueDelegate>(env, delegate_handle);
}
DeleteFunction* convertLongToDeleteFunction(JNIEnv* env,
@@ -44,7 +44,7 @@
jlong delegate_handle) {
if (!tflite::jni::CheckJniInitializedOrThrow(env)) return;
- TfLiteDelegate* delegate = convertLongToDelegate(env, delegate_handle);
+ TfLiteOpaqueDelegate* delegate = convertLongToDelegate(env, delegate_handle);
if (delegate == nullptr) return;
DeleteFunction* delete_function =
convertLongToDeleteFunction(env, delete_function_handle);
