Bump to NatML 1.1.3

natmlx · Feb 28, 2023 · 656027d · 656027d
1 parent ca29e4b
commit 656027d
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 120 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -9,7 +9,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{a9a52b9b-e4f5-75fe-506a-9297d549430d}</ProjectGuid>
+    <ProjectGuid>{1fe89738-dd1e-00dd-ec95-f529824729f0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -283,14 +283,14 @@
     <Reference Include="UnityEditor.UnityConnectModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.17f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
-    </Reference>
     <Reference Include="ReportGeneratorMerged">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.testtools.codecoverage@1.2.2/lib/ReportGenerator/ReportGeneratorMerged.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.testtools.codecoverage@1.2.2/lib/ReportGenerator/ReportGeneratorMerged.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.iOS.Extensions.Xcode">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.17f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
@@ -671,121 +671,121 @@
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.17f1/Unity.app/Contents/NetStandard/compat/2.1.0/shims/netfx/mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="NatML.ML">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.ML.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.ML.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.Flow.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VSCode.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.TextMeshPro.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Unity.VisualStudio.Editor">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Performance.Profile-Analyzer.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Performance.Profile-Analyzer.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Performance.Profile-Analyzer.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Model">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.VisualStudio.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+    <Reference Include="NatML.Sharing.Editor">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Sharing.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Timeline">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.Core.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.TextMeshPro">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.State.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll</HintPath>
     </Reference>
     <Reference Include="NatML.Vision.MobileNetv2">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Vision.MobileNetv2.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Vision.MobileNetv2.dll</HintPath>
     </Reference>
     <Reference Include="NatML.Devices">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Devices.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Devices.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.SettingsProvider.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath>
+    </Reference>
+    <Reference Include="NatML.VideoKit">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.VideoKit.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.Flow">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.UI">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.PlasticSCM.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
+    <Reference Include="NatML.Recorders">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Recorders.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Rider.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Unity.PlasticSCM.Editor">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="NatML.Recorders.Editor">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Recorders.Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="NatML.Sharing">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Sharing.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Services.Core">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.Core">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll</HintPath>
     </Reference>
     <Reference Include="Unity.EditorCoroutines.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.EditorCoroutines.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.EditorCoroutines.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Services.Core.Analytics">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.Analytics.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="NatML.Hub.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Hub.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Hub.Editor.dll</HintPath>
     </Reference>
     <Reference Include="NatML.ML.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.ML.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.ML.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.Shared.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll</HintPath>
     </Reference>
     <Reference Include="NatML.Hub">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Hub.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Hub.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Services.Core.Environments">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.Environments.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.Environments.dll</HintPath>
+    </Reference>
+    <Reference Include="NatML.VideoKit.Editor">
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.VideoKit.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Timeline.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
     </Reference>
     <Reference Include="NatML.Devices.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Devices.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Devices.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.TestTools.CodeCoverage.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.VisualScripting.State">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.Sharing.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Sharing.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.Recorders">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Recorders.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.VideoKit.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.VideoKit.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.VideoKit">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.VideoKit.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.Recorders.Editor">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Recorders.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="NatML.Sharing">
-        <HintPath>/Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Sharing.dll</HintPath>
+        <HintPath>/Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Assets/MobileNetv2Sample.cs b/Assets/MobileNetv2Sample.cs
@@ -19,14 +19,11 @@ public class MobileNetv2Sample : MonoBehaviour {
         public Text labelText;
         public Text scoreText;
 
-        private MLEdgeModel model;
         private MobileNetv2Predictor predictor;
 
         private async void Start () {
-            // Create the model
-            model = await MLEdgeModel.Create("@natsuite/mobilenet-v2");
             // Create the predictor
-            predictor = new MobileNetv2Predictor(model);
+            predictor = await MobileNetv2Predictor.Create();
             // Start listening for camera stream
             cameraManager.OnCameraFrame.AddListener(OnCameraFrame);
         }
@@ -42,8 +39,8 @@ public class MobileNetv2Sample : MonoBehaviour {
         void OnDisable () {
             // Stop listening for camera frames
             cameraManager.OnCameraFrame.RemoveListener(OnCameraFrame);
-            // Dispose model
-            model?.Dispose();
+            // Dispose the predictor
+            predictor?.Dispose();
         }
     }
 }
diff --git a/MobileNet-v2.sln b/MobileNet-v2.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{a9a52b9b-e4f5-75fe-506a-9297d549430d}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{1fe89738-dd1e-00dd-ec95-f529824729f0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{a9a52b9b-e4f5-75fe-506a-9297d549430d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{a9a52b9b-e4f5-75fe-506a-9297d549430d}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1fe89738-dd1e-00dd-ec95-f529824729f0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1fe89738-dd1e-00dd-ec95-f529824729f0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Packages/ai.natml.vision.mobilenet-v2/Changelog.md b/Packages/ai.natml.vision.mobilenet-v2/Changelog.md
@@ -1,3 +1,8 @@
+## 1.0.2
++ Added `MobileNetv2Predictor.Create` static method for creating the predictor.
++ Removed public `MobileNetv2Predictor` constructor.
++ Upgraded to NatML 1.1.3.
+
 ## 1.0.1
 + Upgraded to NatML 1.1.
 

diff --git a/Packages/ai.natml.vision.mobilenet-v2/README.md b/Packages/ai.natml.vision.mobilenet-v2/README.md
@@ -13,26 +13,26 @@ Add the following items to your Unity project's `Packages/manifest.json`:
     }
   ],
   "dependencies": {
-    "ai.natml.vision.mobilenet-v2": "1.0.1"
+    "ai.natml.vision.mobilenet-v2": "1.0.2"
   }
 }
 ```
 
 ## Classifying an Image
 First, create the MobileNet v2 predictor:
 ```csharp
-// Create the model
-var model = await MLEdgeModel.Create("@natsuite/mobilenet-v2");
-// Create the predictor
-var predictor = new MobileNetv2Predictor(model);
+// Create the MobileNet v2 predictor
+var predictor = await MobileNetv2Predictor.Create();
 ```
 
 Then make predictions on images:
 ```csharp
 // Given an image...
 Texture2D image = ...;
 // Classify the image
-(string label, float confidence) result = predictor.Predict(image);
+MobileNetv2Predictor.Label result = predictor.Predict(image);
+// Use the result
+Debug.Log($"Model predicted {result.label} with confidence {result.confidence}");
 ```
 
 ## Requirements
@@ -41,7 +41,7 @@ Texture2D image = ...;
 ## Quick Tips
 - Join the [NatML community on Discord](https://natml.ai/community).
 - Discover more ML models on [NatML Hub](https://hub.natml.ai).
-- See the [NatML documentation](https://docs.natml.ai/natml).
+- See the [NatML documentation](https://docs.natml.ai/unity).
 - Contact us at [hi@natml.ai](mailto:hi@natml.ai).
 
 Thank you very much!