[WiP] [Android] Switch to upstream TFlite binaries instead of precompiled ones

README.md

@@ -55,7 +55,19 @@ TensorFlow Lite Flutter plugin provides a flexible and fast solution for accessi
 
 ### Android
 
-Copy the folders from https://github.com/tensorflow/flutter-tflite/tree/main/releases/download/android into your project's /android/app/src/main/jniLibs directory.
+Define the dependency within your project's `android/app/build.gradle` as follows:
+
+```gradle
+dependencies {
+    implementation 'org.tensorflow:tensorflow-lite:2.12.0'
+}
+```
+
+If are using GPU delegates, in addition to the above, also add a dependency on
+
+```gradle
+implementation 'org.tensorflow:tensorflow-lite-gpu:2.12.0'
+```
 
 ### iOS
 

example/text_classification/android/app/build.gradle

@@ -50,7 +50,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "example.android.app.src.main.java.com.tfliteflutter.tflite_flutter_plugin_example"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,4 +74,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'org.tensorflow:tensorflow-lite:2.12.0'
+    implementation 'org.tensorflow:tensorflow-lite-gpu:2.12.0'
 }

example/text_classification/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/text_classification/lib/classifier.dart

@@ -43,7 +43,10 @@ class Classifier {
 
   void _loadModel() async {
     // Creating the interpreter using Interpreter.fromAsset
-    _interpreter = await Interpreter.fromAsset(_modelFile);
+    final gpuDelegateV2 = GpuDelegateV2();
+    final options = InterpreterOptions()..addDelegate(gpuDelegateV2);
+    _interpreter =
+        await Interpreter.fromAsset(_modelFile, options: options);
     print('Interpreter loaded successfully');
   }
 

lib/src/bindings/delegates/gpu_delegate.dart

@@ -32,7 +32,7 @@ import '../types.dart';
 ///
 /// When `options` is set to `nullptr`, then default options are used.
 Pointer<TfLiteDelegate> Function(Pointer<TfLiteGpuDelegateOptionsV2> options)
-    tfLiteGpuDelegateV2Create = tflitelib
+    tfLiteGpuDelegateV2Create = tflitelibgpu
         .lookup<NativeFunction<_TfLiteGpuDelegateV2CreateNativeT>>(
             'TfLiteGpuDelegateV2Create')
         .asFunction();
@@ -41,7 +41,7 @@ typedef _TfLiteGpuDelegateV2CreateNativeT = Pointer<TfLiteDelegate> Function(
     Pointer<TfLiteGpuDelegateOptionsV2> options);
 
 /// Destroys a delegate created with `TfLiteGpuDelegateV2Create` call.
-void Function(Pointer<TfLiteDelegate>) tfLiteGpuDelegateV2Delete = tflitelib
+void Function(Pointer<TfLiteDelegate>) tfLiteGpuDelegateV2Delete = tflitelibgpu
     .lookup<NativeFunction<_TFLGpuDelegateV2DeleteNativeT>>(
         'TfLiteGpuDelegateV2Delete')
     .asFunction();
@@ -51,7 +51,7 @@ typedef _TFLGpuDelegateV2DeleteNativeT = Void Function(
 
 /// Creates TfLiteGpuDelegateV2 with default options
 TfLiteGpuDelegateOptionsV2 Function() tfLiteGpuDelegateOptionsV2Default =
-    tflitelib
+    tflitelibgpu
         .lookup<
                 NativeFunction<
                     _TfLiteTfLiteGpuDelegateOptionsV2DefaultNativeT>>(

lib/src/bindings/dlib.dart

@@ -44,11 +44,23 @@ String get binaryName {
 // ignore: missing_return
 DynamicLibrary tflitelib = () {
   if (Platform.isAndroid) {
-    return DynamicLibrary.open('libtensorflowlite_c.so');
+    return DynamicLibrary.open('libtensorflowlite_jni.so');
   } else if (Platform.isIOS) {
     return DynamicLibrary.process();
   } else {
     return DynamicLibrary.open(
         '${Directory(Platform.resolvedExecutable).parent.path}/blobs/$binaryName');
   }
 }();
+
+DynamicLibrary tflitelibgpu = () {
+  if (Platform.isAndroid) {
+    return DynamicLibrary.open('libtensorflowlite_gpu_jni.so');
+  } else if (Platform.isIOS) {
+    return DynamicLibrary.process();
+  } else {
+    return DynamicLibrary.open(
+        Directory(Platform.resolvedExecutable).parent.path +
+            '/blobs/${binaryName}');
+  }
+}();