Browse Source

Control: disable envvar default provider in portable build

v2 v2.4.0
Christoph Ruegg 14 years ago
parent
commit
19be78c57a
  1. 8
      src/Numerics/Control.cs

8
src/Numerics/Control.cs

@ -28,8 +28,6 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
using MathNet.Numerics.Algorithms.LinearAlgebra.Mkl;
namespace MathNet.Numerics namespace MathNet.Numerics
{ {
using System; using System;
@ -69,6 +67,9 @@ namespace MathNet.Numerics
ThreadSafeRandomNumberGenerators = true; ThreadSafeRandomNumberGenerators = true;
DisableParallelization = false; DisableParallelization = false;
#if PORTABLE
LinearAlgebraProvider = new ManagedLinearAlgebraProvider();
#else
try try
{ {
const string name = "MathNetNumericsLAProvider"; const string name = "MathNetNumericsLAProvider";
@ -76,7 +77,7 @@ namespace MathNet.Numerics
switch (value != null ? value.ToUpper() : string.Empty) switch (value != null ? value.ToUpper() : string.Empty)
{ {
case "MKL": case "MKL":
LinearAlgebraProvider = new MklLinearAlgebraProvider(); LinearAlgebraProvider = new MathNet.Numerics.Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
break; break;
default: default:
LinearAlgebraProvider = new ManagedLinearAlgebraProvider(); LinearAlgebraProvider = new ManagedLinearAlgebraProvider();
@ -88,6 +89,7 @@ namespace MathNet.Numerics
// We don't care about any failures here at all // We don't care about any failures here at all
LinearAlgebraProvider = new ManagedLinearAlgebraProvider(); LinearAlgebraProvider = new ManagedLinearAlgebraProvider();
} }
#endif
} }
/// <summary> /// <summary>

Loading…
Cancel
Save