Protect the determination of whether to dispatch to accelerated algos (at the callsite)

rgesteve · rgesteve · commit e44656416925 · 2023-01-12T16:41:19.000-08:00
diff --git a/src/Microsoft.ML.FastTree/RandomForestClassification.cs b/src/Microsoft.ML.FastTree/RandomForestClassification.cs
@@ -265,7 +265,15 @@ public static extern unsafe int DecisionForestClassificationCompute(
         [BestFriend]
         private bool IsDispatchingToOneDalEnabled()
         {
-            return OneDalUtils.IsDispatchingEnabled();
+            try
+            {
+                return OneDalUtils.IsDispatchingEnabled();
+            }
+            catch (Exception)
+            {
+                // Bail to default implementation upon encountering any situation where dispatch failed
+                return false;
+            }
         }
 
         [BestFriend]
diff --git a/src/Microsoft.ML.FastTree/RandomForestRegression.cs b/src/Microsoft.ML.FastTree/RandomForestRegression.cs
@@ -398,7 +398,15 @@ public static extern unsafe int DecisionForestRegressionCompute(
         [BestFriend]
         private bool IsDispatchingToOneDalEnabled()
         {
-            return OneDalUtils.IsDispatchingEnabled();
+            try
+            {
+                return OneDalUtils.IsDispatchingEnabled();
+            }
+            catch (Exception)
+            {
+                // fall back to original implementation for any circumstance that prevents dispatching
+                return false;
+            }
         }
 
         [BestFriend]
diff --git a/src/Microsoft.ML.Mkl.Components/OlsLinearRegression.cs b/src/Microsoft.ML.Mkl.Components/OlsLinearRegression.cs
@@ -14,9 +14,9 @@
 using Microsoft.ML.Internal.Internallearn;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Model;
+using Microsoft.ML.OneDal;
 using Microsoft.ML.Runtime;
 using Microsoft.ML.Trainers;
-using Microsoft.ML.OneDal;
 
 [assembly: LoadableClass(OlsTrainer.Summary, typeof(OlsTrainer), typeof(OlsTrainer.Options),
     new[] { typeof(SignatureRegressorTrainer), typeof(SignatureTrainer), typeof(SignatureFeatureScorerTrainer) },
@@ -409,7 +409,15 @@ private void ComputeMklRegression(IChannel ch, FloatLabelCursor.Factory cursorFa
         [BestFriend]
         private bool IsDispatchingToOneDalEnabled()
         {
-            return OneDalUtils.IsDispatchingEnabled();
+            try
+            {
+                return OneDalUtils.IsDispatchingEnabled();
+            }
+            catch (Exception)
+            {
+                // Bail to default implementation upon any situation that prevents dispatching
+                return false;
+            }
         }
 
         private OlsModelParameters TrainCore(IChannel ch, FloatLabelCursor.Factory cursorFactory, int featureCount)
diff --git a/src/Microsoft.ML.OneDal/OneDalUtils.cs b/src/Microsoft.ML.OneDal/OneDalUtils.cs
@@ -20,32 +20,24 @@ internal static class OneDalUtils
         [BestFriend]
         internal static bool IsDispatchingEnabled()
         {
-            try
+            if (Environment.GetEnvironmentVariable("MLNET_BACKEND") == "ONEDAL" &&
+                System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.X64)
             {
-                if (Environment.GetEnvironmentVariable("MLNET_BACKEND") == "ONEDAL" &&
-                    System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.X64)
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
 #if NETFRAMEWORK
                 // AppContext not available in the framework, user needs to set PATH manually
                 // this will probably result in a runtime error where the user needs to set the PATH
 #else
-                        var currentDir = AppContext.BaseDirectory;
-                        var nativeLibs = Path.Combine(currentDir, "runtimes", "win-x64", "native");
-                        var originalPath = Environment.GetEnvironmentVariable("PATH");
-                        Environment.SetEnvironmentVariable("PATH", nativeLibs + ";" + originalPath);
+                    var currentDir = AppContext.BaseDirectory;
+                    var nativeLibs = Path.Combine(currentDir, "runtimes", "win-x64", "native");
+                    var originalPath = Environment.GetEnvironmentVariable("PATH");
+                    Environment.SetEnvironmentVariable("PATH", nativeLibs + ";" + originalPath);
 #endif
-                    }
-                    return true;
                 }
-                return false;
-            }
-            catch (Exception)
-            {
-                // fallback to default algorithm implementation if dispatch fails
-                return false;
+                return true;
             }
+            return false;
         }
 
         [BestFriend]
