Changeset 17930


Ignore:
Timestamp:
04/09/21 12:44:50 (6 months ago)
Author:
pfleck
Message:

#3040 Reworked external dependencies and merged some libraries (ILmerge) to avoid versions conflicts occuring on Hive.

Location:
branches/3040_VectorBasedGP
Files:
21 added
4 deleted
11 edited

Legend:

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

    r17825 r17930  
    8585Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MathNet.Numerics", "HeuristicLab.MathNet.Numerics\HeuristicLab.MathNet.Numerics.csproj", "{71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}"
    8686EndProject
    87 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TensorFlowNet", "HeuristicLab.TensorFlowNet\HeuristicLab.TensorFlowNet.csproj", "{C2E26343-88C7-4288-938B-EEE7C2ABBDB6}"
     87Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNetILMerge", "HeuristicLab.ExtLibs\TensorFlowNet\TensorFlowNetILMerge.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}"
     88EndProject
     89Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TensorFlowNet", "HeuristicLab.ExtLibs\HeuristicLab.TensorFlowNet\HeuristicLab.TensorFlowNet.csproj", "{C2E26343-88C7-4288-938B-EEE7C2ABBDB6}"
    8890  ProjectSection(ProjectDependencies) = postProject
    8991    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3} = {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}
    9092  EndProjectSection
    9193EndProject
    92 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNet", "TensorFlowNet\TensorFlowNet.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}"
    93 EndProject
    94 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}"
     94Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiffSharpILMerge", "HeuristicLab.ExtLibs\DiffSharp\DiffSharpILMerge.csproj", "{0C9D4608-1B14-404E-9932-F60E67B625BA}"
     95EndProject
     96Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.ExtLibs\HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}"
     97  ProjectSection(ProjectDependencies) = postProject
     98    {0C9D4608-1B14-404E-9932-F60E67B625BA} = {0C9D4608-1B14-404E-9932-F60E67B625BA}
     99  EndProjectSection
    95100EndProject
    96101Global
     
    556561    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.ActiveCfg = Release|Any CPU
    557562    {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.Build.0 = Release|Any CPU
     563    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     564    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
     565    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|x64
     566    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|x64
     567    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU
     568    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU
     569    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
     570    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.Build.0 = Release|Any CPU
     571    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|x64
     572    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|x64
     573    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU
     574    {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU
    558575    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    559576    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    568585    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.ActiveCfg = Release|Any CPU
    569586    {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.Build.0 = Release|Any CPU
    570     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    571     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.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
    574     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU
    575     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU
    576     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
    577     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.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
    580     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU
    581     {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU
     587    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|Any CPU.ActiveCfg = Debug|x64
     588    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x64.ActiveCfg = Debug|x64
     589    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x64.Build.0 = Debug|x64
     590    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x86.ActiveCfg = Debug|x64
     591    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|Any CPU.ActiveCfg = Release|x64
     592    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x64.ActiveCfg = Release|x64
     593    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x64.Build.0 = Release|x64
     594    {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x86.ActiveCfg = Release|x64
    582595    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|Any CPU.ActiveCfg = Debug|x64
    583596    {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.ActiveCfg = Debug|x64
  • branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.Protobuf/3.6.1/HeuristicLab.Protobuf.csproj

    r17725 r17930  
    6161  <ItemGroup>
    6262    <PackageReference Include="Google.Protobuf">
    63       <Version>3.11.3</Version>
     63      <Version>3.6.1</Version>
    6464    </PackageReference>
    6565  </ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab.MathNet.Numerics/HeuristicLab.MathNet.Numerics.csproj

    r17759 r17930  
    5656  </PropertyGroup>
    5757  <ItemGroup>
    58     <Reference Include="HEAL.Attic">
     58    <Reference Include="HEAL.Attic, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     59      <SpecificVersion>False</SpecificVersion>
    5960      <HintPath>..\bin\HEAL.Attic.dll</HintPath>
    6061    </Reference>
     
    7273  </ItemGroup>
    7374  <ItemGroup>
     75    <ProjectReference Include="..\HeuristicLab.ExtLibs\HeuristicLab.Attic\1.0.0\HeuristicLab.Attic.csproj">
     76      <Project>{44a10478-d290-43c2-9757-f08f5292fea5}</Project>
     77      <Name>HeuristicLab.Attic</Name>
     78    </ProjectReference>
    7479    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    7580      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     
    7883  </ItemGroup>
    7984  <ItemGroup>
    80     <PackageReference Include="Google.Protobuf">
    81       <Version>3.11.3</Version>
    82     </PackageReference>
    8385    <PackageReference Include="MathNet.Numerics.Signed">
    8486      <Version>4.9.0</Version>
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r17786 r17930  
    110110      <Private>False</Private>
    111111    </Reference>
    112     <Reference Include="DiffSharp, Version=0.7.7.0, Culture=neutral, processorArchitecture=AMD64">
     112    <Reference Include="DiffSharp.Merged, Version=0.8.4.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64">
    113113      <SpecificVersion>False</SpecificVersion>
    114       <HintPath>..\..\bin\DiffSharp.dll</HintPath>
     114      <HintPath>..\..\bin\DiffSharp.Merged.dll</HintPath>
    115115    </Reference>
    116116    <Reference Include="MathNet.Numerics">
     
    118118      <Private>False</Private>
    119119    </Reference>
     120    <Reference Include="netstandard" />
    120121    <Reference Include="System" />
    121122    <Reference Include="System.Core">
     
    132133    <Reference Include="System.Data" />
    133134    <Reference Include="System.Xml" />
    134     <Reference Include="TensorFlow.NET.Signed">
    135       <HintPath>..\..\bin\TensorFlow.NET.Signed.dll</HintPath>
    136       <Private>False</Private>
     135    <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     136      <SpecificVersion>False</SpecificVersion>
     137      <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath>
    137138    </Reference>
    138139  </ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NonlinearLeastSquaresVectorConstantOptimizationEvaluator.cs

    r17786 r17930  
    117117      alglib.ndimensional_func alglib_func = (double[] x, ref double func, object o) => {
    118118        var vars = new DV(x);
    119         func = loss(vars);
     119        func = (double)loss(vars);
    120120        var cnt = (EvaluationsCounter)o;
    121121        cnt.FunctionEvaluations++;
     
    123123      alglib.ndimensional_grad alglib_grad = (double[] x, ref double func, double[] grad, object o) => {
    124124        var vars = new DV(x);
    125         func = loss(vars);
    126         Array.Copy(lossGrad(vars), grad, x.Length);
     125        func = (double)loss(vars);
     126        Array.Copy((double[])lossGrad(vars), grad, x.Length);
    127127        var cnt = (EvaluationsCounter)o;
    128128        cnt.GradientEvaluations++;
     
    130130      alglib.ndimensional_hess alglib_hess = (double[] x, ref double func, double[] grad, double[,] hess, object o) => {
    131131        var vars = new DV(x);
    132         func = loss(vars);
    133         Array.Copy(lossGrad(vars), grad, x.Length);
    134         Array.Copy(lossHess(vars), hess, x.Length * x.Length);
     132        func = (double)loss(vars);
     133        Array.Copy((double[])lossGrad(vars), grad, x.Length);
     134        Array.Copy((double[,])lossHess(vars), hess, x.Length * x.Length);
    135135        var cnt = (EvaluationsCounter)o;
    136136        cnt.HessianEvaluations++;
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToDiffSharpConverter.cs

    r17786 r17930  
    271271        var terms = node.Subtrees.Select(ConvertNode).ToList();
    272272        if (terms.Count == 1) return FunctionApply(terms[0],
    273             s => -s,
     273            s => D.Neg(s),
    274274            v => DV.Neg(v));
    275275        return terms.Aggregate((a, b) =>
     
    288288            (s1, v2) => s1 * v2,
    289289            (v1, s2) => v1 * s2,
    290             (v1, v2) => DV.op_DotMultiply(v1, v2)
     290            (v1, v2) => DV.PointwiseMultiply(v1, v2)
    291291          ));
    292292      }
     
    301301            (s1, v2) => s1 / v2,
    302302            (v1, s2) => v1 / s2,
    303             (v1, v2) => DV.op_DotDivide(v1, v2)
     303            (v1, v2) => DV.PointwiseDivision(v1, v2)
    304304          ));
    305305      }
     
    345345        return FunctionApply(ConvertNode(node.GetSubtree(0)),
    346346          s => D.Sign(s) * D.Pow(D.Abs(s), 1.0 / 3.0),
    347           v => DV.op_DotMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0))
     347          v => DV.PointwiseMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0))
    348348        );
    349349      }
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r17830 r17930  
    113113      <Private>False</Private>
    114114    </Reference>
    115     <Reference Include="DiffSharp, Version=0.7.7.0, Culture=neutral, processorArchitecture=AMD64">
     115    <Reference Include="DiffSharp.Merged, Version=0.8.4.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64">
    116116      <SpecificVersion>False</SpecificVersion>
    117       <HintPath>..\..\bin\DiffSharp.dll</HintPath>
     117      <HintPath>..\..\bin\DiffSharp.Merged.dll</HintPath>
    118118    </Reference>
    119119    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     
    130130      <HintPath>..\..\bin\MathNet.Numerics.dll</HintPath>
    131131    </Reference>
     132    <Reference Include="netstandard" />
    132133    <Reference Include="System" />
    133134    <Reference Include="System.Core">
     
    143144    <Reference Include="System.Data" />
    144145    <Reference Include="System.Xml" />
    145     <Reference Include="TensorFlow.NET.Signed, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     146    <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    146147      <SpecificVersion>False</SpecificVersion>
    147       <HintPath>..\..\bin\TensorFlow.NET.Signed.dll</HintPath>
     148      <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath>
    148149    </Reference>
    149150  </ItemGroup>
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

    r17830 r17930  
    785785              s => 0,
    786786              v => {
    787                 int bins = (int)Math.Round(m.Scalar);
     787                int bins = Math.Max((int)Math.Round(m.Scalar), 1);
    788788                double minValue = v.Minimum();
    789789                double maxValue = v.Maximum();
     
    794794                  double binMin = minValue * i;
    795795                  double binMax = binMin + intervalWidth;
    796                   double countBin = v.Map(e => (e > binMin && e < binMax) ? 1 : 0).Sum();
     796                  double countBin = v.Map(e => (e > binMin && e < binMax) ? 1.0 : 0.0).Sum();
    797797                  double percBin = countBin / totalValues;
    798798                  sum += percBin * Math.Log(percBin);
     
    808808            cur = AggregateApply(cur,
    809809              s => 0,
    810               v => Statistics.PopulationStandardDeviation(v) > (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1 : 0);
     810              v => Statistics.PopulationStandardDeviation(v) > (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1.0 : 0.0);
    811811            TraceEvaluation(currentInstr, cur);
    812812            return cur;
     
    816816            cur = AggregateApply(cur,
    817817              s => 0,
    818               v => Statistics.PopulationVariance(v) > Statistics.StandardDeviation(v) ? 1 : 0);
     818              v => Statistics.PopulationVariance(v) > Statistics.StandardDeviation(v) ? 1.0 : 0.0);
    819819            TraceEvaluation(currentInstr, cur);
    820820            return cur;
     
    824824            cur = AggregateApply(cur,
    825825              s => 0,
    826               v => Math.Abs(Statistics.Mean(v) - Statistics.Median(v)) < (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1 : 0);
     826              v => Math.Abs(Statistics.Mean(v) - Statistics.Median(v)) < (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1.0 : 0.0);
    827827            TraceEvaluation(currentInstr, cur);
    828828            return cur;
     
    834834              v => {
    835835                double mean = Statistics.Mean(v);
    836                 return v.Map(e => e > mean ? 1 : 0).Sum();
     836                return v.Map(e => e > mean ? 1.0 : 0.0).Sum();
    837837              });
    838838            TraceEvaluation(currentInstr, cur);
     
    845845              v => {
    846846                double median = Statistics.Median(v);
    847                 return v.Map(e => e > median ? 1 : 0).Sum();
     847                return v.Map(e => e > median ? 1.0 : 0.0).Sum();
    848848              });
    849849            TraceEvaluation(currentInstr, cur);
     
    856856              v => {
    857857                double mean = Statistics.Mean(v);
    858                 return v.Map(e => e < mean ? 1 : 0).Sum();
     858                return v.Map(e => e < mean ? 1.0 : 0.0).Sum();
    859859              });
    860860            TraceEvaluation(currentInstr, cur);
     
    867867              v => {
    868868                double median = Statistics.Median(v);
    869                 return v.Map(e => e < median ? 1 : 0).Sum();
     869                return v.Map(e => e < median ? 1.0 : 0.0).Sum();
    870870              });
    871871            TraceEvaluation(currentInstr, cur);
     
    10551055              v => {
    10561056                double sum = 0.0;
    1057                 int l = (int)Math.Round(lVal.Scalar);
     1057                int l = Math.Max((int)Math.Round(lVal.Scalar), 0);
    10581058                double mean = Statistics.Mean(v);
    10591059                for (int i = 0; i < v.Count - l; i++) {
     
    11061106              s => 0,
    11071107              v => {
    1108                 int lag = (int)Math.Round(l.Scalar);
     1108                int lag = Math.Max((int)Math.Round(l.Scalar), 0);
    11091109                double sum = 0.0;
    11101110                for (int i = 0; i < v.Count - 2 * lag; i++) {
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/Plugin.cs.frame

    r17184 r17930  
    3232  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    3333  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation", "3.4")]
    34   [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
     34  //[PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
    3535  public class HeuristicLabProblemsExternalEvaluationGPPlugin : PluginBase {
    3636  }
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.ExternalEvaluation/3.4/Plugin.cs.frame

    r17184 r17930  
    3434  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3535  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    36   [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
     36  //[PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
    3737  [PluginDependency("HeuristicLab.Scripting", "3.3")]
    3838  public class HeuristicLabProblemsExternalEvaluationPlugin : PluginBase {
  • branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r17759 r17930  
    111111    <ApplicationManifest>app.manifest</ApplicationManifest>
    112112  </PropertyGroup>
     113  <PropertyGroup>
     114    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     115  </PropertyGroup>
    113116  <ItemGroup>
    114117    <Reference Include="System" />
     
    192195    </BootstrapperPackage>
    193196  </ItemGroup>
    194   <ItemGroup>
    195     <PackageReference Include="Google.Protobuf">
    196       <Version>3.11.3</Version>
    197     </PackageReference>
    198   </ItemGroup>
    199197  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    200198  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.