diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2021-08-26 14:45:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 14:45:36 +0200 |
| commit | faf3044824d9500037ad5513c1ca4a37adb3c5f8 (patch) | |
| tree | 6fc192ab74606ee923f1d9b56598b79283f655ca /model-evaluation | |
| parent | ef4b8d2e8a59f0b87fa9640d1fd1e370a181dd19 (diff) | |
Revert "Remove incomplete constructor and unify tests."
Diffstat (limited to 'model-evaluation')
| -rw-r--r-- | model-evaluation/abi-spec.json | 1 | ||||
| -rw-r--r-- | model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/model-evaluation/abi-spec.json b/model-evaluation/abi-spec.json index e54381da394..fac4baf4682 100644 --- a/model-evaluation/abi-spec.json +++ b/model-evaluation/abi-spec.json @@ -68,6 +68,7 @@ ], "methods": [ "public void <init>(com.yahoo.vespa.config.search.RankProfilesConfig, com.yahoo.vespa.config.search.core.RankingConstantsConfig, com.yahoo.vespa.config.search.core.RankingExpressionsConfig, com.yahoo.vespa.config.search.core.OnnxModelsConfig, com.yahoo.filedistribution.fileacquirer.FileAcquirer)", + "public void <init>(com.yahoo.vespa.config.search.RankProfilesConfig, com.yahoo.vespa.config.search.core.RankingConstantsConfig, com.yahoo.vespa.config.search.core.OnnxModelsConfig, com.yahoo.filedistribution.fileacquirer.FileAcquirer)", "public void <init>(java.util.Map)", "public java.util.Map models()", "public varargs ai.vespa.models.evaluation.FunctionEvaluator evaluatorOf(java.lang.String, java.lang.String[])", diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java index 1adfa47def4..2d1a0d069a8 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java @@ -35,6 +35,14 @@ public class ModelsEvaluator extends AbstractComponent { .importFrom(config, constantsConfig, expressionsConfig, onnxModelsConfig)); } + public ModelsEvaluator(RankProfilesConfig config, + RankingConstantsConfig constantsConfig, + OnnxModelsConfig onnxModelsConfig, + FileAcquirer fileAcquirer) { + this(new RankProfilesConfigImporter(fileAcquirer) + .importFrom(config, constantsConfig, new RankingExpressionsConfig.Builder().build(), onnxModelsConfig)); + } + public ModelsEvaluator(Map<String, Model> models) { this.models = ImmutableMap.copyOf(models); } |