Check agreement between TF and Vespa execution

8 files changed, 28 insertions, 28 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
index d199dd3a876..abdb3071bf7 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
@@ -13,14 +13,14 @@ import java.util.stream.Collectors;
 
 /**
  * Microbenchmark of tensor operations.
- * 
+ *
  * @author bratseth
  */
 public class TensorFunctionBenchmark {
 
     private final static Random random = new Random();
-    
-    public double benchmark(int iterations, List<Tensor> modelVectors, TensorType.Dimension.Type dimensionType, 
+
+    public double benchmark(int iterations, List<Tensor> modelVectors, TensorType.Dimension.Type dimensionType,
                             boolean extraSpace) {
         Tensor queryVector = vectors(1, 300, dimensionType).get(0);
         if (extraSpace) {
@@ -34,7 +34,7 @@ public class TensorFunctionBenchmark {
         long totalTime = System.currentTimeMillis() - startTime;
         return (double)totalTime / (double)iterations;
     }
-    
+
     private Tensor unitVector(String dimension) {
         return Tensor.Builder.of(new TensorType.Builder().indexed(dimension, 1).build())
                 .cell().label(dimension, 0).value(1).build();
@@ -49,11 +49,11 @@ public class TensorFunctionBenchmark {
 
     private double dotProduct(Tensor tensor, List<Tensor> tensors) {
         double largest = Double.MIN_VALUE;
-        TensorFunction dotProductFunction = new Reduce(new Join(new ConstantTensor(tensor), 
-                                                                new VariableTensor("argument"), (a, b) -> a * b), 
+        TensorFunction dotProductFunction = new Reduce(new Join(new ConstantTensor(tensor),
+                                                                new VariableTensor("argument"), (a, b) -> a * b),
                                                        Reduce.Aggregator.sum).toPrimitive();
         MapEvaluationContext context = new MapEvaluationContext();
-        
+
         for (Tensor tensorElement : tensors) { // tensors.size() = 1 for larger tensor
             context.put("argument", tensorElement);
             double dotProduct = dotProductFunction.evaluate(context).asDouble();
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
index 30078b4a826..693b0f09351 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
 
 /**
  * Tests tensor functionality
- * 
+ *
  * @author bratseth
  */
 public class TensorTestCase {
@@ -108,7 +108,7 @@ public class TensorTestCase {
                      Tensor.diag(new TensorType.Builder().indexed("x", 3).indexed("y", 2).indexed("z", 2).build()));
         assertEquals(Tensor.from("{ {x:1}:0, {x:3}:1, {x:9}:0 }"), Tensor.from("{ {x:1}:1, {x:3}:5, {x:9}:3 }").argmax("x"));
     }
-    
+
     /** Test the same computation made in various ways which are implemented with special-case optimizations */
     @Test
     public void testOptimizedComputation() {
@@ -130,7 +130,7 @@ public class TensorTestCase {
         assertEquals("Mixed vector",           42, (int)dotProduct(vector(Type.indexedUnbound), vectors(Type.mapped, 2)));
         assertEquals("Mixed matrix",           42, (int)dotProduct(vector(Type.indexedUnbound), matrix(Type.mapped, 2)));
         assertEquals("Mixed matrix",           42, (int)dotProduct(vector(Type.indexedUnbound), matrix(Type.mapped, 2)));
-        
+
         // Test the unoptimized path by joining in another dimension
         Tensor unitJ = Tensor.Builder.of(new TensorType.Builder().mapped("j").build()).cell().label("j", 0).value(1).build();
         Tensor unitK = Tensor.Builder.of(new TensorType.Builder().mapped("k").build()).cell().label("k", 0).value(1).build();
@@ -138,7 +138,7 @@ public class TensorTestCase {
         Tensor matrixInKSpace = matrix(Type.mapped, 2).get(0).multiply(unitK);
         assertEquals("Generic computation implementation", 42, (int)dotProduct(vectorInJSpace, Collections.singletonList(matrixInKSpace)));
     }
-    
+
     private double dotProduct(Tensor tensor, List<Tensor> tensors) {
         double sum = 0;
         TensorFunction dotProductFunction = new Reduce(new Join(new ConstantTensor(tensor),
@@ -161,7 +161,7 @@ public class TensorTestCase {
     private Tensor vector(int vectorSize, TensorType.Dimension.Type dimensionType) {
         return vectors(vectorSize, dimensionType, 1).get(0);
     }
-    
+
     /** Create a list of vectors having a single dimension x */
     private List<Tensor> vectors(TensorType.Dimension.Type dimensionType, int vectorCount) {
         return vectors(3, dimensionType, vectorCount);
@@ -179,8 +179,8 @@ public class TensorTestCase {
         }
         return tensors;
     }
-    
-    /** 
+
+    /**
      * Create a matrix of vectors (in dimension i) where each vector has the dimension x.
      * This matrix contains the same vectors as returned by createVectors, in a single list element for convenience.
      */
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java
index fab53218b2c..f11c068bd74 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/JoinTestCase.java
@@ -10,12 +10,12 @@ import static org.junit.Assert.assertEquals;
  * @author bratseth
  */
 public class JoinTestCase {
-    
+
     /** Test the indexed subspace join optimization */
     @Test
     public void testJoinIndexedSubspace() {
         Tensor t1, t2;
-        
+
         t1 = Tensor.from("tensor(x[]):{{x:0}:1.0,{x:1}:2.0}");
         t2 = Tensor.from("tensor(x[],y[],z[]):{{x:0,y:0,z:0}:6,{x:0,y:1,z:0}:0.0,{x:1,y:0,z:0}:10,{x:1,y:1,z:0}:0.0}");
         assertEquals(Tensor.from("tensor(x[],y[],z[]):{{x:0,y:0,z:0}:6,{x:0,y:1,z:0}:0.0,{x:1,y:0,z:0}:20.0,{x:1,y:1,z:0}:0.0}"),
@@ -34,10 +34,10 @@ public class JoinTestCase {
         assertEquals(Tensor.from("tensor(x[],y[],z[]):{{x:0,y:0,z:0}:6,{x:0,y:1,z:0}:0.0,{x:1,y:0,z:0}:10.0,{x:1,y:1,z:0}:0.0}"),
                      t2.divide(t1));
     }
-    
+
     @Test
     public void testGeneralJoin() {
-        assertEquals(Tensor.from("tensor(x[],y[]):{ {x:0,y:0}:1, {x:1,y:0}:2, {x:2,y:0}:3 }"), 
+        assertEquals(Tensor.from("tensor(x[],y[]):{ {x:0,y:0}:1, {x:1,y:0}:2, {x:2,y:0}:3 }"),
                      Tensor.from("tensor(x[]):{ {x:0}:2, {x:1}:4, {x:2}:6 }")
                                  .divide(Tensor.from("tensor(y[]):{{y:0}:2}")));
 
@@ -45,5 +45,5 @@ public class JoinTestCase {
                      Tensor.from("tensor(x[],y[]):{ {x:0,y:0}:6, {x:1,y:0}:8, {x:0,y:1}:20, {x:1,y:1}:24 }")
                              .divide(Tensor.from("tensor(y[],z[]):{ {y:0,z:0}:2, {y:1,z:0}:4, {y:2,z:0}:6 }")));
     }
-    
+
 }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java
index 8a58cb0bbed..55069eaced7 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/TensorFunctionTestCase.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals;
 
 /**
  * Tests translation of composite to primitive tensor function translation.
- * 
+ *
  * @author bratseth
  */
 public class TensorFunctionTestCase {
@@ -16,12 +16,12 @@ public class TensorFunctionTestCase {
     public void testTranslation() {
         assertTranslated("join({{x:1}:1.0}, reduce({{x:1}:1.0}, sum, x), f(a,b)(a / b))",
                          new L1Normalize(new ConstantTensor("{{x:1}:1.0}"), "x"));
-        assertTranslated("tensor(x[2],y[3],z[4])((x==y)*(y==z))", 
+        assertTranslated("tensor(x[2],y[3],z[4])((x==y)*(y==z))",
                          new Diag(new TensorType.Builder().indexed("y",3).indexed("x",2).indexed("z",4).build()));
         assertTranslated("join({{x:1}:1.0,{x:3}:5.0,{x:9}:3.0}, reduce({{x:1}:1.0,{x:3}:5.0,{x:9}:3.0}, max, x), f(a,b)(a==b))",
                          new Argmax(new ConstantTensor("{ {x:1}:1, {x:3}:5, {x:9}:3 }"), "x"));
     }
-    
+
     private void assertTranslated(String expectedTranslation, TensorFunction inputFunction) {
         assertEquals(expectedTranslation, inputFunction.toPrimitive().toString());
     }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
index 349309a5052..15a872e439f 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
@@ -30,7 +30,7 @@ public class DenseBinaryFormatTestCase {
         assertSerialization("tensor(x[],y[]):{{x:0,y:0}:2.0, {x:0,y:1}:3.0, {x:1,y:0}:4.0, {x:1,y:1}:5.0}");
         assertSerialization("tensor(x[1],y[2],z[3]):{{y:0,x:0,z:0}:2.0}");
     }
-    
+
     @Test
     public void testSerializationToSeparateType() {
         assertSerialization(Tensor.from("tensor(x[1],y[1]):{{x:0,y:0}:2.0}"), TensorType.fromSpec("tensor(x[],y[])"));
@@ -64,7 +64,7 @@ public class DenseBinaryFormatTestCase {
     private void assertSerialization(Tensor tensor) {
         assertSerialization(tensor, tensor.type());
     }
-    
+
     private void assertSerialization(Tensor tensor, TensorType expectedType) {
         byte[] encodedTensor = TypedBinaryFormat.encode(tensor);
         Tensor decodedTensor = TypedBinaryFormat.decode(Optional.of(expectedType), GrowableByteBuffer.wrap(encodedTensor));
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/MixedBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/MixedBinaryFormatTestCase.java
index b1d7d797b3e..33dfca017f4 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/MixedBinaryFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/MixedBinaryFormatTestCase.java
@@ -84,7 +84,7 @@ public class MixedBinaryFormatTestCase {
     private void assertSerialization(Tensor tensor) {
         assertSerialization(tensor, tensor.type());
     }
-    
+
     private void assertSerialization(Tensor tensor, TensorType expectedType) {
         byte[] encodedTensor = TypedBinaryFormat.encode(tensor);
         Tensor decodedTensor = TypedBinaryFormat.decode(Optional.of(expectedType), GrowableByteBuffer.wrap(encodedTensor));
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
index 68bf59e3ed9..f002637847b 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
@@ -50,7 +50,7 @@ public class SerializationTestCase {
             JsonNode node = mapper.readTree(test);
             if (node.has("tensor") && node.has("binary")) {
                 System.out.println("Running test: " + test);
-                
+
                 Tensor tensor = buildTensor(node.get("tensor"));
                 String spec = getSpec(node.get("tensor"));
                 byte[] encodedTensor = TypedBinaryFormat.encode(tensor);
@@ -123,7 +123,7 @@ public class SerializationTestCase {
     private byte[] getBytes(String binaryRepresentation) {
         return parseHexValue(binaryRepresentation.substring(2));
     }
-    
+
     private byte[] parseHexValue(String s) {
         final int len = s.length();
         byte[] bytes = new byte[len/2];
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
index d17148cf8dc..f895b64379b 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
@@ -65,7 +65,7 @@ public class SparseBinaryFormatTestCase {
 
     private void assertSerialization(Tensor tensor, TensorType expectedType) {
         byte[] encodedTensor = TypedBinaryFormat.encode(tensor);
-        Tensor decodedTensor = TypedBinaryFormat.decode(Optional.of(expectedType), 
+        Tensor decodedTensor = TypedBinaryFormat.decode(Optional.of(expectedType),
                                                         GrowableByteBuffer.wrap(encodedTensor));
         assertEquals(tensor, decodedTensor);
     }