summaryrefslogtreecommitdiffstats
path: root/model-integration/src
diff options
context:
space:
mode:
authorLester Solbakken <lesters@oath.com>2022-04-05 13:07:27 +0200
committerLester Solbakken <lesters@oath.com>2022-04-05 13:07:27 +0200
commit869b45ec6ea7b618c7d9515cb70cac71f3df3d2b (patch)
tree0ff576649c5a74c363c706b6f2c34b40961f6aa8 /model-integration/src
parenta0b02d8bd00bf8d7f3410cbf47ae432770546883 (diff)
Accept default values for URL types in config
Diffstat (limited to 'model-integration/src')
-rw-r--r--model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java1
-rw-r--r--model-integration/src/main/resources/configdefinitions/embedding.bert-base-embedder.def (renamed from model-integration/src/main/resources/configdefinitions/bert-base-embedder.def)8
-rw-r--r--model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java1
3 files changed, 6 insertions, 4 deletions
diff --git a/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java b/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
index 42e3d653359..1831903d626 100644
--- a/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
+++ b/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
@@ -2,6 +2,7 @@ package ai.vespa.embedding;
import ai.vespa.modelintegration.evaluator.OnnxEvaluator;
import ai.vespa.modelintegration.evaluator.OnnxEvaluatorOptions;
+import com.yahoo.embedding.BertBaseEmbedderConfig;
import com.yahoo.component.annotation.Inject;
import com.yahoo.language.process.Embedder;
import com.yahoo.language.wordpiece.WordPieceEmbedder;
diff --git a/model-integration/src/main/resources/configdefinitions/bert-base-embedder.def b/model-integration/src/main/resources/configdefinitions/embedding.bert-base-embedder.def
index 7e3ff151466..a37599de411 100644
--- a/model-integration/src/main/resources/configdefinitions/bert-base-embedder.def
+++ b/model-integration/src/main/resources/configdefinitions/embedding.bert-base-embedder.def
@@ -1,7 +1,8 @@
-package=ai.vespa.embedding
+
+namespace=embedding
# Transformer model settings
-transformerModelUrl url
+transformerModelUrl url default=https://data.vespa.oath.cloud/onnx_models/sentence_all_MiniLM_L6_v2.onnx
# Max length of token sequence model can handle
transformerMaxTokens int default=384
@@ -23,5 +24,4 @@ onnxInterOpThreads int default=1
onnxIntraOpThreads int default=-4 # n=number of threads -> n<0: CPUs/(-n), n==0: CPUs, n>0: n
# Settings for wordpiece tokenizer
-tokenizerVocabUrl url
-
+tokenizerVocabUrl url default=https://data.vespa.oath.cloud/onnx_models/bert-base-uncased-vocab.txt
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 0ecc78f7668..464e5941e89 100644
--- a/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java
+++ b/model-integration/src/test/java/ai/vespa/embedding/BertBaseEmbedderTest.java
@@ -2,6 +2,7 @@ package ai.vespa.embedding;
import ai.vespa.modelintegration.evaluator.OnnxEvaluator;
import com.yahoo.config.UrlReference;
+import com.yahoo.embedding.BertBaseEmbedderConfig;
import com.yahoo.tensor.Tensor;
import com.yahoo.tensor.TensorType;
import org.junit.Test;