From 50accee218ac1ec20fb3f536315c2f7368e86072 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Mon, 6 Dec 2021 22:34:37 +0100
Subject: [PATCH] Project files: simplify build constants

---
 Directory.Build.props                             |  6 +-----
 src/Numerics.Tests/Numerics.Tests.CUDA.csproj     |  2 +-
 src/Numerics.Tests/Numerics.Tests.MKL.csproj      |  2 +-
 src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj |  2 +-
 src/Numerics.Tests/UseLinearAlgebraProvider.cs    | 11 -----------
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3273ce3b..41c50d6b 100644
--- a/Directory.Build.props
+++ b/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="\" />
diff --git a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj b/src/Numerics.Tests/Numerics.Tests.CUDA.csproj
index 6ff81450..4448f95a 100644
--- a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj
+++ b/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" />
diff --git a/src/Numerics.Tests/Numerics.Tests.MKL.csproj b/src/Numerics.Tests/Numerics.Tests.MKL.csproj
index e3ac5fe1..c4d411b8 100644
--- a/src/Numerics.Tests/Numerics.Tests.MKL.csproj
+++ b/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" />
diff --git a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj b/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
index 980adced..6c2e75f5 100644
--- a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
+++ b/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" />
diff --git a/src/Numerics.Tests/UseLinearAlgebraProvider.cs b/src/Numerics.Tests/UseLinearAlgebraProvider.cs
index 65a27a04..caf64941 100644
--- a/src/Numerics.Tests/UseLinearAlgebraProvider.cs
+++ b/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