Changeset 17759

Timestamp:

09/24/20 14:45:26 (4 years ago)

Author:

pfleck

Message:

#3040 Added DiffSharp as alternative for AutoDiff and TensorFlowNet

Location:

branches/3040_VectorBasedGP

Files:

• HeuristicLab.DiffSharp (added)
• HeuristicLab.DiffSharp/HeuristicLab.DiffSharp.csproj (added)
• HeuristicLab.DiffSharp/HeuristicLab.snk (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab.snk)
• HeuristicLab.DiffSharp/Plugin.cs.frame (added)
• HeuristicLab.DiffSharp/Properties (added)
• HeuristicLab.DiffSharp/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.ExtLibs.sln (modified) (3 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj (modified) (3 diffs)
• HeuristicLab.MathNet.Numerics/HeuristicLab.MathNet.Numerics.csproj (modified) (2 diffs)
• HeuristicLab.MathNet.Numerics/HeuristicLab.snk (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab.snk)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (6 diffs)
• HeuristicLab.TensorFlowNet/HeuristicLab.TensorFlowNet.csproj (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (1 diff)
• HeuristicLab/3.3/app.config (modified) (1 diff)
• TensorFlowNet/TensorFlowNet.csproj (modified) (1 diff)

branches/3040_VectorBasedGP/HeuristicLab.ExtLibs.sln

@@ -91 +91 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNet", "TensorFlowNet\TensorFlowNet.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}"
 EndProject
 Global
@@ -496 +498 @@
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.Build.0 = Debug|Any CPU
+    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.ActiveCfg = Debug|x64
+    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.Build.0 = Debug|x64
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x86.ActiveCfg = Debug|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x86.Build.0 = Debug|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|Any CPU.Build.0 = Release|Any CPU
-    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.ActiveCfg = Release|Any CPU
-    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.Build.0 = Release|Any CPU
+    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.ActiveCfg = Release|x64
+    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.Build.0 = Release|x64
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.ActiveCfg = Release|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.Build.0 = Release|Any CPU
@@ -544 +546 @@
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.Build.0 = Debug|Any CPU
+    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.ActiveCfg = Debug|x64
+    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.Build.0 = Debug|x64
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x86.ActiveCfg = Debug|Any CPU
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x86.Build.0 = Debug|Any CPU
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|Any CPU.Build.0 = Release|Any CPU
-    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.ActiveCfg = Release|Any CPU
-    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.Build.0 = Release|Any CPU
+    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.ActiveCfg = Release|x64
+    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.Build.0 = Release|x64
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.ActiveCfg = Release|Any CPU
     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.Build.0 = Release|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.Build.0 = Debug|Any CPU
+    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.ActiveCfg = Debug|x64
+    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.Build.0 = Debug|x64
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x86.ActiveCfg = Debug|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x86.Build.0 = Debug|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.ActiveCfg = Release|Any CPU
-    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.Build.0 = Release|Any CPU
+    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.ActiveCfg = Release|x64
+    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.Build.0 = Release|x64
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.ActiveCfg = Release|Any CPU
     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.Build.0 = Release|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|Any CPU
+    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|x64
+    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|x64
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.Build.0 = Release|Any CPU
-    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|Any CPU
-    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|Any CPU
+    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|x64
+    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|x64
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU
     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.ActiveCfg = Debug|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.Build.0 = Debug|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x86.ActiveCfg = Debug|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|Any CPU.ActiveCfg = Release|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x64.ActiveCfg = Release|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x64.Build.0 = Release|x64
+    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x86.ActiveCfg = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj

@@ -35 +35 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -60 +82 @@
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HEAL.Attic">
-      <Version>1.5.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
@@ -73 +90 @@
       <Project>{44b10478-d290-43d3-9757-c08f5292fea5}</Project>
       <Name>HeuristicLab.Protobuf</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

branches/3040_VectorBasedGP/HeuristicLab.MathNet.Numerics/HeuristicLab.MathNet.Numerics.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="HEAL.Attic">
       <HintPath>..\bin\HEAL.Attic.dll</HintPath>
     </Reference>
@@ -42 +65 @@
   <ItemGroup>
     <Compile Include="VectorTransformer.cs" />
+    <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -24 +24 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7.0</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34 +34 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7.0</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -56 +56 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -74 +74 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -90 +90 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
@@ -108 +108 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <ItemGroup>

branches/3040_VectorBasedGP/HeuristicLab.TensorFlowNet/HeuristicLab.TensorFlowNet.csproj

@@ -33 +33 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>

branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -192 +192 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.11.3</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/3040_VectorBasedGP/HeuristicLab/3.3/app.config

@@ -9 +9 @@
   <runtime>
     <gcServer enabled="true"/>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 

branches/3040_VectorBasedGP/TensorFlowNet/TensorFlowNet.csproj

@@ -30 +30 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>