Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tokenizer] fix char offset #2137

Merged
merged 1 commit into from
Nov 5, 2022
Merged

[Tokenizer] fix char offset #2137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions extensions/tokenizers/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub extern "system" fn Java_ai_djl_huggingface_tokenizers_jni_TokenizersLibrary_

let input_sequence = tk::InputSequence::from(sequence);
let encoded_input = EncodeInput::Single(input_sequence);
let encoding = tokenizer.encode(encoded_input, add_special_tokens == JNI_TRUE);
let encoding = tokenizer.encode_char_offsets(encoded_input, add_special_tokens == JNI_TRUE);

match encoding {
Ok(output) => to_handle(output),
Expand Down Expand Up @@ -127,7 +127,7 @@ pub extern "system" fn Java_ai_djl_huggingface_tokenizers_jni_TokenizersLibrary_
let input_sequence1 = tk::InputSequence::from(sequence1);
let input_sequence2 = tk::InputSequence::from(sequence2);
let encoded_input = EncodeInput::Dual(input_sequence1, input_sequence2);
let encoding = tokenizer.encode(encoded_input, add_special_tokens == JNI_TRUE);
let encoding = tokenizer.encode_char_offsets(encoded_input, add_special_tokens == JNI_TRUE);

match encoding {
Ok(output) => to_handle(output),
Expand Down Expand Up @@ -160,7 +160,7 @@ pub extern "system" fn Java_ai_djl_huggingface_tokenizers_jni_TokenizersLibrary_

let input_sequence = tk::InputSequence::from(array);
let encoded_input = EncodeInput::from(input_sequence);
let encoding = tokenizer.encode(encoded_input, add_special_tokens == JNI_TRUE);
let encoding = tokenizer.encode_char_offsets(encoded_input, add_special_tokens == JNI_TRUE);

match encoding {
Ok(output) => to_handle(output),
Expand Down Expand Up @@ -192,7 +192,7 @@ pub extern "system" fn Java_ai_djl_huggingface_tokenizers_jni_TokenizersLibrary_
}

let encodings = tokenizer
.encode_batch(array, add_special_tokens == JNI_TRUE)
.encode_batch_char_offsets(array, add_special_tokens == JNI_TRUE)
.unwrap();
let handles = encodings
.into_iter()
Expand Down
29 changes: 27 additions & 2 deletions ...ions/tokenizers/src/test/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public void testTokenizer() throws IOException {
new CharSpan(14, 17),
new CharSpan(18, 21),
new CharSpan(22, 25),
new CharSpan(26, 30),
new CharSpan(31, 32),
new CharSpan(26, 27),
new CharSpan(28, 29),
null
};
int expectedLength = charSpansExpected.length;
Expand Down Expand Up @@ -389,4 +389,29 @@ public void testTruncationAndPaddingForPairInputs() throws IOException {
Assert.assertEquals(encoding.getIds().length, 8);
}
}

@Test
public void testSpecialTokenHandling() throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might not need this test, the test above this already has special characters.

try (HuggingFaceTokenizer tokenizer =
HuggingFaceTokenizer.builder()
.optTokenizerName("distilbert-base-uncased")
.build()) {
String someText = "¥$9";
Encoding encodedText = tokenizer.encode(someText);

CharSpan[] expected =
new CharSpan[] {
new CharSpan(-1, -1),
new CharSpan(0, 1),
new CharSpan(1, 2),
new CharSpan(2, 3),
new CharSpan(-1, -1)
};
CharSpan[] charSpans = encodedText.getCharTokenSpans();
for (int i = 1; i < charSpans.length - 1; i++) {
Assert.assertEquals(expected[i].getStart(), charSpans[i].getStart());
Assert.assertEquals(expected[i].getEnd(), charSpans[i].getEnd());
}
}
}
}