custom mean and std fix for ios and pytorch version bugfixes

Author: fbelderink

example/ios/Podfile

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

example/ios/Podfile.lock

@@ -2,16 +2,16 @@ PODS:
   - Flutter (1.0.0)
   - image_picker (0.0.1):
     - Flutter
-  - LibTorch (1.6.1):
-    - LibTorch/Core (= 1.6.1)
-  - LibTorch/Core (1.6.1):
+  - LibTorch (1.8.0):
+    - LibTorch/Core (= 1.8.0)
+  - LibTorch/Core (1.8.0):
     - LibTorch/Torch
-  - LibTorch/Torch (1.6.1)
+  - LibTorch/Torch (1.8.0)
   - path_provider (0.0.1):
     - Flutter
   - pytorch_mobile (0.0.1):
     - Flutter
-    - LibTorch (~> 1.6.0)
+    - LibTorch (~> 1.8.0)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -34,12 +34,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pytorch_mobile/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  image_picker: e3eacd46b94694dde7cf2705955cece853aa1a8f
-  LibTorch: 32a83630ab5b4505f205c7e332975a2d3d6e0c55
-  path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
-  pytorch_mobile: 22fd3005ff24695fbea6d0aa79f0a2a8edfb5152
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
+  LibTorch: d7724112589515bedd5eadf14a9db5b1d62d8a34
+  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  pytorch_mobile: cdb1566b9883c59662d443e904db6674e829dd84
 
-PODFILE CHECKSUM: cf0c950f7e9a456b4e325f5b8fc0f98906a3705a
+PODFILE CHECKSUM: d9646c0250b6c86682c69a86e40f54c636c64ae4
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

example/ios/Runner.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		134ED5FD059C2EC6F55089BA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CBE08087A7794AD68A68F34 /* Pods_Runner.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		8313DB2B386C05D6A736FA9A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 830CB15F4BC937B0A561B23D /* libPods-Runner.a */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -34,11 +34,11 @@
 		0538B1F8A0C843E8B18BD906 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		1CBE08087A7794AD68A68F34 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		830CB15F4BC937B0A561B23D /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -56,7 +56,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8313DB2B386C05D6A736FA9A /* libPods-Runner.a in Frameworks */,
+				134ED5FD059C2EC6F55089BA /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -77,7 +77,7 @@
 		559F459594CD5591545EDA80 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				830CB15F4BC937B0A561B23D /* libPods-Runner.a */,
+				1CBE08087A7794AD68A68F34 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -150,7 +150,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				1662704A5362991A2D9BF051 /* [CP] Embed Pods Frameworks */,
+				D8FC68926E06332DF0121637 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -208,23 +208,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1662704A5362991A2D9BF051 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -275,6 +258,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		D8FC68926E06332DF0121637 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UIImageExtension : NSObject
 + (nullable UIImage*)resize:(UIImage*)image toWidth:(int)width toHeight:(int)height;
-+ (nullable float*)normalize:(UIImage*)image;
++ (nullable float*)normalize:(UIImage*)image withMean:(NSArray<NSNumber*>*)mean withSTD:(NSArray<NSNumber*>*)std;
 @end
 
 NS_ASSUME_NONNULL_END

ios/Classes/Helpers/UIImageExtension.h

@@ -12,7 +12,7 @@ + (UIImage*)resize:(UIImage*)image toWidth:(int) width toHeight:(int)height {
 	return newImage;
 }
 
-+ (nullable float*)normalize:(UIImage*)image mean:(NSArray<NSNumber*>*) std:(NSArray<NSNumber*>*) {
++ (nullable float*)normalize:(UIImage*)image withMean:(NSArray<NSNumber*>*)mean withSTD:(NSArray<NSNumber*>*)std {
     CGImageRef cgImage = [image CGImage];
     NSUInteger w = CGImageGetWidth(cgImage);
     NSUInteger h = CGImageGetHeight(cgImage);
@@ -37,9 +37,9 @@ + (nullable float*)normalize:(UIImage*)image mean:(NSArray<NSNumber*>*) std:(NSA
 
     float* normalizedBuffer = malloc(3*h*w * sizeof(float));
     for(int i = 0; i < (w*h); i++) {
-        normalizedBuffer[i] = (rawBytes[i * 4 + 0] / 255.0 - mean[0]) / std[0];
-        normalizedBuffer[w * h + i] = (rawBytes[i * 4 + 1] / 255.0 - mean[1]) / std[1];
-        normalizedBuffer[w * h * 2 + i] = (rawBytes[i * 4 + 2] / 255.0 - mean[2]) / std[2];	
+        normalizedBuffer[i] = (rawBytes[i * 4 + 0] / 255.0 - mean[0].floatValue) / std[0].floatValue;
+        normalizedBuffer[w * h + i] = (rawBytes[i * 4 + 1] / 255.0 - mean[1].floatValue) / std[1].floatValue;
+        normalizedBuffer[w * h * 2 + i] = (rawBytes[i * 4 + 2] / 255.0 - mean[2].floatValue) / std[2].floatValue;	
     }
 
     return normalizedBuffer;

ios/Classes/Helpers/UIImageExtension.m

@@ -1,4 +1,4 @@
 #import <Flutter/Flutter.h>
 
-@interface PytorchMobilePlugin : NSObject<FlutterPlugin>
+@interface PyTorchMobilePlugin : NSObject<FlutterPlugin>
 @end

ios/Classes/PyTorchMobilePlugin.h

@@ -3,15 +3,15 @@
 #import "UIImageExtension.h"
 #import <LibTorch/LibTorch.h>
 
-@implementation PytorchMobilePlugin
+@implementation PyTorchMobilePlugin
 
 NSMutableArray *modules = [[NSMutableArray alloc] init];
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
     FlutterMethodChannel* channel = [FlutterMethodChannel
                                      methodChannelWithName:@"pytorch_mobile"
                                      binaryMessenger:[registrar messenger]];
-    PytorchMobilePlugin* instance = [[PytorchMobilePlugin alloc] init];
+    PyTorchMobilePlugin* instance = [[PyTorchMobilePlugin alloc] init];
     [registrar addMethodCallDelegate:instance channel:channel];
 }
 
@@ -90,7 +90,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
                 UIImage *image = [UIImage imageWithData: imageData.data];
                 image = [UIImageExtension resize:image toWidth:width toHeight:height];
 
-                input = [UIImageExtension normalize:image mean:mean std:std];
+                input = [UIImageExtension normalize:image withMean:mean withSTD:std];
             } catch (const std::exception& e) {
                 NSLog(@"PyTorchMobile: error reading image!\n%s", e.what());
             }

ios/Classes/PytorchMobilePlugin.mm renamed to ios/Classes/PyTorchMobilePlugin.mm

@@ -24,4 +24,4 @@ flutter:
         package: io.fynn.pytorch_mobile
         pluginClass: PyTorchMobilePlugin
       ios:
-        pluginClass: PytorchMobilePlugin
+        pluginClass: PyTorchMobilePlugin