Browse Source

FFT: fix PCL builds

benchmark-la
Christoph Ruegg 10 years ago
parent
commit
c472e8d4c8
  1. 4
      src/Numerics/Providers/Common/Cuda/CudaProvider.cs
  2. 4
      src/Numerics/Providers/Common/Cuda/CudaProviderCapabilities.cs
  3. 4
      src/Numerics/Providers/Common/Mkl/MklProvider.cs
  4. 4
      src/Numerics/Providers/Common/Mkl/MklProviderCapabilities.cs
  5. 6
      src/Numerics/Providers/Common/NativeProviderLoader.cs
  6. 4
      src/Numerics/Providers/Common/OpenBlas/OpenBlasProvider.cs
  7. 4
      src/Numerics/Providers/Common/OpenBlas/OpenBlasProviderCapabilities.cs
  8. 8
      src/Numerics/Providers/FourierTransform/FourierTransformControl.cs
  9. 4
      src/Numerics/Providers/LinearAlgebra/Cuda/CudaLinearAlgebraProvider.cs
  10. 6
      src/Numerics/Providers/LinearAlgebra/LinearAlgebraControl.cs
  11. 4
      src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.cs

4
src/Numerics/Providers/Common/Cuda/CudaProvider.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -105,3 +107,5 @@ namespace MathNet.Numerics.Providers.Common.Cuda
} }
} }
} }
#endif

4
src/Numerics/Providers/Common/Cuda/CudaProviderCapabilities.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
namespace MathNet.Numerics.Providers.Common.Cuda namespace MathNet.Numerics.Providers.Common.Cuda
{ {
internal enum ProviderPlatform : int internal enum ProviderPlatform : int
@ -47,3 +49,5 @@ namespace MathNet.Numerics.Providers.Common.Cuda
LinearAlgebraMinor = 129, LinearAlgebraMinor = 129,
} }
} }
#endif

4
src/Numerics/Providers/Common/Mkl/MklProvider.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -256,3 +258,5 @@ namespace MathNet.Numerics.Providers.Common.Mkl
} }
} }
} }
#endif

4
src/Numerics/Providers/Common/Mkl/MklProviderCapabilities.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
namespace MathNet.Numerics.Providers.Common.Mkl namespace MathNet.Numerics.Providers.Common.Mkl
{ {
internal enum ProviderPlatform : int internal enum ProviderPlatform : int
@ -55,3 +57,5 @@ namespace MathNet.Numerics.Providers.Common.Mkl
FourierTransformMinor = 385 FourierTransformMinor = 385
} }
} }
#endif

6
src/Numerics/Providers/Common/NativeProviderLoader.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -35,8 +37,6 @@ using System.Runtime.InteropServices;
using System.Security; using System.Security;
using System.Threading; using System.Threading;
#if NATIVE
namespace MathNet.Numerics.Providers.Common namespace MathNet.Numerics.Providers.Common
{ {
/// <summary> /// <summary>
@ -243,4 +243,4 @@ namespace MathNet.Numerics.Providers.Common
} }
} }
#endif #endif

4
src/Numerics/Providers/Common/OpenBlas/OpenBlasProvider.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -119,3 +121,5 @@ namespace MathNet.Numerics.Providers.Common.OpenBlas
} }
} }
} }
#endif

4
src/Numerics/Providers/Common/OpenBlas/OpenBlasProviderCapabilities.cs

@ -27,6 +27,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
namespace MathNet.Numerics.Providers.Common.OpenBlas namespace MathNet.Numerics.Providers.Common.OpenBlas
{ {
internal enum ProviderPlatform : int internal enum ProviderPlatform : int
@ -49,3 +51,5 @@ namespace MathNet.Numerics.Providers.Common.OpenBlas
LinearAlgebraMinor = 129 LinearAlgebraMinor = 129
} }
} }
#endif

8
src/Numerics/Providers/FourierTransform/FourierTransformControl.cs

@ -80,18 +80,22 @@ namespace MathNet.Numerics.Providers.FourierTransform
public static void UseDefault() public static void UseDefault()
{ {
#if NATIVE
var value = Environment.GetEnvironmentVariable(EnvVarFFTProvider); var value = Environment.GetEnvironmentVariable(EnvVarFFTProvider);
switch (value != null ? value.ToUpperInvariant() : string.Empty) switch (value != null ? value.ToUpperInvariant() : string.Empty)
{ {
#if NATIVE
case "MKL": case "MKL":
UseNativeMKL(); UseNativeMKL();
break; break;
#endif
default: default:
UseBest(); UseBest();
break; break;
} }
#else
UseManaged();
#endif
} }
} }
} }

4
src/Numerics/Providers/LinearAlgebra/Cuda/CudaLinearAlgebraProvider.cs

@ -27,11 +27,11 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using MathNet.Numerics.Providers.Common.Cuda; using MathNet.Numerics.Providers.Common.Cuda;
#if NATIVE
namespace MathNet.Numerics.Providers.LinearAlgebra.Cuda namespace MathNet.Numerics.Providers.LinearAlgebra.Cuda
{ {
/// <summary> /// <summary>

6
src/Numerics/Providers/LinearAlgebra/LinearAlgebraControl.cs

@ -95,10 +95,10 @@ namespace MathNet.Numerics.Providers.LinearAlgebra
public static void UseDefault() public static void UseDefault()
{ {
#if NATIVE
var value = Environment.GetEnvironmentVariable(EnvVarLAProvider); var value = Environment.GetEnvironmentVariable(EnvVarLAProvider);
switch (value != null ? value.ToUpperInvariant() : string.Empty) switch (value != null ? value.ToUpperInvariant() : string.Empty)
{ {
#if NATIVE
case "MKL": case "MKL":
UseNativeMKL(); UseNativeMKL();
break; break;
@ -110,11 +110,13 @@ namespace MathNet.Numerics.Providers.LinearAlgebra
case "OPENBLAS": case "OPENBLAS":
UseNativeOpenBLAS(); UseNativeOpenBLAS();
break; break;
#endif
default: default:
UseBest(); UseBest();
break; break;
} }
#else
UseManaged();
#endif
} }
} }
} }

4
src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.cs

@ -27,11 +27,11 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
// </copyright> // </copyright>
#if NATIVE
using System; using System;
using MathNet.Numerics.Providers.Common.Mkl; using MathNet.Numerics.Providers.Common.Mkl;
#if NATIVE
namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl
{ {
/// <summary> /// <summary>

Loading…
Cancel
Save