Support Native Providers also in .Net 3.5

mathnet · Jul 3, 2017 · 7825e7f · 7825e7f
1 parent a872a13
commit 7825e7f
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 28 deletions.
diff --git a/src/Numerics/Numerics-Net35.csproj b/src/Numerics/Numerics-Net35.csproj
@@ -40,7 +40,7 @@
     <!-- Conditional Strong Name: NO -->
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE;NET35;NOSYSNUMERICS</DefineConstants>
+    <DefineConstants>TRACE;NET35;NOSYSNUMERICS;NATIVE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -54,7 +54,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG;NET35;NOSYSNUMERICS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET35;NOSYSNUMERICS;NATIVE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -69,7 +69,7 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE;NET35;NOSYSNUMERICS;STRONGNAME</DefineConstants>
+    <DefineConstants>TRACE;NET35;NOSYSNUMERICS;NATIVE;STRONGNAME</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -111,4 +111,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>
diff --git a/src/Numerics/Providers/Common/Cuda/CudaProvider.cs b/src/Numerics/Providers/Common/Cuda/CudaProvider.cs
@@ -103,7 +103,7 @@ public static string Describe()
             if (_nativeIA64) parts.Add("IA64");
             parts.Add("revision " + _nativeRevision);
 
-            return string.Concat("Nvidia CUDA (", string.Join("; ", parts), ")");
+            return string.Concat("Nvidia CUDA (", string.Join("; ", parts.ToArray()), ")");
         }
     }
 }

diff --git a/src/Numerics/Providers/Common/Cuda/SafeNativeMethods.cs b/src/Numerics/Providers/Common/Cuda/SafeNativeMethods.cs
@@ -29,13 +29,16 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Security;
 using MathNet.Numerics.Providers.LinearAlgebra;
 
 namespace MathNet.Numerics.Providers.Common.Cuda
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// P/Invoke methods to the native math libraries.
     /// </summary>

diff --git a/src/Numerics/Providers/Common/Mkl/MklProvider.cs b/src/Numerics/Providers/Common/Mkl/MklProvider.cs
@@ -234,7 +234,7 @@ public static string Describe()
                     : string.Concat("MKL ", _mklVersion.ToString(2), " Update ", _mklVersion.Build));
             }
 
-            return string.Concat("Intel MKL (", string.Join("; ", parts), ")");
+            return string.Concat("Intel MKL (", string.Join("; ", parts.ToArray()), ")");
         }
 
         enum MklMemoryRequestMode : int

diff --git a/src/Numerics/Providers/Common/Mkl/SafeNativeMethods.cs b/src/Numerics/Providers/Common/Mkl/SafeNativeMethods.cs
@@ -29,13 +29,16 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Security;
 using MathNet.Numerics.Providers.LinearAlgebra;
 
 namespace MathNet.Numerics.Providers.Common.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// P/Invoke methods to the native math libraries.
     /// </summary>

diff --git a/src/Numerics/Providers/Common/NativeProviderLoader.cs b/src/Numerics/Providers/Common/NativeProviderLoader.cs
@@ -79,10 +79,15 @@ static bool IsUnix
 
         static string EvaluateArchitectureKey()
         {
+#if NET35
+            return (IntPtr.Size == 8) ? X64 : X86;
+#else
             if (IsUnix)
             {
+
                 // Only support x86 and amd64 on Unix as there isn't a reliable way to detect the architecture
                 return Environment.Is64BitProcess ? X64 : X86;
+
             }
 
             var architecture = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
@@ -110,6 +115,7 @@ static string EvaluateArchitectureKey()
 
             // Fallback if unknown
             return architecture;
+#endif
         }
 
         /// <summary>
@@ -162,7 +168,7 @@ public static bool TryLoad(string fileName, string directory)
 
             // If we have a know architecture, try the matching subdirectory first
             var architecture = ArchitectureKey.Value;
-            if (!string.IsNullOrEmpty(architecture) && TryLoadFile(new FileInfo(Path.Combine(directory, architecture, fileName))))
+            if (!string.IsNullOrEmpty(architecture) && TryLoadFile(new FileInfo(Path.Combine(Path.Combine(directory, architecture), fileName))))
             {
                 return true;
             }

diff --git a/src/Numerics/Providers/Common/OpenBlas/OpenBlasProvider.cs b/src/Numerics/Providers/Common/OpenBlas/OpenBlasProvider.cs
@@ -117,7 +117,7 @@ public static string Describe()
             if (_nativeARM) parts.Add("ARM");
             parts.Add("revision " + _nativeRevision);
 
-            return string.Concat("OpenBLAS (", string.Join("; ", parts), ")");
+            return string.Concat("OpenBLAS (", string.Join("; ", parts.ToArray()), ")");
         }
     }
 }

diff --git a/src/Numerics/Providers/Common/OpenBlas/SafeNativeMethods.cs b/src/Numerics/Providers/Common/OpenBlas/SafeNativeMethods.cs
@@ -28,14 +28,17 @@
 
 #if NATIVE
 
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Security;
 using MathNet.Numerics.Providers.LinearAlgebra;
 using MathNet.Numerics.Providers.LinearAlgebra.OpenBlas;
 
 namespace MathNet.Numerics.Providers.Common.OpenBlas
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// P/Invoke methods to the native math libraries.
     /// </summary>

diff --git a/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs b/src/Numerics/Providers/FourierTransform/Mkl/MklFourierTransformProvider.cs
@@ -29,12 +29,15 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Threading;
 using MathNet.Numerics.Providers.Common.Mkl;
 
 namespace MathNet.Numerics.Providers.FourierTransform.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     public class MklFourierTransformProvider : IFourierTransformProvider, IDisposable
     {
         class Kernel
@@ -230,7 +233,7 @@ Kernel Configure(int[] dimensions, FourierTransformScaling scaling, bool single)
                 {
                     SafeNativeMethods.z_fft_create_multidim(out kernel.Handle, dimensions.Length, dimensions, ForwardScaling(scaling, length), BackwardScaling(scaling, length));
                 }
-                
+
                 return kernel;
             }
 
@@ -406,4 +409,4 @@ public void Dispose()
     }
 }
 
-#endif
+#endif
diff --git a/src/Numerics/Providers/LinearAlgebra/Cuda/CudaLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/Cuda/CudaLinearAlgebraProvider.Complex.cs
@@ -30,13 +30,16 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.Properties;
 using MathNet.Numerics.Providers.Common.Cuda;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.Cuda
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// NVidia's CUDA Toolkit linear algebra provider.
     /// </summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs
@@ -30,14 +30,17 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using MathNet.Numerics.Providers.Common.Mkl;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// Intel's Math Kernel Library (MKL) linear algebra provider.
     /// </summary>
@@ -358,7 +361,7 @@ public override void LUInverseFactored(Complex[] a, int order, int[] ipiv)
             if (info > 0)
             {
                 throw new SingularUMatrixException(info);
-            } 
+            }
         }
 
         /// <summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs
@@ -30,14 +30,17 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using MathNet.Numerics.Providers.Common.Mkl;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// Intel's Math Kernel Library (MKL) linear algebra provider.
     /// </summary>
@@ -358,7 +361,7 @@ public override void LUInverseFactored(Complex32[] a, int order, int[] ipiv)
             if (info > 0)
             {
                 throw new SingularUMatrixException(info);
-            } 
+            }
         }
 
         /// <summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Double.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Double.cs
@@ -30,14 +30,17 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using MathNet.Numerics.Providers.Common.Mkl;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// Intel's Math Kernel Library (MKL) linear algebra provider.
     /// </summary>
@@ -358,7 +361,7 @@ public override void LUInverseFactored(double[] a, int order, int[] ipiv)
             if (info > 0)
             {
                 throw new SingularUMatrixException(info);
-            } 
+            }
         }
 
         /// <summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Single.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Single.cs
@@ -30,14 +30,17 @@
 #if NATIVE
 
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using MathNet.Numerics.Providers.Common.Mkl;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// Intel's Math Kernel Library (MKL) linear algebra provider.
     /// </summary>
@@ -358,7 +361,7 @@ public override void LUInverseFactored(float[] a, int order, int[] ipiv)
             if (info > 0)
             {
                 throw new SingularUMatrixException(info);
-            } 
+            }
         }
 
         /// <summary>
@@ -812,7 +815,7 @@ public override void QRSolveFactored(float[] q, float[] r, int rowsA, int column
             if (method == QRMethod.Full)
             {
                 var info = SafeNativeMethods.s_qr_solve_factored(rowsA, columnsA, columnsB, r, b, tau, x);
-                
+
                 if (info == (int)MklError.MemoryAllocation)
                 {
                     throw new MemoryAllocationException();

diff --git a/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Complex.cs
@@ -32,12 +32,15 @@
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.Providers.Common.OpenBlas;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.OpenBlas
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// OpenBLAS linear algebra provider.
     /// </summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Complex32.cs
@@ -32,12 +32,15 @@
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.Providers.Common.OpenBlas;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.OpenBlas
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// OpenBLAS linear algebra provider.
     /// </summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Double.cs b/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Double.cs
@@ -32,12 +32,15 @@
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.Providers.Common.OpenBlas;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.OpenBlas
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// OpenBLAS linear algebra provider.
     /// </summary>

diff --git a/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Single.cs b/src/Numerics/Providers/LinearAlgebra/OpenBlas/OpenBlasLinearAlgebraProvider.Single.cs
@@ -32,12 +32,15 @@
 using MathNet.Numerics.LinearAlgebra.Factorization;
 using MathNet.Numerics.Properties;
 using System;
-using System.Numerics;
 using System.Security;
 using MathNet.Numerics.Providers.Common.OpenBlas;
 
 namespace MathNet.Numerics.Providers.LinearAlgebra.OpenBlas
 {
+#if !NOSYSNUMERICS
+    using Complex = System.Numerics.Complex;
+#endif
+
     /// <summary>
     /// OpenBLAS linear algebra provider.
     /// </summary>