diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-03-12 15:11:40 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-03-12 15:11:40 +0100 |
commit | 7025f7be4675729db480682ab4d7ddf96580f159 (patch) | |
tree | 254c997a6519b5cfcfdb5f8669eaa71cd9c912eb /vespajlib/src/main/java/com/yahoo/tensor/functions | |
parent | 7288820860bcc2889f4c31ecd258017477f52d1c (diff) |
Tensor API out of beta
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions')
20 files changed, 0 insertions, 53 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmax.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmax.java index 93365d20966..3478061b32c 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmax.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmax.java @@ -1,15 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; - import java.util.Collections; import java.util.List; /** * @author bratseth */ -@Beta public class Argmax extends CompositeTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmin.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmin.java index e598cdf8a98..ba5b3c3e4b2 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmin.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Argmin.java @@ -1,15 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; - import java.util.Collections; import java.util.List; /** * @author bratseth */ -@Beta public class Argmin extends CompositeTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java index bfc0938abcc..2a52df20108 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.tensor.evaluation.EvaluationContext; @@ -13,7 +12,6 @@ import com.yahoo.tensor.evaluation.TypeContext; * * @author bratseth */ -@Beta public abstract class CompositeTensorFunction extends TensorFunction { /** Finds the type this produces by first converting it to a primitive function */ diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java index 13e7c136feb..91ab4f9d046 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Concat.java @@ -1,10 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; -import com.yahoo.lang.MutableInteger; -import com.yahoo.lang.MutableLong; import com.yahoo.tensor.DimensionSizes; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; @@ -26,7 +23,6 @@ import java.util.stream.Collectors; * * @author bratseth */ -@Beta public class Concat extends PrimitiveTensorFunction { private final TensorFunction argumentA, argumentB; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ConstantTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ConstantTensor.java index a43de297b9a..7c1ce068c90 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ConstantTensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ConstantTensor.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.tensor.evaluation.EvaluationContext; @@ -15,7 +14,6 @@ import java.util.List; * * @author bratseth */ -@Beta public class ConstantTensor extends PrimitiveTensorFunction { private final Tensor constant; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Generate.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Generate.java index edfa8253eb9..83cba3479e2 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Generate.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Generate.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.yahoo.tensor.DimensionSizes; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; @@ -19,7 +18,6 @@ import java.util.function.Function; * * @author bratseth */ -@Beta public class Generate extends PrimitiveTensorFunction { private final TensorType type; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java index 54568401adb..be323313369 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.yahoo.tensor.DimensionSizes; @@ -32,7 +31,6 @@ import java.util.function.DoubleBinaryOperator; * * @author bratseth */ -@Beta public class Join extends PrimitiveTensorFunction { private final TensorFunction argumentA, argumentB; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/L1Normalize.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/L1Normalize.java index d7f7ae59d62..7939457a101 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/L1Normalize.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/L1Normalize.java @@ -1,15 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; - import java.util.Collections; import java.util.List; /** * @author bratseth */ -@Beta public class L1Normalize extends CompositeTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/L2Normalize.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/L2Normalize.java index e2c526760bd..40edb8ba23f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/L2Normalize.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/L2Normalize.java @@ -1,15 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; - import java.util.Collections; import java.util.List; /** * @author bratseth */ -@Beta public class L2Normalize extends CompositeTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Map.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Map.java index 4a338e5501e..016c60c6897 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Map.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Map.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorAddress; import com.yahoo.tensor.TensorType; @@ -19,7 +18,6 @@ import java.util.function.DoubleUnaryOperator; * * @author bratseth */ -@Beta public class Map extends PrimitiveTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Matmul.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Matmul.java index 935e4761cfe..7c65afc98f9 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Matmul.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Matmul.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.yahoo.tensor.TensorType; @@ -10,7 +9,6 @@ import java.util.List; /** * @author bratseth */ -@Beta public class Matmul extends CompositeTensorFunction { private final TensorFunction argument1, argument2; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/PrimitiveTensorFunction.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/PrimitiveTensorFunction.java index b7c9a5d2342..e2aae39f11f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/PrimitiveTensorFunction.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/PrimitiveTensorFunction.java @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; -import com.yahoo.tensor.Tensor; - /** * A primitive tensor function is a tensor function which cannot be expressed in terms of other tensor functions. * All tensor implementations must implement all primitive tensor functions. @@ -11,7 +8,6 @@ import com.yahoo.tensor.Tensor; * * @author bratseth */ -@Beta public abstract class PrimitiveTensorFunction extends TensorFunction { } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Random.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Random.java index 1475f7f4ac1..7175c91ed33 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Random.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Random.java @@ -2,12 +2,6 @@ package com.yahoo.tensor.functions; import com.yahoo.tensor.TensorType; -import com.yahoo.tensor.functions.CompositeTensorFunction; -import com.yahoo.tensor.functions.Generate; -import com.yahoo.tensor.functions.PrimitiveTensorFunction; -import com.yahoo.tensor.functions.ScalarFunctions; -import com.yahoo.tensor.functions.TensorFunction; -import com.yahoo.tensor.functions.ToStringContext; import java.util.Collections; import java.util.List; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java index e045effbe7e..332150f957d 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; @@ -25,7 +24,6 @@ import java.util.Set; * * @author bratseth */ -@Beta public class Reduce extends PrimitiveTensorFunction { public enum Aggregator { avg, count, prod, sum, max, min; } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java index af4492ca1e4..53d774de329 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorAddress; @@ -21,7 +20,6 @@ import java.util.Objects; * * @author bratseth */ -@Beta public class Rename extends PrimitiveTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java index 92c1c0307ec..944755c9db2 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import java.util.List; @@ -18,7 +17,6 @@ import java.util.stream.Collectors; * * @author bratseth */ -@Beta public class ScalarFunctions { public static DoubleBinaryOperator add() { return new Add(); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Softmax.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Softmax.java index 32cff5ac84a..bd732cdc11e 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Softmax.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Softmax.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.yahoo.tensor.TensorType; @@ -11,7 +10,6 @@ import java.util.List; /** * @author bratseth */ -@Beta public class Softmax extends CompositeTensorFunction { private final TensorFunction argument; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/TensorFunction.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/TensorFunction.java index e805e9d87bb..1086d91da31 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/TensorFunction.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/TensorFunction.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.tensor.evaluation.EvaluationContext; @@ -17,7 +16,6 @@ import java.util.List; * * @author bratseth */ -@Beta public abstract class TensorFunction { /** Returns the function arguments of this node in the order they are applied */ diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ToStringContext.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ToStringContext.java index 62293a7e0ac..cb7f376c365 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ToStringContext.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ToStringContext.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; - /** * A context which is passed down to all nested functions when returning a string representation. * The default implementation is empty as this library does not in itself have any need for a @@ -10,7 +8,6 @@ import com.google.common.annotations.Beta; * * @author bratseth */ -@Beta public interface ToStringContext { static ToStringContext empty() { return new ToStringContext() {}; } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/XwPlusB.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/XwPlusB.java index 78ff0731566..4c0748ee39a 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/XwPlusB.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/XwPlusB.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.functions; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import java.util.List; @@ -9,7 +8,6 @@ import java.util.List; /** * @author bratseth */ -@Beta public class XwPlusB extends CompositeTensorFunction { private final TensorFunction x, w, b; |