diff options
| -rw-r--r-- | config-lib/abi-spec.json | 3 | ||||
| -rw-r--r-- | config-lib/src/main/java/com/yahoo/config/ModelReference.java | 15 | ||||
| -rw-r--r-- | model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java | 4 |
3 files changed, 2 insertions, 20 deletions
diff --git a/config-lib/abi-spec.json b/config-lib/abi-spec.json index b219e58d99f..573a8a24e0c 100644 --- a/config-lib/abi-spec.json +++ b/config-lib/abi-spec.json @@ -347,9 +347,6 @@ "public boolean equals(java.lang.Object)", "public int hashCode()", "public java.lang.String toString()", - "public static com.yahoo.config.ModelReference fromModelId(java.lang.String)", - "public static com.yahoo.config.ModelReference fromUrl(java.lang.String)", - "public static com.yahoo.config.ModelReference fromPath(java.lang.String)", "public static com.yahoo.config.ModelReference valueOf(java.nio.file.Path)", "public static com.yahoo.config.ModelReference valueOf(java.lang.String)" ], diff --git a/config-lib/src/main/java/com/yahoo/config/ModelReference.java b/config-lib/src/main/java/com/yahoo/config/ModelReference.java index ecee42225db..f3adfbfb531 100644 --- a/config-lib/src/main/java/com/yahoo/config/ModelReference.java +++ b/config-lib/src/main/java/com/yahoo/config/ModelReference.java @@ -84,21 +84,6 @@ public class ModelReference { path.map(v -> v.value()).orElse("\"\""); } - /** Creates a model reference having a model id only. */ - public static ModelReference fromModelId(String modelId) { - return new ModelReference(Optional.of(modelId), Optional.empty(), Optional.empty()); - } - - /** Creates a model reference having a url only. */ - public static ModelReference fromUrl(String url) { - return new ModelReference(Optional.empty(), Optional.of(new UrlReference(url)), Optional.empty()); - } - - /** Creates a model reference having a path only. */ - public static ModelReference fromPath(String path) { - return new ModelReference(Optional.empty(), Optional.empty(), Optional.of(new FileReference(path))); - } - /** Creates a model reference resolved to a Path to the local file. */ public static ModelReference valueOf(Path path) { return new ModelReference(path); diff --git a/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java b/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java index 82a78115e63..dbcae24b28f 100644 --- a/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java +++ b/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java @@ -23,8 +23,8 @@ public class BertBaseEmbedderTest { assumeTrue(OnnxEvaluator.isRuntimeAvailable(modelPath)); BertBaseEmbedderConfig.Builder builder = new BertBaseEmbedderConfig.Builder(); - builder.tokenizerVocab(ModelReference.fromPath(vocabPath)); - builder.transformerModel(ModelReference.fromPath(modelPath)); + builder.tokenizerVocab(ModelReference.valueOf(vocabPath)); + builder.transformerModel(ModelReference.valueOf(modelPath)); BertBaseEmbedder embedder = new BertBaseEmbedder(builder.build()); TensorType destType = TensorType.fromSpec("tensor<float>(x[7])"); |