Changeset 16287 for trunk

Timestamp:

11/08/18 16:55:30 (5 years ago)

Author:

bburlacu

Message:

#2958: Keep the SymbolicDataAnalysisExpressionTreeBatchInterpreter, but remove vectorization.

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (3 diffs)
• Interpreter/BatchOperations.cs (modified) (2 diffs)
• Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -117 +117 @@
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -165 +162 @@
     <Compile Include="Interfaces\IVariableSymbol.cs" />
     <Compile Include="Interpreter\BatchInstruction.cs" />
-    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs" />
     <Compile Include="Interpreter\BatchOperations.cs" />
     <Compile Include="Interpreter\SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs" />
+    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs" />
     <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs" />
@@ -283 +280 @@
     <Compile Include="TreeMatching\SymbolicExpressionTreePhenotypicSimilarityCalculator.cs" />
     <None Include="HeuristicLab.snk" />
-    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/BatchOperations.cs

@@ -1 +1 @@
 using System;
-using System.Numerics;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public static class BatchOperations {
     public const int BATCHSIZE = 64;
-    private static readonly int STRIDE = Vector<double>.Count;
 
     public static void Load(double[] a, double[] b) {
@@ -12 +10 @@
 
     public static void Add(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var va = new Vector<double>(a, i);
-        var vb = new Vector<double>(b, i);
-        (va + vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] += b[i];
       }
     }
 
     public static void Sub(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var va = new Vector<double>(a, i);
-        var vb = new Vector<double>(b, i);
-        (va - vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] -= b[i];
       }
     }
 
     public static void Div(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var va = new Vector<double>(a, i);
-        var vb = new Vector<double>(b, i);
-        (va / vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] /= b[i];
       }
     }
 
     public static void Mul(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var va = new Vector<double>(a, i);
-        var vb = new Vector<double>(b, i);
-        (va * vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] *= b[i];
       }
     }
 
     public static void Neg(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var vb = new Vector<double>(b, i);
-        Vector.Negate(vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] = -b[i];
       }
     }
 
     public static void Inv(double[] a, double[] b) {
-      for (int i = 0; i < BATCHSIZE; i += STRIDE) {
-        var vb = new Vector<double>(b, i);
-        (Vector<double>.One / vb).CopyTo(a, i);
+      for (int i = 0; i < BATCHSIZE; ++i) {
+        a[i] = 1 / b[i];
       }
     }

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

@@ -161 +161 @@
         }
 
+        code[i].buf = new double[BATCHSIZE];
+
         if (node is VariableTreeNode variable) {
           code[i].weight = variable.Weight;
           code[i].data = dataset.GetReadOnlyDoubleValues(variable.VariableName).ToArray();
-          code[i].buf = new double[BATCHSIZE];
         } else if (node is ConstantTreeNode constant) {
           code[i].value = constant.Value;
-          code[i].buf = Enumerable.Repeat(code[i].value, BATCHSIZE).ToArray();
-        } else if (node.SubtreeCount > 0) {
-          code[i].buf = new double[BATCHSIZE];
+          for (int j = 0; j < BATCHSIZE; ++j)
+            code[i].buf[j] = code[i].value;
         }