platform default

Author: sdcb

src/Sdcb.PaddleInference/PaddleDevice.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 
 namespace Sdcb.PaddleInference;
 
@@ -173,4 +174,16 @@ private static void CommonAction(PaddleConfig cfg, bool memoryOptimized, bool gl
         cfg.MemoryOptimized = memoryOptimized;
         //cfg.GLogEnabled = glogEnabled;
     }
+
+    /// <summary>
+    /// Gets the default device configuration for Paddle operations based on the current operating system and
+    /// architecture.
+    /// </summary>
+    public static Action<PaddleConfig> PlatformDefault => RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+        ? RuntimeInformation.OSArchitecture switch
+        {
+            Architecture.X64 => Onnx(),
+            _ => Blas(),
+        }
+        : Mkldnn();
 }

src/Sdcb.PaddleInference/Sdcb.PaddleInference.csproj

@@ -38,6 +38,7 @@
     </PackageReference>
     <PackageReference Include="System.Memory" Version="4.5.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
     <PackageReference Include="System.Memory" Version="4.5.5" Condition="'$(TargetFramework)' == 'net45'" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
   </ItemGroup>
 

src/Sdcb.PaddleOCR/OcrBaseModel.cs

@@ -33,10 +33,7 @@ public OcrBaseModel(ModelVersion version)
     /// <summary>
     /// Gets the default device for the model.
     /// </summary>
-    public virtual Action<PaddleConfig> DefaultDevice =>
-    RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
-        ? PaddleDevice.Blas()
-        : PaddleDevice.Mkldnn();
+    public virtual Action<PaddleConfig> DefaultDevice => PaddleDevice.PlatformDefault;
 
     /// <summary>
     /// Configure the device related config of the <see cref="PaddleConfig"/>.

src/Sdcb.PaddleOCR/PaddleOcrTableRecognizer.cs

@@ -30,7 +30,7 @@ public class PaddleOcrTableRecognizer : IDisposable
     /// <param name="model">The table recognition model.</param>
     /// <param name="configure">The action to configure Paddle device.</param>
     public PaddleOcrTableRecognizer(TableRecognitionModel model, Action<PaddleConfig>? configure = null) : this(model, 
-        model.CreateConfig().Apply(configure ?? PaddleDevice.Mkldnn()).CreatePredictor())
+        model.CreateConfig().Apply(configure ?? PaddleDevice.PlatformDefault).CreatePredictor())
     {
     }