diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-11-22 09:38:17 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-11-22 09:38:17 +0100 |
commit | 973c96fd33e97ad4f24d98ab3b7ed8dd4c34a8c3 (patch) | |
tree | 0ee26132f5cc8b959dc6166a0e340fe36fc14e46 /model-integration | |
parent | 122d3580b76f97beffd205f9140bf27f0248399f (diff) |
Restore old package name
Diffstat (limited to 'model-integration')
19 files changed, 57 insertions, 57 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java index 81d0753ea4b..caf66baef66 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java @@ -3,19 +3,19 @@ package ai.vespa.rankingexpression.importer.onnx; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.IntermediateGraph; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Argument; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.ConcatV2; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Constant; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Identity; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.IntermediateOperation; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Join; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Map; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.MatMul; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.NoOp; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Reshape; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Shape; +import com.yahoo.searchlib.rankingexpression.integration.ml.IntermediateGraph; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Argument; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.ConcatV2; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Constant; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Identity; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.IntermediateOperation; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Join; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Map; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.MatMul; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.NoOp; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Reshape; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Shape; import com.yahoo.tensor.functions.ScalarFunctions; import onnx.Onnx; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java index 0418581d7b2..cb591475d40 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java @@ -2,9 +2,9 @@ package ai.vespa.rankingexpression.importer.onnx; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.IntermediateGraph; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ModelImporter; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.IntermediateGraph; +import com.yahoo.searchlib.rankingexpression.integration.ml.ModelImporter; import onnx.Onnx; import java.io.File; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TensorConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TensorConverter.java index 6dd33c79852..a267411e8a9 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TensorConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TensorConverter.java @@ -3,7 +3,7 @@ package ai.vespa.rankingexpression.importer.onnx; import com.google.protobuf.ByteString; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; import onnx.Onnx; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TypeConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TypeConverter.java index 43ceaa747b7..3da7477fcef 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TypeConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/TypeConverter.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.onnx; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; import com.yahoo.tensor.TensorType; import onnx.Onnx; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/AttributeConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/AttributeConverter.java index 73310c78cab..978fc3ecf60 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/AttributeConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/AttributeConverter.java @@ -5,8 +5,8 @@ import com.yahoo.searchlib.rankingexpression.evaluation.BooleanValue; import com.yahoo.searchlib.rankingexpression.evaluation.DoubleValue; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; import com.yahoo.searchlib.rankingexpression.evaluation.Value; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.IntermediateOperation; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.IntermediateOperation; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.NodeDef; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/GraphImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/GraphImporter.java index c012bc3c54f..e264b0daf6e 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/GraphImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/GraphImporter.java @@ -3,27 +3,27 @@ package ai.vespa.rankingexpression.importer.tensorflow; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.IntermediateGraph; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Argument; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.ConcatV2; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Const; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Constant; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.ExpandDims; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Identity; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.IntermediateOperation; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Join; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Map; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.MatMul; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Mean; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Merge; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.NoOp; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.PlaceholderWithDefault; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Reshape; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Select; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Shape; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Squeeze; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.operations.Switch; +import com.yahoo.searchlib.rankingexpression.integration.ml.IntermediateGraph; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Argument; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.ConcatV2; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Const; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Constant; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.ExpandDims; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Identity; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.IntermediateOperation; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Join; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Map; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.MatMul; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Mean; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Merge; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.NoOp; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.PlaceholderWithDefault; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Reshape; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Select; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Shape; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Squeeze; +import com.yahoo.searchlib.rankingexpression.integration.ml.operations.Switch; import com.yahoo.tensor.functions.ScalarFunctions; import org.tensorflow.SavedModelBundle; import org.tensorflow.Session; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorConverter.java index 4e67286ef09..80c23f2af69 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorConverter.java @@ -1,7 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.rankingexpression.importer.tensorflow; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowImporter.java index f8a25e4d94c..a8b453b7a1c 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowImporter.java @@ -1,9 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.rankingexpression.importer.tensorflow; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.IntermediateGraph; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ModelImporter; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.IntermediateGraph; +import com.yahoo.searchlib.rankingexpression.integration.ml.ModelImporter; import org.tensorflow.SavedModelBundle; import java.io.File; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TypeConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TypeConverter.java index a5a506fdb6d..d2430d34711 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TypeConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/TypeConverter.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.tensorflow; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; import com.yahoo.tensor.TensorType; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.NodeDef; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java index b777ee07e58..c6bc889053a 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java @@ -1,7 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.rankingexpression.importer.tensorflow; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.OrderedTensorType; +import com.yahoo.searchlib.rankingexpression.integration.ml.OrderedTensorType; import com.yahoo.tensor.serialization.JsonFormat; import com.yahoo.yolean.Exceptions; import org.tensorflow.SavedModelBundle; diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImporter.java index e87dd265d50..35895995d3b 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImporter.java @@ -2,8 +2,8 @@ package ai.vespa.rankingexpression.importer.xgboost; import com.yahoo.searchlib.rankingexpression.RankingExpression; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ModelImporter; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ModelImporter; import com.yahoo.searchlib.rankingexpression.parser.ParseException; import java.io.File; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxMnistSoftmaxImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxMnistSoftmaxImportTestCase.java index a71d7a42551..d86e7d6dd8e 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxMnistSoftmaxImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/onnx/OnnxMnistSoftmaxImportTestCase.java @@ -6,7 +6,7 @@ import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.evaluation.Context; import com.yahoo.searchlib.rankingexpression.evaluation.MapContext; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import ai.vespa.rankingexpression.importer.tensorflow.TensorFlowImporter; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BatchNormImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BatchNormImportTestCase.java index acd649d985b..d112a3fa9f2 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BatchNormImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BatchNormImportTestCase.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.tensorflow; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BlogEvaluationBenchmark.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BlogEvaluationBenchmark.java index a878b284b2c..fa89e060006 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BlogEvaluationBenchmark.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/BlogEvaluationBenchmark.java @@ -7,7 +7,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.ContextIndex; import com.yahoo.searchlib.rankingexpression.evaluation.ExpressionOptimizer; import com.yahoo.searchlib.rankingexpression.evaluation.OptimizationReport; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import com.yahoo.searchlib.rankingexpression.parser.ParseException; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/DropoutImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/DropoutImportTestCase.java index 6e58761e5ce..b3559a0a5f6 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/DropoutImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/DropoutImportTestCase.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.tensorflow; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import com.yahoo.tensor.TensorType; import org.junit.Assert; import org.junit.Test; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/MnistImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/MnistImportTestCase.java index b338f46fb4d..7e717c204f8 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/MnistImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/MnistImportTestCase.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.tensorflow; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import org.junit.Assert; import org.junit.Test; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowMnistSoftmaxImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowMnistSoftmaxImportTestCase.java index 7e8cbef8ada..f98b37b7e55 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowMnistSoftmaxImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TensorFlowMnistSoftmaxImportTestCase.java @@ -2,7 +2,7 @@ package ai.vespa.rankingexpression.importer.tensorflow; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import org.junit.Assert; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TestableTensorFlowModel.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TestableTensorFlowModel.java index dbed537885e..faa2c7acc18 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TestableTensorFlowModel.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/tensorflow/TestableTensorFlowModel.java @@ -7,7 +7,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.ContextIndex; import com.yahoo.searchlib.rankingexpression.evaluation.ExpressionOptimizer; import com.yahoo.searchlib.rankingexpression.evaluation.MapContext; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImportTestCase.java index 48c7f5bee19..30b50c025d0 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/xgboost/XGBoostImportTestCase.java @@ -1,7 +1,7 @@ package ai.vespa.rankingexpression.importer.xgboost; import com.yahoo.searchlib.rankingexpression.RankingExpression; -import com.yahoo.searchlib.rankingexpression.integration.ml.importer.ImportedModel; +import com.yahoo.searchlib.rankingexpression.integration.ml.ImportedModel; import org.junit.Test; import static org.junit.Assert.assertEquals; |