aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-09-07 15:31:02 +0200
committerJon Bratseth <bratseth@oath.com>2018-09-07 15:31:02 +0200
commit8f38e82a52561c4d6088f381f3c115c2b2976d60 (patch)
treef520e15c0027730e4d60cc0205796bcd721b27a1 /config-model
parent83fec633592486ef694856ece90eb76469a2a5f6 (diff)
Test with constants
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
index a16c32d47ab..96886941fe1 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
@@ -3,9 +3,12 @@ package com.yahoo.config.model;
import ai.vespa.models.evaluation.Model;
import ai.vespa.models.evaluation.ModelsEvaluator;
+import ai.vespa.models.evaluation.RankProfilesConfigImporter;
import com.yahoo.config.application.api.ApplicationPackage;
import com.yahoo.io.IOUtils;
import com.yahoo.path.Path;
+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 com.yahoo.vespa.model.VespaModel;
@@ -74,7 +77,8 @@ public class ModelEvaluationTest {
assertTrue(modelNames.contains("mnist_softmax"));
assertTrue(modelNames.contains("mnist_softmax_saved"));
- ModelsEvaluator evaluator = new ModelsEvaluator(config, constantsConfig);
+ ModelsEvaluator evaluator = new ModelsEvaluator(new ToleratingMissingConstantFilesRankProfilesConfigImporter()
+ .importFrom(config, constantsConfig));
assertEquals(4, evaluator.models().size());
@@ -107,4 +111,13 @@ public class ModelEvaluationTest {
assertNotNull(tensorflow_mnist_softmax.evaluatorOf("serving_default", "y"));
}
+ // We don't have function file distribution so just return empty tensor constants
+ private static class ToleratingMissingConstantFilesRankProfilesConfigImporter extends RankProfilesConfigImporter {
+
+ protected Tensor readTensorFromFile(String name, TensorType type, String fileReference) {
+ return Tensor.from(type, "{}");
+ }
+
+ }
+
}