diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-09 20:16:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-09 20:16:11 +0100 |
commit | ba3ac72d3146d9e64a4bf32c993fd4969b272c7d (patch) | |
tree | b9e57f781bde4d962835b4ffdc56a58e5d7585cd /config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java | |
parent | 606bc6b517e09bba9f36a4ef6506a588d1254bd4 (diff) | |
parent | ec1413c6baca2e30bdd732ca8e20a108c9e66852 (diff) |
Merge pull request #24814 from vespa-engine/revert-24813-revert-24773-revert-24760-balder/model-importing-code-in-config-model-3v8.82.24
Revert "Revert "Revert "Balder/model importing code in config model [run-systemtest]"""
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index 1ba8b470891..e676667ae89 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -2,11 +2,6 @@ package com.yahoo.vespa.model; import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter; -import ai.vespa.rankingexpression.importer.lightgbm.LightGBMImporter; -import ai.vespa.rankingexpression.importer.onnx.OnnxImporter; -import ai.vespa.rankingexpression.importer.tensorflow.TensorFlowImporter; -import ai.vespa.rankingexpression.importer.vespa.VespaImporter; -import ai.vespa.rankingexpression.importer.xgboost.XGBoostImporter; import com.yahoo.component.annotation.Inject; import com.yahoo.component.Version; import com.yahoo.component.provider.ComponentRegistry; @@ -61,6 +56,7 @@ public class VespaModelFactory implements ModelFactory { /** Creates a factory for Vespa models for this version of the source */ @Inject public VespaModelFactory(ComponentRegistry<ConfigModelPlugin> pluginRegistry, + ComponentRegistry<MlModelImporter> modelImporters, ComponentRegistry<Validator> additionalValidators, Zone zone) { this.version = new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro); @@ -71,12 +67,7 @@ public class VespaModelFactory implements ModelFactory { } } this.configModelRegistry = new MapConfigModelRegistry(modelBuilders); - this.modelImporters = List.of( - new VespaImporter(), - new OnnxImporter(), - new TensorFlowImporter(), - new XGBoostImporter(), - new LightGBMImporter()); + this.modelImporters = modelImporters.allComponents(); this.zone = zone; this.additionalValidators = List.copyOf(additionalValidators.allComponents()); |