save work

Author: fbelderink

.idea/libraries/Flutter_Plugins.xml

@@ -1,5 +1,7 @@
 package io.fynn.torch_mobile;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.MethodCall;
@@ -8,35 +10,71 @@
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
+import org.pytorch.IValue;
+import org.pytorch.Module;
+import org.pytorch.Tensor;
+import org.pytorch.torchvision.TensorImageUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /** TorchMobilePlugin */
 public class TorchMobilePlugin implements FlutterPlugin, MethodCallHandler {
+
+  ArrayList<Module> modules = new ArrayList<>();
+
   @Override
   public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
-    final MethodChannel channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "torch_mobile");
+    final MethodChannel channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(),
+        "torch_mobile");
     channel.setMethodCallHandler(new TorchMobilePlugin());
   }
 
-  // This static function is optional and equivalent to onAttachedToEngine. It supports the old
-  // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting
-  // plugin registration via this function while apps migrate to use the new Android APIs
-  // post-flutter-1.12 via https://flutter.dev/go/android-project-migration.
-  //
-  // It is encouraged to share logic between onAttachedToEngine and registerWith to keep
-  // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
-  // depending on the user's project. onAttachedToEngine or registerWith must both be defined
-  // in the same class.
   public static void registerWith(Registrar registrar) {
     final MethodChannel channel = new MethodChannel(registrar.messenger(), "torch_mobile");
     channel.setMethodCallHandler(new TorchMobilePlugin());
   }
 
   @Override
   public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
-    if (call.method.equals("loadModel")) {
-      result.success("test");
-    } else {
-      result.notImplemented();
+    switch (call.method){
+      case "loadModel":
+        try {
+          String absPath = call.argument("absPath");
+          modules.add(Module.load(absPath));
+          result.success(modules.size() - 1);
+        } catch (Exception e) {
+          String assetPath = call.argument("assetPath");
+          Log.e("TorchMobile", assetPath + " is not a proper model", e);
+        }
+        break;
+      case "predict":
+        Module module;
+        try{
+          int index = call.argument("index");
+          module = modules.get(index);
+
+          ArrayList<Long> shapeList = call.argument("shape");
+          Long[] shape = shapeList.toArray(new Long[shapeList.size()]);
+          Tensor.fromBlob(new int[]{1,2,3,4}, toPrimitives(shape));
+
+        }catch(Exception e){
+          Log.e("TorchMobile", "", e);
+        }
+        break;
+      default:
+        result.notImplemented();
+        break;
+    }
+  }
+
+  public static long[] toPrimitives(Long[] objects){
+    long[] primitives = new long[objects.length];
+    for(int i = 0; i < objects.length; i++){
+      primitives[i] = objects[i];
     }
+    return primitives;
   }
 
   @Override

.idea/misc.xml

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 

.idea/vcs.xml

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Sat Apr 11 16:19:17 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

.idea/workspace.xml

@@ -3,6 +3,7 @@ import 'dart:async';
 
 import 'package:flutter/services.dart';
 import 'package:torch_mobile/torch_mobile.dart';
+import 'package:torch_mobile/model.dart';
 
 void main() => runApp(MyApp());
 
@@ -17,9 +18,15 @@ class _MyAppState extends State<MyApp> {
     super.initState();
   }
 
+  Future<Model> loadModel(String path) async {
+    return await TorchMobile.getModel(path);
+  }
+
   @override
   Widget build(BuildContext context) {
-    TorchMobile.getModel("");
+    loadModel("assets/model.pt").then((Model model){
+      model.getPrediction([1,2,3,4], [1,2,2]);
+    } );
     return MaterialApp(
       home: Scaffold(
         appBar: AppBar(

android/src/main/java/io/fynn/torch_mobile/TorchMobilePlugin.java

@@ -25,6 +25,8 @@ dev_dependencies:
 
 # The following section is specific to Flutter.
 flutter:
+  assets:
+    - assets/
 
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in

example/android/build.gradle

@@ -3,8 +3,12 @@ import 'package:flutter/services.dart';
 class Model {
   static const MethodChannel _channel = const MethodChannel('torch_mobile');
 
-  static Future<String> getPrediction() async {
-    final String prediction = await _channel.invokeMethod('predict');
+  final int _index;
+
+  Model(this._index);
+
+  Future<String> getPrediction(List input, List shape) async {
+    final String prediction = await _channel.invokeMethod('predict', {"index": this._index, "input": input, "shape": shape});
     return prediction;
   }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,20 +2,37 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:torch_mobile/model.dart';
 
 class TorchMobile {
   static const MethodChannel _channel = const MethodChannel('torch_mobile');
 
-  static Future<Model> getModel(String path) async{
-    await _channel.invokeMethod("loadModel", await _getAbsolutePath(path));
-    return Model();
+  static Future<Model> getModel(String path) async {
+    String absPath = await _getAbsolutePath(path);
+    int index = await _channel
+        .invokeMethod("loadModel", {"absPath": absPath, "assetPath": path});
+    return Model(index);
   }
 
-  static Future<String> _getAbsolutePath(String path) async{
+  static Future<String> _getAbsolutePath(String path) async {
     Directory dir = await getApplicationDocumentsDirectory();
-    print(dir.listSync());
-    return "";
+    String dirPath = join(dir.path, path);
+    ByteData data = await rootBundle.load(path);
+    //Copy asset to documents directory
+    List<int> bytes =
+        data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+
+    //create directory
+    List split = path.split("/");
+    for (int i = 0; i < split.length; i++) {
+      if (i != split.length - 1) {
+        await Directory(join(dir.path, split[i])).create();
+      }
+    }
+    await File(dirPath).writeAsBytes(bytes);
+
+    return dirPath;
   }
 }

example/assets/model.pt

@@ -89,7 +89,7 @@ packages:
     source: hosted
     version: "1.1.8"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"

example/lib/main.dart

@@ -11,6 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   path_provider: ^1.6.5
+  path: ^1.6.4
 
 dev_dependencies:
   flutter_test: