Add Span support in tokenizer's Model abstraction#7035

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

Merged
tarekgh merged 3 commits into from
Mar 1, 2024
Merged

Add Span support in tokenizer's Model abstraction #7035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1074894
Add Span support in tokenizer's Model abstraction
tarekgh Feb 28, 2024
39f36a1
Address the feedback
tarekgh Feb 28, 2024
40a669f
Use stackalloc instead of the ArrayPool
tarekgh Feb 28, 2024
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
122 changes: 71 additions & 51 deletions src/Microsoft.ML.Tokenizers/Model/BPE.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
{
_unknownToken = value;

if (value is null)
if (VocabReverse.TryGetValue(0, out string? v))
{
if (VocabReverse.TryGetValue(0, out string? v))
if (v == value)
{
VocabReverse.Remove(0);
if (_vocab.TryGetValue(v, out int id))
{
_vocab.Remove(v);
}
return;
}

VocabReverse.Remove(0);
_vocab.Remove(new StringSpanOrdinalKey(v));
}
else


if (value is not null)
{
_vocab[value] = 0;
_vocab[new StringSpanOrdinalKey(value)] = 0;
VocabReverse[0] = value;
}
}
Expand All@@ -68,7 +71,6 @@ private set
/// </summary>
public bool FuseUnknownTokens { get; }


/// <summary>
/// Construct a new Bpe model object to use for text encoding.
/// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
ContinuingSubwordPrefix = continuingSubwordPrefix;
EndOfWordSuffix = endOfWordSuffix;

(Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
_vocab = vocab1 ?? new Dictionary<string, int>();
Cache = new Cache<string, Word>();
(Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
_vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
Cache = new StringSpanOrdinalKeyCache<Word>();

VocabReverse = new();

foreach (KeyValuePair<string, int> kvp in Vocab)
foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
{
VocabReverse.Add(kvp.Value, kvp.Key);
VocabReverse.Add(kvp.Value, kvp.Key.Data!);
}

if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
{
unknownToken = unkToken;
}

UnknownToken = unknownToken;
UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
/// <param name="text">The text to split.</param>
/// <param name="isSpecialToken">Indicate if the token is a special token.</param>
/// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

/// <summary>
/// Get the number of tokens that the input text will be encoded to.
/// </summary>
/// <param name="text">The text to encode.</param>
/// <param name="isSpecialToken">Indicate if the token is special token.</param>
/// <returns>The number of tokens that the input text will be encoded to.</returns>
public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

/// <summary>
/// Map the token to encoded Id.
/// </summary>
/// <param name="token">The token to map to the Id.</param>
/// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
/// <returns>The mapped Id of the token.</returns>
public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
{
if (_vocab.TryGetValue(token, out int value))
{
return value;
}

return null;
}
public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

/// <summary>
/// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
/// <summary>
/// Gets the dictionary mapping tokens to Ids.
/// </summary>
public IReadOnlyDictionary<string, int> Vocab => _vocab;
public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

/// Read the given files to extract the vocab and merges
internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
{
Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

return (dic, ConvertMergesToHashmap(merges));
}

/// The vocabulary assigns a number to each token.
private readonly Dictionary<string, int> _vocab;
private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

private Dictionary<string, int>? _vocabOriginal;

/// Contains the mapping between Pairs and their (rank, newId).
internal Dictionary<Pair<int>, (int, int)> Merges { get; }

/// Contains the cache for optimizing the encoding step.
internal Cache<string, Word>? Cache { get; }
internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
return merges;
}

/// Reset the cache.
internal void ClearCache() => Cache?.Clear();

private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

[MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
return s;
}

internal Word MergeWord(string w)
internal Word MergeWord(ReadOnlySpan<char> w)
{
Word word = Word.WithCapacity(w.Length);
(int Id, int Len)? unk = null;
int i = 0;

Span<char> buffer = stackalloc char[256];
scoped ReadOnlySpan<char> s;

while (i < w.Length)
{
int length;
string s;

if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
{
length = 2;
s = w.Substring(i, length);
s = w.Slice(i, 2);
}
else
{
length = 1;
s = CharToString(w[i]);
s = w.Slice(i, 1);
}

// Add the `continuing_subword_prefix` if relevant
if (i > 0 && ContinuingSubwordPrefix is not null)
{
s = $"{ContinuingSubwordPrefix}{s}";
if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
{
ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
}
else
{
#if NETCOREAPP
s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
}
}

// Add the `end_of_word_suffix` if relevant
if (i + length >= w.Length && EndOfWordSuffix is not null)
{
s = $"{s}{EndOfWordSuffix}";
if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
{
s.CopyTo(buffer);
EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
}
else
{
#if NETCOREAPP
s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
}
}

if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
Word word;
if (Cache is not null)
{
if (Cache.TryGet(text, out word))
if (Cache.TryGetValue(text, out word))
{
return WordToTokens(ref word);
}

word = MergeWord(text);
word = MergeWord(text.AsSpan());
Cache.Set(text, word);
}
else
{
word = MergeWord(text);
word = MergeWord(text.AsSpan());
}

return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
return word.SymbolsCount;
}

internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
{
Word word;

if (Cache is not null)
{
if (Cache.TryGet(text, out Word hit))
if (Cache.TryGetValue(text, out Word hit))
{
return WordToIds(ref hit, accumulatedIds);
}

word = MergeWord(text);
Cache.Set(text, word);
Cache.Set(text.ToString(), word);
}
else
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add Span support in tokenizer's Model abstraction#7035

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

 Merged

tarekgh
merged 3 commits into

from

Mar 1, 2024
 Merged


Add Span support in tokenizer's Model abstraction
#7035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1074894

Add Span support in tokenizer's Model abstraction


tarekgh Feb 28, 2024
39f36a1

Address the feedback


tarekgh Feb 28, 2024
40a669f

Use stackalloc instead of the ArrayPool


tarekgh Feb 28, 2024

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


122 changes: 71 additions & 51 deletions
src/Microsoft.ML.Tokenizers/Model/BPE.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
Expand DownExpand Up@@ -34,20 +36,21 @@ private set
 {
 _unknownToken = value;

 if (value is null)
 if (VocabReverse.TryGetValue(0, out string? v))
 {
 if (VocabReverse.TryGetValue(0, out string? v))
 if (v == value)
 {
 VocabReverse.Remove(0);
 if (_vocab.TryGetValue(v, out int id))
 {
 _vocab.Remove(v);
 }
 return;
 }

 VocabReverse.Remove(0);
 _vocab.Remove(new StringSpanOrdinalKey(v));
 }
 else


 if (value is not null)
 {
 _vocab[value] = 0;
 _vocab[new StringSpanOrdinalKey(value)] = 0;
 VocabReverse[0] = value;
 }
 }
Expand All@@ -68,7 +71,6 @@ private set
 /// </summary>
 public bool FuseUnknownTokens { get; }


 /// <summary>
 /// Construct a new Bpe model object to use for text encoding.
 /// </summary>
Expand DownExpand Up@@ -111,23 +113,19 @@ private Bpe(Stream vocabStream, Stream? mergesStream, string? unknownToken, stri
 ContinuingSubwordPrefix = continuingSubwordPrefix;
 EndOfWordSuffix = endOfWordSuffix;

 (Dictionary<string, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<string, int>();
 Cache = new Cache<string, Word>();
 (Dictionary<StringSpanOrdinalKey, int>? vocab1, Vec<(string, string)> merges) = ReadModelData(vocabStream, mergesStream);
 _vocab = vocab1 ?? new Dictionary<StringSpanOrdinalKey, int>();
 Cache = new StringSpanOrdinalKeyCache<Word>();

 VocabReverse = new();

 foreach (KeyValuePair<string, int> kvp in Vocab)
 foreach (KeyValuePair<StringSpanOrdinalKey, int> kvp in _vocab)
 {
 VocabReverse.Add(kvp.Value, kvp.Key);
 VocabReverse.Add(kvp.Value, kvp.Key.Data!);
 }

 if (unknownToken is null && VocabReverse.TryGetValue(0, out string? unkToken))
 {
 unknownToken = unkToken;
 }

 UnknownToken = unknownToken;
 UnknownToken = unknownToken ?? (VocabReverse.TryGetValue(0, out string? unkToken) ? unkToken : null);

 int prefixLen = ContinuingSubwordPrefix is null ? 0 : ContinuingSubwordPrefix.Length;

Expand DownExpand Up@@ -197,31 +195,23 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <param name="text">The text to split.</param>
 /// <param name="isSpecialToken">Indicate if the token is a special token.</param>
 /// <param name="accumulatedIds">The list of accumulated encoded Ids.</param>
 public override void EncodeToIds(string text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);
 public override void EncodeToIds(ReadOnlySpan<char> text, bool isSpecialToken, IList<int> accumulatedIds) => EncodeToIdsWithCache(text, accumulatedIds);

 /// <summary>
 /// Get the number of tokens that the input text will be encoded to.
 /// </summary>
 /// <param name="text">The text to encode.</param>
 /// <param name="isSpecialToken">Indicate if the token is special token.</param>
 /// <returns>The number of tokens that the input text will be encoded to.</returns>
 public override int CountTokens(string text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);
 public override int CountTokens(ReadOnlySpan<char> text, bool isSpecialToken) => EncodeToIdsWithCache(text, null);

 /// <summary>
 /// Map the token to encoded Id.
 /// </summary>
 /// <param name="token">The token to map to the Id.</param>
 /// <param name="considerSpecialTokens">Indicate if want to consider the special tokens during the encoding.</param>
 /// <returns>The mapped Id of the token.</returns>
 public override int? MapTokenToId(string token, bool considerSpecialTokens = true)
 {
 if (_vocab.TryGetValue(token, out int value))
 {
 return value;
 }

 return null;
 }
 public override int? MapTokenToId(ReadOnlySpan<char> token, bool considerSpecialTokens = true) => _vocab.TryGetValue(token, out int value) ? value : null;

 /// <summary>
 /// Map the encoded Id to the token.
Expand All@@ -242,24 +232,27 @@ public override IReadOnlyList<Token> Encode(string text, bool isSpecialToken = f
 /// <summary>
 /// Gets the dictionary mapping tokens to Ids.
 /// </summary>
 public IReadOnlyDictionary<string, int> Vocab => _vocab;
 public IReadOnlyDictionary<string, int> Vocab => _vocabOriginal ??= _vocab.ToDictionary(kvp => kvp.Key.Data!, kvp => kvp.Value);

 /// Read the given files to extract the vocab and merges
 internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 internal static (Dictionary<StringSpanOrdinalKey, int>?, Vec<(string, string)>) ReadModelData(Stream vocab, Stream? merges)
 {
 Dictionary<string, int>? dic = JsonSerializer.Deserialize<Dictionary<string, int>>(vocab) as Dictionary<string, int>;
 JsonSerializerOptions options = new() { Converters = { StringSpanOrdinalKeyConverter.Instance } };
 Dictionary<StringSpanOrdinalKey, int>? dic = JsonSerializer.Deserialize<Dictionary<StringSpanOrdinalKey, int>>(vocab, options) as Dictionary<StringSpanOrdinalKey, int>;

 return (dic, ConvertMergesToHashmap(merges));
 }

 /// The vocabulary assigns a number to each token.
 private readonly Dictionary<string, int> _vocab;
 private readonly Dictionary<StringSpanOrdinalKey, int> _vocab;

 private Dictionary<string, int>? _vocabOriginal;

 /// Contains the mapping between Pairs and their (rank, newId).
 internal Dictionary<Pair<int>, (int, int)> Merges { get; }

 /// Contains the cache for optimizing the encoding step.
 internal Cache<string, Word>? Cache { get; }
 internal StringSpanOrdinalKeyCache<Word>? Cache { get; }

 internal static readonly int DefaultCacheCapacity = 10_000;

Expand DownExpand Up@@ -309,9 +302,6 @@ internal static (Dictionary<string, int>?, Vec<(string, string)>) ReadModelData(
 return merges;
 }

 /// Reset the cache.
 internal void ClearCache() => Cache?.Clear();

 private readonly Dictionary<char, string> _charToString = new Dictionary<char, string>();

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All@@ -327,38 +317,68 @@ internal string CharToString(char c)
 return s;
 }

 internal Word MergeWord(string w)
 internal Word MergeWord(ReadOnlySpan<char> w)
 {
 Word word = Word.WithCapacity(w.Length);
 (int Id, int Len)? unk = null;
 int i = 0;

 Span<char> buffer = stackalloc char[256];
 scoped ReadOnlySpan<char> s;

 while (i < w.Length)
 {
 int length;
 string s;

 if (Char.IsHighSurrogate(w[i]) && i < w.Length - 1 && Char.IsLowSurrogate(w[i + 1]))
 {
 length = 2;
 s = w.Substring(i, length);
 s = w.Slice(i, 2);
 }
 else
 {
 length = 1;
 s = CharToString(w[i]);
 s = w.Slice(i, 1);
 }

 // Add the `continuing_subword_prefix` if relevant
 if (i > 0 && ContinuingSubwordPrefix is not null)
 {
 s = $"{ContinuingSubwordPrefix}{s}";
 if (ContinuingSubwordPrefix.Length + s.Length <= buffer.Length)
 {
 ContinuingSubwordPrefix.AsSpan().CopyTo(buffer);
 s.CopyTo(buffer.Slice(ContinuingSubwordPrefix.Length));
 s = buffer.Slice(0, ContinuingSubwordPrefix.Length + s.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{ContinuingSubwordPrefix}{s}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{ContinuingSubwordPrefix}{s1}".AsSpan();
#endif
 }
 }

 // Add the `end_of_word_suffix` if relevant
 if (i + length >= w.Length && EndOfWordSuffix is not null)
 {
 s = $"{s}{EndOfWordSuffix}";
 if (s.Length + EndOfWordSuffix.Length <= buffer.Length)
 {
 s.CopyTo(buffer);
 EndOfWordSuffix.AsSpan().CopyTo(buffer.Slice(s.Length));
 s = buffer.Slice(0, s.Length + EndOfWordSuffix.Length);
 }
 else
 {
#if NETCOREAPP
 s = $"{s}{EndOfWordSuffix}".AsSpan();
#else
 string s1 = s.Length == 1 ? CharToString(s[0]) : s.ToString();
 s = $"{s1}{EndOfWordSuffix}".AsSpan();
#endif
 }
 }

 if (_vocab.TryGetValue(s, out int id))
Expand DownExpand Up@@ -419,17 +439,17 @@ internal List<Token> EncodeWithCache(string text)
 Word word;
 if (Cache is not null)
 {
 if (Cache.TryGet(text, out word))
 if (Cache.TryGetValue(text, out word))
 {
 return WordToTokens(ref word);
 }

 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 Cache.Set(text, word);
 }
 else
 {
 word = MergeWord(text);
 word = MergeWord(text.AsSpan());
 }

 return WordToTokens(ref word);
Expand All@@ -445,19 +465,19 @@ internal int WordToIds(ref Word word, IList<int>? accumulatedIds)
 return word.SymbolsCount;
 }

 internal int EncodeToIdsWithCache(string text, IList<int>? accumulatedIds)
 internal int EncodeToIdsWithCache(ReadOnlySpan<char> text, IList<int>? accumulatedIds)
 {
 Word word;

 if (Cache is not null)
 {
 if (Cache.TryGet(text, out Word hit))
 if (Cache.TryGetValue(text, out Word hit))
 {
 return WordToIds(ref hit, accumulatedIds);
 }

 word = MergeWord(text);
 Cache.Set(text, word);
 Cache.Set(text.ToString(), word);
 }
 else
 {
Expand Down
Loading