diff options
Diffstat (limited to 'model-evaluation/src/test')
15 files changed, 25 insertions, 21 deletions
diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java index 716965784e3..a823f16d727 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java @@ -1,11 +1,25 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.models.evaluation; +import com.yahoo.config.subscription.ConfigGetter; +import com.yahoo.config.subscription.FileSource; +import com.yahoo.path.Path; +import com.yahoo.searchlib.rankingexpression.ExpressionFunction; +import com.yahoo.tensor.Tensor; +import com.yahoo.tensor.TensorType; +import com.yahoo.vespa.config.search.RankProfilesConfig; +import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import org.junit.Test; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Logger; import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Tests instantiating models from rank-profiles configs. diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java index 0a400f7126f..63e17e37bde 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java @@ -3,19 +3,15 @@ package ai.vespa.models.evaluation; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.config.subscription.FileSource; -import com.yahoo.io.GrowableByteBuffer; -import com.yahoo.io.IOUtils; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; -import com.yahoo.tensor.serialization.TypedBinaryFormat; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; -import java.io.IOException; +import java.util.HashMap; import java.util.Map; -import java.util.Optional; import java.util.logging.Logger; import static org.junit.Assert.assertEquals; @@ -42,8 +38,7 @@ public class ModelTester { RankProfilesConfig.class).getConfig(""); RankingConstantsConfig constantsConfig = new ConfigGetter<>(new FileSource(configDir.append("ranking-constants.cfg").toFile()), RankingConstantsConfig.class).getConfig(""); - return new RankProfilesConfigImporterWithMockedConstants(Path.fromString(path).append("constants")) - .importFrom(config, constantsConfig); + return new RankProfilesConfigImporterWithMockedConstants().importFrom(config, constantsConfig); } public void assertFunction(String name, String expression, Model model) { @@ -66,23 +61,15 @@ public class ModelTester { private static final Logger log = Logger.getLogger(RankProfilesConfigImporterWithMockedConstants.class.getName()); - private final Path constantsPath; - - public RankProfilesConfigImporterWithMockedConstants(Path constantsPath) { - this.constantsPath = constantsPath; - } + Map<String, Tensor> constants = new HashMap<>(); @Override - protected Tensor readTensorFromFile(String name, TensorType type, String fileReference) { - try { - return TypedBinaryFormat.decode(Optional.of(type), - GrowableByteBuffer.wrap(IOUtils.readFileBytes(constantsPath.append(name).toFile()))); - } - catch (IOException e) { - log.warning("Missing a mocked tensor constant for '" + name + "': " + e.getMessage() + - ". Returning an empty tensor"); + Tensor readTensorFromFile(String name, TensorType type, String fileReference) { + if ( ! constants.containsKey(name)) { + log.warning("Missing a mocked tensor constant for '" + name + "': Returning an empty tensor"); return Tensor.from(type, "{}"); } + return constants.get(name); } } diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java index 0708d872ff6..d94e5b2af1b 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java @@ -9,6 +9,8 @@ import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import org.junit.Test; +import java.io.File; + import static org.junit.Assert.assertEquals; /** diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java index 20abd9c0fb0..210ffb823b2 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java @@ -3,6 +3,8 @@ package ai.vespa.models.evaluation; import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertEquals; /** diff --git a/model-evaluation/src/test/resources/config/models/constants/README b/model-evaluation/src/test/resources/config/models/constants/README deleted file mode 100644 index 4a274aa95c8..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/README +++ /dev/null @@ -1 +0,0 @@ -These constants was created by writing TypedBinaryFormat.encode(tensor) on each large constant produced by these models. diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read Binary files differdeleted file mode 100644 index bac75f7b1e7..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read Binary files differdeleted file mode 100644 index bd3f05be826..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read Binary files differdeleted file mode 100644 index fca7c76df3f..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read Binary files differdeleted file mode 100644 index 396dea8f4bc..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read Binary files differdeleted file mode 100644 index 42f85478c10..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read Binary files differdeleted file mode 100644 index a3cc7d765f6..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable Binary files differdeleted file mode 100644 index e768328bff5..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1 b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1 Binary files differdeleted file mode 100644 index 4fa0eadb0d3..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1 +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read Binary files differdeleted file mode 100644 index 5cc9575b971..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read +++ /dev/null diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read Binary files differdeleted file mode 100644 index 70a6fd42c91..00000000000 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read +++ /dev/null |