Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/22 13:28:56 (2 years ago)
Author:
pfleck
Message:

#3040 Updated to newer TensorFlow.NET version.

  • Removed IL Merge from TensorFlow.NET.
  • Temporarily removed DiffSharp.
  • Changed to a locally built Attic with a specific Protobuf version that is compatible with TensorFlow.NET. (Also adapted other versions of nuget dependencies.)
Location:
branches/3040_VectorBasedGP/HeuristicLab.ExtLibs
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

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

    r17935 r18239  
    5454  </PropertyGroup>
    5555  <ItemGroup>
     56    <Reference Include="HEAL.Attic, Version=1.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     57      <SpecificVersion>False</SpecificVersion>
     58      <HintPath>..\..\..\bin\HEAL.Attic.dll</HintPath>
     59    </Reference>
    5660    <Reference Include="System" />
    5761    <Reference Include="System.Core" />
    … …  
    7882  </ItemGroup>
    7983  <ItemGroup>
    80     <PackageReference Include="HEAL.Attic">
    81       <Version>1.5.0</Version>
    82     </PackageReference>
    83   </ItemGroup>
    84   <ItemGroup>
    8584    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    8685      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    … …  
    9291      <Name>HeuristicLab.Protobuf</Name>
    9392    </ProjectReference>
     93  </ItemGroup>
     94  <ItemGroup>
     95    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
     96      <Version>6.0.0</Version>
     97    </PackageReference>
    9498  </ItemGroup>
    9599  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.Protobuf/3.6.1/HeuristicLab.Protobuf.csproj

    r17930 r18239  
    6161  <ItemGroup>
    6262    <PackageReference Include="Google.Protobuf">
    63       <Version>3.6.1</Version>
     63      <Version>3.11.3</Version>
     64    </PackageReference>
     65    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
     66      <Version>6.0.0</Version>
    6467    </PackageReference>
    6568  </ItemGroup>

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

    r17930 r18239  
    1010    <RootNamespace>HeuristicLab.TensorFlowNet</RootNamespace>
    1111    <AssemblyName>HeuristicLab.TensorFlowNet</AssemblyName>
    12     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <Deterministic>true</Deterministic>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    5556    <Reference Include="System" />
    5657    <Reference Include="System.Core" />
    57     <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    58       <SpecificVersion>False</SpecificVersion>
    59       <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath>
    60     </Reference>
    6158  </ItemGroup>
    6259  <ItemGroup>
    … …  
    7370  </ItemGroup>
    7471  <ItemGroup>
    75     <Content Include="tensorflow.dll">
    76       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    77     </Content>
     72    <PackageReference Include="SciSharp.TensorFlow.Redist">
     73      <Version>2.7.0</Version>
     74    </PackageReference>
     75    <PackageReference Include="TensorFlow.Keras">
     76      <Version>0.7.0</Version>
     77    </PackageReference>
     78    <PackageReference Include="TensorFlow.NET">
     79      <Version>0.70.0</Version>
     80    </PackageReference>
    7881  </ItemGroup>
    7982  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.TensorFlowNet/Plugin.cs.frame

    r17935 r18239  
    2626  [Plugin("HeuristicLab.TensorFlowNet", "HeuristicLab wrapper for TensofFlow.NET nuget package.", "0.15.0.$WCREV$")]
    2727  [PluginFile("HeuristicLab.TensorFlowNet.dll", PluginFileType.Assembly)]
    28   [PluginFile("TensorFlow.NET.Merged.dll", PluginFileType.Assembly)]
     28  [PluginFile("TensorFlow.Binding.dll", PluginFileType.Assembly)]
     29  [PluginFile("TensorFlow.Keras.dll", PluginFileType.Assembly)]
     30  [PluginFile("Protobuf.Text.dll", PluginFileType.Assembly)]
     31  [PluginFile("Serilog.dll", PluginFileType.Assembly)]
     32  [PluginFile("Serilog.Sinks.Console.dll", PluginFileType.Assembly)]
    2933  [PluginFile("tensorflow.dll", PluginFileType.NativeDll)]
    30   [PluginFile("System.Memory.dll", PluginFileType.Assembly)]
    31   [PluginDependency("HeuristicLab.Protobuf", "3.6.1")]
     34  //[PluginDependency("HeuristicLab.Protobuf", "3.6.1")]
    3235  public class Plugin : PluginBase {
    3336    public Plugin() { }

  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/TensorFlowNet/TensorFlowNetILMerge.csproj

    r17930 r18239  
    1010    <RootNamespace>TensorFlowNetILMerge</RootNamespace>
    1111    <AssemblyName>TensorFlowNetILMerge_</AssemblyName>
    12     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <Deterministic>true</Deterministic>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    5758  </ItemGroup>
    5859  <ItemGroup>
    59     <PackageReference Include="Google.Protobuf">
    60       <Version>3.6.1</Version>
    61     </PackageReference>
    6260    <PackageReference Include="ilmerge">
    6361      <Version>3.0.41</Version>
    6462    </PackageReference>
    6563    <PackageReference Include="TensorFlow.NET">
    66       <Version>0.15.0</Version>
     64      <Version>0.70.1</Version>
    6765    </PackageReference>
    6866  </ItemGroup>
    6967  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    7068  <PropertyGroup>
    71     <PostBuildEvent>"$(ILMergeConsolePath)" /out:TensorFlow.NET.Merged.dll /keyfile:$(SolutionDir)HeuristicLab\3.3\HeuristicLab.snk TensorFlow.NET.dll NumSharp.Lite.dll Protobuf.Text.dll
    72 
    73 rm NumSharp.Lite.pdb
    74 rm NumSharp.Lite.dll
    75 rm TensorFlow.NET.dll
    76 rm Protobuf.Text.dll
    77 </PostBuildEvent>
     69    <PostBuildEvent>
     70    </PostBuildEvent>
    7871  </PropertyGroup>
    7972  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.