Merge pull request #19 from am15h/update_0.2.0

Update 0.2.0
am15h · May 11, 2020 · add359a · add359a
2 parents 560d450 + 0e23897
commit add359a
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 72 deletions.
diff --git a/.github/workflows/flutter_drive.yml b/.github/workflows/flutter_drive.yml
@@ -16,7 +16,7 @@ jobs:
       # environment.
       matrix:
         device:
-          - "iPhone 11 Pro Max (13.3)"
+          - "iPhone 11 Pro Max (13.4.1)"
       # When set to true, GitHub cancels all in-progress jobs if any
       # matrix job fails.
       fail-fast: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0
+* Direct conversion support for more TfLiteTypes
+* int16, float16, int8, int64
+* Pre-built tf 2.2.0 stable binaries
+
 ## 0.1.3
 * update usage instructions
 

diff --git a/example/assets/test/int64.bin b/example/assets/test/int64.bin
diff --git a/example/install.sh b/example/install.sh
@@ -3,7 +3,7 @@
 cd "$(dirname "$(readlink -f "$0")")"
 
 URL="https://github.com/am15h/tflite_flutter_plugin/releases/download/"
-TAG="v0.1.0"
+TAG="v0.2.0"
 
 ANDROID_DIR="android/app/src/main/jniLibs/"
 ANDROID_LIB="libtensorflowlite_c.so"
@@ -15,8 +15,6 @@ ARM_64="libtensorflowlite_c_arm64.so"
 X86="libtensorflowlite_c_x86.so"
 X86_64="libtensorflowlite_c_x86_64.so"
 
-#IOS="https://github.com/am15h/tflite_flutter_plugin/releases/download/v0.1.0/TensorFlowLiteC.framework_fat.zip"
-
 delegate=0
 
 while getopts "d" OPTION
@@ -47,10 +45,4 @@ download ${ARM_64} "arm64-v8a"
 fi
 
 download ${X86} "x86"
-download ${X86_64} "x86_64"
-
-#ios
-#wget "$IOS"
-#unzip TensorFlowLiteC.framework_fat.zip
-#rm TensorFlowLiteC.framework_fat.zip
-#mv TensorFlowLiteC.framework ios/
+download ${X86_64} "x86_64"
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "2.2.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.4"
+    version: "0.39.7"
   archive:
     dependency: transitive
     description:
@@ -70,7 +70,7 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.6"
+    version: "0.13.9"
   crypto:
     dependency: transitive
     description:
@@ -98,7 +98,7 @@ packages:
       name: e2e
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4+2"
+    version: "0.4.0"
   ffi:
     dependency: transitive
     description:
@@ -167,7 +167,7 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   image:
     dependency: transitive
     description:
@@ -188,7 +188,7 @@ packages:
       name: io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.4"
   js:
     dependency: transitive
     description:
@@ -265,7 +265,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.9.3"
   package_resolver:
     dependency: transitive
     description:
@@ -286,7 +286,21 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.1"
+    version: "1.6.5"
+  path_provider_macos:
+    dependency: transitive
+    description:
+      name: path_provider_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.4"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   pedantic:
     dependency: transitive
     description:
@@ -308,6 +322,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.1"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   pool:
     dependency: transitive
     description:
@@ -439,13 +460,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.15"
-  tflite_flutter_plugin:
-    dependency: "direct dev"
+  tflite_flutter:
+    dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.1"
+    version: "0.1.3"
   typed_data:
     dependency: transitive
     description:
@@ -480,7 +501,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+13"
+    version: "0.9.7+14"
   web_socket_channel:
     dependency: transitive
     description:
@@ -503,5 +524,5 @@ packages:
     source: hosted
     version: "2.2.0"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.7.0 <3.0.0"
   flutter: ">=1.10.0 <2.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -9,7 +9,8 @@ dependencies:
   flutter:
     sdk: flutter
 
-  tflite_flutter: ^0.1.2
+  tflite_flutter:
+    path: ../
   path_provider:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -20,8 +21,8 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
+  e2e:
   test:
-  e2e: ^0.2.4+2
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

diff --git a/example/test/tflite_flutter_plugin_example_e2e.dart b/example/test/tflite_flutter_plugin_example_e2e.dart
@@ -16,6 +16,7 @@ final missingFileName = 'missing.tflite';
 final badFileName = 'bad_model.tflite';
 final quantFileName = 'mobilenet_quant.tflite';
 final intFileName = 'int32.bin';
+final int64FileName = 'int64.bin';
 final multiInputFileName = 'multi_add.bin';
 final addFileName = 'add.bin';
 
@@ -184,18 +185,21 @@ void main() {
         });
       });
 
-      group('quantization', () {
-        tfl.Interpreter interpreter;
-        setUp(() async {
-          interpreter = await tfl.Interpreter.fromAsset('test/$quantFileName');
-        });
-        tearDown(() => interpreter.close());
-        test('params', () {
-          interpreter.allocateTensors();
-          final tensor = interpreter.getInputTensor(0);
-          print(tensor.params);
+      if (Platform.isAndroid) {
+        group('quantization', () {
+          tfl.Interpreter interpreter;
+          setUp(() async {
+            interpreter =
+                await tfl.Interpreter.fromAsset('test/$quantFileName');
+          });
+          tearDown(() => interpreter.close());
+          test('params', () {
+            interpreter.allocateTensors();
+            final tensor = interpreter.getInputTensor(0);
+            print(tensor.params);
+          });
         });
-      });
+      }
     });
   });
 
@@ -219,8 +223,9 @@ void main() {
       });
       test('multiple input', () async {
         tfl.Interpreter interpreter;
-        interpreter =
-            await tfl.Interpreter.fromAsset('test/$multiInputFileName');
+        interpreter = await tfl.Interpreter.fromAsset(
+          'test/$multiInputFileName',
+        );
         final inputTensors = interpreter.getInputTensors();
         expect(inputTensors.length, 4);
         expect(inputTensors[0].type, tfl.TfLiteType.float32);
@@ -291,6 +296,23 @@ void main() {
       expect(output[0][0][0], [3, 7, -4, 3, 7, -4, 3, 7, -4, 3, 7, -4]);
       interpreter.close();
     });
+    test('with int64', () async {
+      tfl.Interpreter interpreter;
+      final path = await getPathOnDevice(int64FileName);
+      interpreter = tfl.Interpreter.fromFile(File(path));
+      print(interpreter.getInputTensor(0));
+      final oneD = <int>[3, 7, -4];
+      final twoD = List.filled(8, oneD);
+      final threeD = List.filled(8, twoD);
+      final fourD = List.filled(2, threeD);
+
+      var output = List(2 * 4 * 4 * 12).reshape([2, 4, 4, 12]);
+
+      interpreter.run(fourD, output);
+
+      expect(output[0][0][0], [3, 7, -4, 3, 7, -4, 3, 7, -4, 3, 7, -4]);
+      interpreter.close();
+    });
     if (Platform.isAndroid) {
       test('using set use NnApi', () async {
         tfl.Interpreter interpreter;
@@ -329,29 +351,20 @@ void main() {
       });
 
       // Unable to create interpreter
-      /*test('using GpuDelegateV2 android', () async {
-      tfl.Interpreter interpreter;
-      final gpuDelegate = tfl.GpuDelegateV2();
-      var interpreterOptions = tfl.InterpreterOptions()
-        ..addDelegate(gpuDelegate);
-      interpreter = await tfl.Interpreter.fromAsset('test/$addFileName',
-          options: interpreterOptions);
-      var o = [1.23, 6.54, 7.81];
-      var two = [o, o, o, o, o, o, o, o];
-      var three = [two, two, two, two, two, two, two, two];
-      var four = [three];
-      var output = List(1 * 8 * 8 * 3).reshape([1, 8, 8, 3]);
-      interpreter.run(four, output);
-      var exp = '';
-      if (output[0][0][0][0] is double) {
-        exp = (output[0][0][0][0] as double).toStringAsFixed(2);
-      }
-      expect(exp, '3.69');
-      interpreter.close();
-    });*/
+      test('using GpuDelegateV2 android', () async {
+        tfl.Interpreter interpreter;
+        final gpuDelegate = tfl.GpuDelegateV2();
+        var interpreterOptions = tfl.InterpreterOptions()
+          ..addDelegate(gpuDelegate);
+        interpreter = await tfl.Interpreter.fromAsset(
+            'text_classification.tflite',
+            options: interpreterOptions);
+        expect(interpreter, isNotNull);
+        interpreter.close();
+      });
 
       if (Platform.isIOS) {
-        test('using GpuDelegateV2 android', () async {
+        test('using GpuDelegateV2 iOS', () async {
           tfl.Interpreter interpreter;
           final gpuDelegate = tfl.GpuDelegateV2();
           var interpreterOptions = tfl.InterpreterOptions()

diff --git a/install.sh b/install.sh
@@ -3,7 +3,7 @@
 cd "$(dirname "$(readlink -f "$0")")"
 
 URL="https://github.com/am15h/tflite_flutter_plugin/releases/download/"
-TAG="v0.1.0"
+TAG="v0.2.0"
 
 ANDROID_DIR="android/app/src/main/jniLibs/"
 ANDROID_LIB="libtensorflowlite_c.so"
@@ -15,8 +15,6 @@ ARM_64="libtensorflowlite_c_arm64.so"
 X86="libtensorflowlite_c_x86.so"
 X86_64="libtensorflowlite_c_x86_64.so"
 
-#IOS="https://github.com/am15h/tflite_flutter_plugin/releases/download/v0.1.0/TensorFlowLiteC.framework_fat.zip"
-
 delegate=0
 
 while getopts "d" OPTION
@@ -47,10 +45,4 @@ download ${ARM_64} "arm64-v8a"
 fi
 
 download ${X86} "x86"
-download ${X86_64} "x86_64"
-
-#ios
-#wget "$IOS"
-#unzip TensorFlowLiteC.framework_fat.zip
-#rm TensorFlowLiteC.framework_fat.zip
-#mv TensorFlowLiteC.framework ios/
+download ${X86_64} "x86_64"