Browse Source

Project files: simplify build constants

dependabot/nuget/NUnit3TestAdapter-4.2.0
Christoph Ruegg 5 years ago
parent
commit
50accee218
  1. 6
      Directory.Build.props
  2. 2
      src/Numerics.Tests/Numerics.Tests.CUDA.csproj
  3. 2
      src/Numerics.Tests/Numerics.Tests.MKL.csproj
  4. 2
      src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
  5. 11
      src/Numerics.Tests/UseLinearAlgebraProvider.cs

6
Directory.Build.props

@ -20,14 +20,10 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build/MathNet.Numerics.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<CommonConstants>STRONGNAME</CommonConstants>
<PackageIdSuffix>.Signed</PackageIdSuffix>
<TitleSuffix> - Strong Name Edition</TitleSuffix>
<DescriptionSuffix> This package contains strong-named assemblies for legacy use cases (not recommended).</DescriptionSuffix>
<DefineConstants>$(CommonConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'!='netstandard1.3'">
<DefineConstants>NATIVE;$(CommonConstants)</DefineConstants>
<DefineConstants>STRONGNAME</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)build/icon.png" Pack="true" Visible="false" PackagePath="\" />

2
src/Numerics.Tests/Numerics.Tests.CUDA.csproj

@ -9,7 +9,7 @@
<IsPackable>false</IsPackable>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>alpha02</VersionSuffix>
<DefineConstants>NATIVE;CUDA;$(CommonConstants)</DefineConstants>
<DefineConstants>CUDA</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Remove="TestResult.xml" />

2
src/Numerics.Tests/Numerics.Tests.MKL.csproj

@ -9,7 +9,7 @@
<IsPackable>false</IsPackable>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>alpha02</VersionSuffix>
<DefineConstants>NATIVE;MKL;$(CommonConstants)</DefineConstants>
<DefineConstants>MKL</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Remove="TestResult.xml" />

2
src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj

@ -9,7 +9,7 @@
<IsPackable>false</IsPackable>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>alpha02</VersionSuffix>
<DefineConstants>NATIVE;OPENBLAS;$(CommonConstants)</DefineConstants>
<DefineConstants>OPENBLAS</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Remove="TestResult.xml" />

11
src/Numerics.Tests/UseLinearAlgebraProvider.cs

@ -32,14 +32,6 @@ using System.IO;
using NUnit.Framework;
using NUnit.Framework.Interfaces;
#if MKL
using MathNet.Numerics.Providers.MKL;
#elif CUDA
using MathNet.Numerics.Providers.CUDA;
#elif OPENBLAS
using MathNet.Numerics.Providers.OpenBLAS;
#endif
namespace MathNet.Numerics.UnitTests
{
[AttributeUsage(AttributeTargets.Assembly)]
@ -51,13 +43,10 @@ namespace MathNet.Numerics.UnitTests
#if MKL
Control.NativeProviderPath = Path.GetFullPath(Path.Combine(outDir, @"MKL/Windows/"));
Control.UseNativeMKL();
//MklControl.UseNativeMKL(MklConsistency.AVX, MklPrecision.Double, MklAccuracy.High);
#elif CUDA
Control.UseNativeCUDA();
//CudaControl.UseNativeCUDA();
#elif OPENBLAS
Control.UseNativeOpenBLAS();
//OpenBlasControl.UseNativeOpenBLAS();
#else
Control.UseManaged();
#endif

Loading…
Cancel
Save