removing System.Drawing dep, adding onnxruntime

redis · Dec 4, 2023 · 59b2b13 · 59b2b13
1 parent e5aab0e
commit 59b2b13
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/Redis.OM.Vectorizers.AllMiniLML6V2/Redis.OM.Vectorizers.AllMiniLML6V2.csproj b/src/Redis.OM.Vectorizers.AllMiniLML6V2/Redis.OM.Vectorizers.AllMiniLML6V2.csproj
@@ -21,8 +21,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.ML" Version="1.6.0" />
-        <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.6.0" />        
+        <PackageReference Include="Microsoft.ML" Version="3.0.0" />
+        <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="3.0.0" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Redis.OM.Vectorizers.Resnet18/ImageModelObjects.cs b/src/Redis.OM.Vectorizers.Resnet18/ImageModelObjects.cs
@@ -1,4 +1,3 @@
-using System.Drawing;
 using Microsoft.ML.Data;
 using Microsoft.ML.Transforms.Image;
 
@@ -13,5 +12,5 @@ public class ImageInput
 public class InMemoryImageData
 {
     [ImageType(224,224)]
-    public Bitmap Image;
+    public MLImage Image;
 }
diff --git a/src/Redis.OM.Vectorizers.Resnet18/ImageVectorizer.cs b/src/Redis.OM.Vectorizers.Resnet18/ImageVectorizer.cs
@@ -1,4 +1,3 @@
-using System.Drawing;
 using Microsoft.ML;
 using Microsoft.ML.Data;
 using Microsoft.ML.Transforms;
@@ -31,9 +30,8 @@ public byte[] Vectorize(string obj)
                 RequestUri = uri,
             };
             var imageStream = Configuration.Instance.Client.Send(request).Content.ReadAsStream();
-            var image = Image.FromStream(imageStream);
-            var bitmap = new Bitmap(image);
-            var vector = VectorizeBitMaps(new [] { bitmap })[0].SelectMany(BitConverter.GetBytes).ToArray();
+            var image = MLImage.CreateFromStream(imageStream);
+            var vector = VectorizeBitMaps(new [] { image })[0].SelectMany(BitConverter.GetBytes).ToArray();
             return vector;
         }
 
@@ -93,9 +91,9 @@ private static EstimatorChain<TransformerChain<ColumnCopyingTransformer>> Create
         return pipeline;
     }
 
-    public static float[][] VectorizeBitMaps(IEnumerable<Bitmap> bitmaps)
+    public static float[][] VectorizeBitMaps(IEnumerable<MLImage> mlImages)
     {
-        var images = bitmaps.Select(x => new InMemoryImageData { Image = x });
+        var images = mlImages.Select(x => new InMemoryImageData { Image = x });
         var mlContext = MlContext.Value;
         var dataView = mlContext.Data.LoadFromEnumerable(images);
         var transformedData = BitmapPipeline.Value.Fit(dataView).Transform(dataView);

diff --git a/src/Redis.OM.Vectorizers.Resnet18/Redis.OM.Vectorizers.Resnet18.csproj b/src/Redis.OM.Vectorizers.Resnet18/Redis.OM.Vectorizers.Resnet18.csproj
@@ -21,10 +21,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-<!--        <PackageReference Include="Microsoft.ML.DnnImageFeaturizer.ResNet18" Version="0.18.0" IncludeAssets="all" />-->
-        <PackageReference Include="Microsoft.ML" Version="1.6.0" />
-        <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.6.0" />
-        <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.6.0" />
+        <PackageReference Include="Microsoft.ML" Version="3.0.0" />
+        <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="3.0.0" />
+        <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="3.0.0" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" />
     </ItemGroup>
 
     <ItemGroup>