diff --git a/src/UnitTests/UnitTests-CUDA.csproj b/src/UnitTests/UnitTests-CUDA.csproj index 598ce9a2..074df81c 100644 --- a/src/UnitTests/UnitTests-CUDA.csproj +++ b/src/UnitTests/UnitTests-CUDA.csproj @@ -16,7 +16,7 @@ ..\..\ - TRACE;CUDA + TRACE;NATIVE;CUDA ..\..\out\CUDA\Windows\ ..\..\obj\CUDA\Windows\x86\ ..\..\obj\CUDA\Windows\x86\ @@ -28,7 +28,7 @@ AnyCPU - TRACE;DEBUG;CUDA + TRACE;DEBUG;NATIVE;CUDA ..\..\out\CUDA\Windows\ ..\..\obj\CUDA\Windows\x86\ ..\..\obj\CUDA\Windows\x86\ diff --git a/src/UnitTests/UnitTests-MKL.csproj b/src/UnitTests/UnitTests-MKL.csproj index bbd73bbf..07bd43ec 100644 --- a/src/UnitTests/UnitTests-MKL.csproj +++ b/src/UnitTests/UnitTests-MKL.csproj @@ -16,7 +16,7 @@ ..\..\ - TRACE;NATIVE + TRACE;NATIVE;MKL ..\..\out\MKL\Windows\ ..\..\obj\MKL\Windows\x86\ ..\..\obj\MKL\Windows\x86\ @@ -28,7 +28,7 @@ AnyCPU - TRACE;DEBUG;NATIVE + TRACE;DEBUG;NATIVE;MKL ..\..\out\MKL\Windows\ ..\..\obj\MKL\Windows\x86\ ..\..\obj\MKL\Windows\x86\ diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs index d45957e8..00266687 100644 --- a/src/UnitTests/UseLinearAlgebraProvider.cs +++ b/src/UnitTests/UseLinearAlgebraProvider.cs @@ -39,10 +39,11 @@ namespace MathNet.Numerics.UnitTests public void BeforeTest(TestDetails testDetails) { #if !NET35 && NATIVE +#if MKL Control.UseNativeMKL(); -#endif -#if CUDA +#elif CUDA Control.UseNativeCUDA(); +#endif #endif }