diff options
Diffstat (limited to 'config-model/src/test')
5 files changed, 28 insertions, 29 deletions
diff --git a/config-model/src/test/integration/onnx-model/schemas/test.sd b/config-model/src/test/integration/onnx-model/schemas/test.sd index a15714767ba..82872758dd9 100644 --- a/config-model/src/test/integration/onnx-model/schemas/test.sd +++ b/config-model/src/test/integration/onnx-model/schemas/test.sd @@ -21,14 +21,6 @@ search test { output "path/to/output:0": out } - onnx-model another_model { - file: files/model.onnx - input first_input: attribute(document_field) - input "second/input:0": constant(my_constant) - input "third_input": another_function - output "path/to/output:2": out - } - onnx-model dynamic_model { file: files/dynamic_model.onnx input input: my_function @@ -72,6 +64,13 @@ search test { first-phase { expression: 1 } + onnx-model another_model { + file: files/model.onnx + input first_input: attribute(document_field) + input "second/input:0": constant(my_constant) + input "third_input": another_function + output "path/to/output:2": out + } summary-features { onnx(another_model).out onnx("files/summary_model.onnx", "path/to/output:2") diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java index 65f4dab3650..cb57746d82f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java @@ -196,8 +196,8 @@ public class SchemaTestCase { assertTrue(child1profile.constants().containsKey(FeatureNames.asConstantFeature("parent_constant"))); assertNotNull(child1.onnxModels().get("parent_model")); assertNotNull(child1.onnxModels().get("child1_model")); - assertTrue(child1.onnxModels().asMap().containsKey("parent_model")); - assertTrue(child1.onnxModels().asMap().containsKey("child1_model")); + assertTrue(child1.onnxModels().containsKey("parent_model")); + assertTrue(child1.onnxModels().containsKey("child1_model")); assertNotNull(child1.getSummary("parent_summary")); assertNotNull(child1.getSummary("child1_summary")); assertEquals("parent_summary", child1.getSummary("child1_summary").inherited().get().getName()); @@ -231,8 +231,8 @@ public class SchemaTestCase { assertTrue(child2.constants().containsKey(FeatureNames.asConstantFeature("child2_constant"))); assertNotNull(child2.onnxModels().get("parent_model")); assertNotNull(child2.onnxModels().get("child2_model")); - assertTrue(child2.onnxModels().asMap().containsKey("parent_model")); - assertTrue(child2.onnxModels().asMap().containsKey("child2_model")); + assertTrue(child2.onnxModels().containsKey("parent_model")); + assertTrue(child2.onnxModels().containsKey("child2_model")); assertNotNull(child2.getSummary("parent_summary")); assertNotNull(child2.getSummary("child2_summary")); assertEquals("parent_summary", child2.getSummary("child2_summary").inherited().get().getName()); @@ -430,7 +430,7 @@ public class SchemaTestCase { assertNotNull(schema.constants().get(FeatureNames.asConstantFeature("parent_constant"))); assertTrue(schema.constants().containsKey(FeatureNames.asConstantFeature("parent_constant"))); assertNotNull(schema.onnxModels().get("parent_model")); - assertTrue(schema.onnxModels().asMap().containsKey("parent_model")); + assertTrue(schema.onnxModels().containsKey("parent_model")); assertNotNull(schema.getSummary("parent_summary")); assertTrue(schema.getSummaries().containsKey("parent_summary")); assertNotNull(schema.getSummaryField("pf1")); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java index 07e6fbf7b1b..207792ffe06 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java @@ -19,7 +19,7 @@ public class GeminiTestCase extends AbstractExportingTestCase { @Test public void testRanking2() throws IOException, ParseException { DerivedConfiguration c = assertCorrectDeriving("gemini2"); - RawRankProfile p = c.getRankProfileList().getRankProfile("test"); + RawRankProfile p = c.getRankProfileList().getRankProfiles().get("test"); Map<String, String> ranking = removePartKeySuffixes(asMap(p.configProperties())); assertEquals("attribute(right)", resolve(lookup("toplevel", ranking), ranking)); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java index 1c23950d972..6820a8d9678 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java @@ -93,6 +93,18 @@ public class RankingExpressionWithOnnxModelTestCase { assertEquals("path_to_output_2", model.output(2).as()); model = config.model(1); + assertEquals("dynamic_model", model.name()); + assertEquals(1, model.input().size()); + assertEquals(1, model.output().size()); + assertEquals("rankingExpression(my_function)", model.input(0).source()); + + model = config.model(2); + assertEquals("unbound_model", model.name()); + assertEquals(1, model.input().size()); + assertEquals(1, model.output().size()); + assertEquals("rankingExpression(my_function)", model.input(0).source()); + + model = config.model(3); assertEquals("files_model_onnx", model.name()); assertEquals(3, model.input().size()); assertEquals(3, model.output().size()); @@ -104,27 +116,15 @@ public class RankingExpressionWithOnnxModelTestCase { assertEquals("path_to_output_2", model.output(2).as()); assertEquals("files_model_onnx", model.name()); - model = config.model(2); + model = config.model(4); assertEquals("another_model", model.name()); assertEquals("third_input", model.input(2).name()); assertEquals("rankingExpression(another_function)", model.input(2).source()); - model = config.model(3); + model = config.model(5); assertEquals("files_summary_model_onnx", model.name()); assertEquals(3, model.input().size()); assertEquals(3, model.output().size()); - - model = config.model(4); - assertEquals("unbound_model", model.name()); - assertEquals(1, model.input().size()); - assertEquals(1, model.output().size()); - assertEquals("rankingExpression(my_function)", model.input(0).source()); - - model = config.model(5); - assertEquals("dynamic_model", model.name()); - assertEquals(1, model.input().size()); - assertEquals(1, model.output().size()); - assertEquals("rankingExpression(my_function)", model.input(0).source()); } private void assertTransformedFeature(VespaModel model) { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java index e0427d93ee4..4446f01aa95 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java @@ -68,7 +68,7 @@ public class VespaMlModelTestCase { private String rankConfigOf(String rankProfileName, VespaModel model) { StringBuilder b = new StringBuilder(); - RawRankProfile profile = model.rankProfileList().getRankProfile(rankProfileName); + RawRankProfile profile = model.rankProfileList().getRankProfiles().get(rankProfileName); for (var property : profile.configProperties()) b.append(property.getFirst()).append(" : ").append(property.getSecond()).append("\n"); return b.toString(); |