diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-28 08:48:42 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-28 08:48:42 +0100 |
commit | 4117dff58df12182298efdbd6cc5f2f5f93733cd (patch) | |
tree | 01e2dadb3ce2398c99b37860984e5cc3d83bc706 /model-integration/src/main/java/ai | |
parent | 5271b5d7241aa2aa2538b2072b8cae9b8f3d689a (diff) |
Extend AbstractComponent not AbstractResource
Diffstat (limited to 'model-integration/src/main/java/ai')
3 files changed, 9 insertions, 9 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 b0b4f871163..b40e2b5be72 100644 --- a/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java +++ b/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java @@ -3,9 +3,9 @@ package ai.vespa.embedding; import ai.vespa.modelintegration.evaluator.OnnxEvaluator; import ai.vespa.modelintegration.evaluator.OnnxEvaluatorOptions; import ai.vespa.modelintegration.evaluator.OnnxRuntime; +import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; import com.yahoo.embedding.BertBaseEmbedderConfig; -import com.yahoo.jdisc.AbstractResource; import com.yahoo.language.process.Embedder; import com.yahoo.language.wordpiece.WordPieceEmbedder; import com.yahoo.tensor.IndexedTensor; @@ -30,7 +30,7 @@ import java.util.Map; * * @author lesters */ -public class BertBaseEmbedder extends AbstractResource implements Embedder { +public class BertBaseEmbedder extends AbstractComponent implements Embedder { private final static int TOKEN_CLS = 101; // [CLS] private final static int TOKEN_SEP = 102; // [SEP] @@ -102,7 +102,7 @@ public class BertBaseEmbedder extends AbstractResource implements Embedder { return embedTokens(tokens, type); } - @Override protected void destroy() { evaluator.close(); } + @Override public void deconstruct() { evaluator.close(); } Tensor embedTokens(List<Integer> tokens, TensorType type) { Tensor inputSequence = createTensorRepresentation(tokens, "d1"); diff --git a/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java b/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java index bad4bb5c9b3..9572cfcb0e4 100644 --- a/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java +++ b/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java @@ -4,9 +4,9 @@ import ai.djl.huggingface.tokenizers.Encoding; import ai.djl.huggingface.tokenizers.HuggingFaceTokenizer; import ai.vespa.modelintegration.evaluator.OnnxEvaluator; import ai.vespa.modelintegration.evaluator.OnnxRuntime; +import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; import com.yahoo.embedding.huggingface.HuggingFaceEmbedderConfig; -import com.yahoo.jdisc.AbstractResource; import com.yahoo.language.process.Embedder; import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -public class HuggingFaceEmbedder extends AbstractResource implements Embedder { +public class HuggingFaceEmbedder extends AbstractComponent implements Embedder { private static final Logger LOG = LoggerFactory.getLogger(HuggingFaceEmbedder.class.getName()); @@ -86,7 +86,7 @@ public class HuggingFaceEmbedder extends AbstractResource implements Embedder { return tokenIds; } - @Override protected void destroy() { evaluator.close(); } + @Override public void deconstruct() { evaluator.close(); } public List<Integer> longToInteger(long[] values) { return Arrays.stream(values) diff --git a/model-integration/src/main/java/ai/vespa/llm/Generator.java b/model-integration/src/main/java/ai/vespa/llm/Generator.java index a08e2006e2c..973b5ac2899 100644 --- a/model-integration/src/main/java/ai/vespa/llm/Generator.java +++ b/model-integration/src/main/java/ai/vespa/llm/Generator.java @@ -3,8 +3,8 @@ package ai.vespa.llm; import ai.vespa.modelintegration.evaluator.OnnxEvaluator; import ai.vespa.modelintegration.evaluator.OnnxEvaluatorOptions; import ai.vespa.modelintegration.evaluator.OnnxRuntime; +import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; -import com.yahoo.jdisc.AbstractResource; import com.yahoo.language.process.Embedder; import com.yahoo.language.sentencepiece.SentencePieceEmbedder; import com.yahoo.llm.GeneratorConfig; @@ -27,7 +27,7 @@ import java.util.Map; * * @author lesters */ -public class Generator extends AbstractResource { +public class Generator extends AbstractComponent { private final static int TOKEN_EOS = 1; // end of sequence @@ -101,7 +101,7 @@ public class Generator extends AbstractResource { return generate(prompt, new GeneratorOptions()); } - @Override protected void destroy() { encoder.close(); decoder.close(); } + @Override public void deconstruct() { encoder.close(); decoder.close(); } private String generateNotImplemented(GeneratorOptions options) { throw new UnsupportedOperationException("Search method '" + options.getSearchMethod() + "' is currently not implemented"); |