diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-11-26 15:00:16 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-11-26 15:00:16 +0100 |
commit | e3c64c48445d85054292b6fe90c3347d5ec327f2 (patch) | |
tree | 9c4f8509699a74ec614633159d1eb3171482d456 /config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java | |
parent | 04cc3c48130b8397c04335948e5971914b2eaf22 (diff) |
Model the config model view of model-integration
This is to make it clearer that these methods are part
of the config model API.
Diffstat (limited to 'config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java index 862934935e4..9df03f25cb3 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java @@ -3,6 +3,7 @@ package com.yahoo.searchdefinition.processing; import com.google.common.collect.ImmutableList; import com.yahoo.config.application.api.ApplicationPackage; +import com.yahoo.config.model.api.MlModelImporter; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; @@ -11,8 +12,7 @@ import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; -import ai.vespa.rankingexpression.importer.ImportedModels; -import ai.vespa.rankingexpression.importer.ModelImporter; +import com.yahoo.config.model.api.ImportedMlModels; import ai.vespa.rankingexpression.importer.onnx.OnnxImporter; import ai.vespa.rankingexpression.importer.tensorflow.TensorFlowImporter; import ai.vespa.rankingexpression.importer.xgboost.XGBoostImporter; @@ -31,9 +31,9 @@ import static org.junit.Assert.assertEquals; */ class RankProfileSearchFixture { - private final ImmutableList<ModelImporter> importers = ImmutableList.of(new TensorFlowImporter(), - new OnnxImporter(), - new XGBoostImporter()); + private final ImmutableList<MlModelImporter> importers = ImmutableList.of(new TensorFlowImporter(), + new OnnxImporter(), + new XGBoostImporter()); private RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); private final QueryProfileRegistry queryProfileRegistry; private Search search; @@ -92,7 +92,7 @@ class RankProfileSearchFixture { public RankProfile compileRankProfile(String rankProfile, Path applicationDir) { RankProfile compiled = rankProfileRegistry.get(search, rankProfile) .compile(queryProfileRegistry, - new ImportedModels(applicationDir.toFile(), importers)); + new ImportedMlModels(applicationDir.toFile(), importers)); compiledRankProfiles.put(rankProfile, compiled); return compiled; } |