Changeset 17759


Ignore:
Timestamp:
09/24/20 14:45:26 (16 months ago)
Author:
pfleck
Message:

#3040 Added DiffSharp as alternative for AutoDiff and TensorFlowNet

Location:
branches/3040_VectorBasedGP
Files:
5 added
8 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs.sln

    r17469 r17759  
    9191EndProject
    9292Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNet", "TensorFlowNet\TensorFlowNet.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}"
     93EndProject
     94Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}"
    9395EndProject
    9496Global
     
    496498    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    497499    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
    498     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.ActiveCfg = Debug|Any CPU
    499     {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.Build.0 = Debug|Any CPU
     500    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.ActiveCfg = Debug|x64
     501    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x64.Build.0 = Debug|x64
    500502    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x86.ActiveCfg = Debug|Any CPU
    501503    {44A10478-D290-43C2-9757-F08F5292FEA5}.Debug|x86.Build.0 = Debug|Any CPU
    502504    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    503505    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|Any CPU.Build.0 = Release|Any CPU
    504     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.ActiveCfg = Release|Any CPU
    505     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.Build.0 = Release|Any CPU
     506    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.ActiveCfg = Release|x64
     507    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x64.Build.0 = Release|x64
    506508    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.ActiveCfg = Release|Any CPU
    507509    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.Build.0 = Release|Any CPU
     
    544546    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    545547    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
    546     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.ActiveCfg = Debug|Any CPU
    547     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.Build.0 = Debug|Any CPU
     548    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.ActiveCfg = Debug|x64
     549    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x64.Build.0 = Debug|x64
    548550    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x86.ActiveCfg = Debug|Any CPU
    549551    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Debug|x86.Build.0 = Debug|Any CPU
    550552    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
    551553    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|Any CPU.Build.0 = Release|Any CPU
    552     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.ActiveCfg = Release|Any CPU
    553     {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.Build.0 = Release|Any CPU
     554    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.ActiveCfg = Release|x64
     555    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x64.Build.0 = Release|x64
    554556    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.ActiveCfg = Release|Any CPU
    555557    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.Build.0 = Release|Any CPU
    556558    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    557559    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
    558     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.ActiveCfg = Debug|Any CPU
    559     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.Build.0 = Debug|Any CPU
     560    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.ActiveCfg = Debug|x64
     561    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x64.Build.0 = Debug|x64
    560562    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x86.ActiveCfg = Debug|Any CPU
    561563    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|x86.Build.0 = Debug|Any CPU
    562564    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
    563565    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|Any CPU.Build.0 = Release|Any CPU
    564     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.ActiveCfg = Release|Any CPU
    565     {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.Build.0 = Release|Any CPU
     566    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.ActiveCfg = Release|x64
     567    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x64.Build.0 = Release|x64
    566568    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.ActiveCfg = Release|Any CPU
    567569    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.Build.0 = Release|Any CPU
    568570    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    569571    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
    570     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|Any CPU
    571     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|Any CPU
     572    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|x64
     573    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|x64
    572574    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU
    573575    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU
    574576    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
    575577    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.Build.0 = Release|Any CPU
    576     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|Any CPU
    577     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|Any CPU
     578    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|x64
     579    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|x64
    578580    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU
    579581    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU
     582    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|Any CPU.ActiveCfg = Debug|x64
     583    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.ActiveCfg = Debug|x64
     584    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.Build.0 = Debug|x64
     585    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x86.ActiveCfg = Debug|x64
     586    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|Any CPU.ActiveCfg = Release|x64
     587    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x64.ActiveCfg = Release|x64
     588    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x64.Build.0 = Release|x64
     589    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Release|x86.ActiveCfg = Release|x64
    580590  EndGlobalSection
    581591  GlobalSection(SolutionProperties) = preSolution
  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj

    r17725 r17759  
    3535    <Prefer32Bit>false</Prefer32Bit>
    3636  </PropertyGroup>
     37  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     38    <DebugSymbols>true</DebugSymbols>
     39    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     40    <DefineConstants>DEBUG;TRACE</DefineConstants>
     41    <DebugType>full</DebugType>
     42    <PlatformTarget>x64</PlatformTarget>
     43    <ErrorReport>prompt</ErrorReport>
     44    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     45  </PropertyGroup>
     46  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     47    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     48    <DefineConstants>TRACE</DefineConstants>
     49    <Optimize>true</Optimize>
     50    <DebugType>pdbonly</DebugType>
     51    <PlatformTarget>x64</PlatformTarget>
     52    <ErrorReport>prompt</ErrorReport>
     53    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     54  </PropertyGroup>
    3755  <ItemGroup>
     56    <Reference Include="HEAL.Attic, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     57      <SpecificVersion>False</SpecificVersion>
     58      <HintPath>..\..\..\bin\HEAL.Attic.dll</HintPath>
     59    </Reference>
    3860    <Reference Include="System" />
    3961    <Reference Include="System.Core" />
     
    6082  </ItemGroup>
    6183  <ItemGroup>
    62     <PackageReference Include="HEAL.Attic">
    63       <Version>1.5.0</Version>
    64     </PackageReference>
    65   </ItemGroup>
    66   <ItemGroup>
    6784    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    6885      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     
    7390      <Project>{44b10478-d290-43d3-9757-c08f5292fea5}</Project>
    7491      <Name>HeuristicLab.Protobuf</Name>
     92      <Private>False</Private>
    7593    </ProjectReference>
    7694  </ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab.MathNet.Numerics/HeuristicLab.MathNet.Numerics.csproj

    r17725 r17759  
    3131    <WarningLevel>4</WarningLevel>
    3232  </PropertyGroup>
     33  <PropertyGroup>
     34    <SignAssembly>true</SignAssembly>
     35  </PropertyGroup>
     36  <PropertyGroup>
     37    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     38  </PropertyGroup>
     39  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     40    <DebugSymbols>true</DebugSymbols>
     41    <OutputPath>..\bin\</OutputPath>
     42    <DefineConstants>DEBUG;TRACE</DefineConstants>
     43    <DebugType>full</DebugType>
     44    <PlatformTarget>x64</PlatformTarget>
     45    <ErrorReport>prompt</ErrorReport>
     46    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     47  </PropertyGroup>
     48  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     49    <OutputPath>..\bin\</OutputPath>
     50    <DefineConstants>TRACE</DefineConstants>
     51    <Optimize>true</Optimize>
     52    <DebugType>pdbonly</DebugType>
     53    <PlatformTarget>x64</PlatformTarget>
     54    <ErrorReport>prompt</ErrorReport>
     55    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     56  </PropertyGroup>
    3357  <ItemGroup>
    34     <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    35       <SpecificVersion>False</SpecificVersion>
     58    <Reference Include="HEAL.Attic">
    3659      <HintPath>..\bin\HEAL.Attic.dll</HintPath>
    3760    </Reference>
     
    4265  <ItemGroup>
    4366    <Compile Include="VectorTransformer.cs" />
     67    <None Include="HeuristicLab.snk" />
    4468    <None Include="Plugin.cs.frame" />
    4569    <Compile Include="Plugin.cs" />
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

    r17741 r17759  
    2424    <WarningLevel>4</WarningLevel>
    2525    <Prefer32Bit>false</Prefer32Bit>
    26     <LangVersion>7.0</LangVersion>
     26    <LangVersion>default</LangVersion>
    2727  </PropertyGroup>
    2828  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3434    <WarningLevel>4</WarningLevel>
    3535    <Prefer32Bit>false</Prefer32Bit>
    36     <LangVersion>7.0</LangVersion>
     36    <LangVersion>default</LangVersion>
    3737  </PropertyGroup>
    3838  <PropertyGroup>
     
    5656    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    5757    <Prefer32Bit>false</Prefer32Bit>
    58     <LangVersion>5</LangVersion>
     58    <LangVersion>default</LangVersion>
    5959  </PropertyGroup>
    6060  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     
    7474    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    7575    <Prefer32Bit>false</Prefer32Bit>
    76     <LangVersion>5</LangVersion>
     76    <LangVersion>default</LangVersion>
    7777  </PropertyGroup>
    7878  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     
    9090    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    9191    <Prefer32Bit>false</Prefer32Bit>
    92     <LangVersion>5</LangVersion>
     92    <LangVersion>default</LangVersion>
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     
    108108    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    109109    <Prefer32Bit>false</Prefer32Bit>
    110     <LangVersion>5</LangVersion>
     110    <LangVersion>default</LangVersion>
    111111  </PropertyGroup>
    112112  <ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab.TensorFlowNet/HeuristicLab.TensorFlowNet.csproj

    r17469 r17759  
    3333  <PropertyGroup>
    3434    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     35  </PropertyGroup>
     36  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     37    <DebugSymbols>true</DebugSymbols>
     38    <OutputPath>..\bin\</OutputPath>
     39    <DefineConstants>DEBUG;TRACE</DefineConstants>
     40    <DebugType>full</DebugType>
     41    <PlatformTarget>x64</PlatformTarget>
     42    <ErrorReport>prompt</ErrorReport>
     43    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     44  </PropertyGroup>
     45  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     46    <OutputPath>..\bin\</OutputPath>
     47    <DefineConstants>TRACE</DefineConstants>
     48    <Optimize>true</Optimize>
     49    <DebugType>pdbonly</DebugType>
     50    <PlatformTarget>x64</PlatformTarget>
     51    <ErrorReport>prompt</ErrorReport>
     52    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3553  </PropertyGroup>
    3654  <ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r16565 r17759  
    192192    </BootstrapperPackage>
    193193  </ItemGroup>
     194  <ItemGroup>
     195    <PackageReference Include="Google.Protobuf">
     196      <Version>3.11.3</Version>
     197    </PackageReference>
     198  </ItemGroup>
    194199  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    195200  <!-- 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

    r11623 r17759  
    99  <runtime>
    1010    <gcServer enabled="true"/>
     11    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
     12      <dependentAssembly>
     13        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
     14        <bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
     15      </dependentAssembly>
     16    </assemblyBinding>
    1117  </runtime>
    1218
  • branches/3040_VectorBasedGP/TensorFlowNet/TensorFlowNet.csproj

    r17725 r17759  
    3030    <ErrorReport>prompt</ErrorReport>
    3131    <WarningLevel>4</WarningLevel>
     32  </PropertyGroup>
     33  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     34    <DebugSymbols>true</DebugSymbols>
     35    <OutputPath>..\bin\</OutputPath>
     36    <DefineConstants>DEBUG;TRACE</DefineConstants>
     37    <DebugType>full</DebugType>
     38    <PlatformTarget>x64</PlatformTarget>
     39    <ErrorReport>prompt</ErrorReport>
     40    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     41  </PropertyGroup>
     42  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     43    <OutputPath>..\bin\</OutputPath>
     44    <DefineConstants>TRACE</DefineConstants>
     45    <Optimize>true</Optimize>
     46    <DebugType>pdbonly</DebugType>
     47    <PlatformTarget>x64</PlatformTarget>
     48    <ErrorReport>prompt</ErrorReport>
     49    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3250  </PropertyGroup>
    3351  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.