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

Jump to bottom

Avoid LruCache in Tiktoken when cacheSize specified is 0 #7016

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Avoid LruCache in Tiktoken when cacheSize specified is 0 #7016

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
27 changes: 17 additions & 10 deletions src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public sealed class Tiktoken : Model
{
private readonly Dictionary<ReadOnlyMemory<byte>, int> _encoder = null!;
private readonly IReadOnlyDictionary<int, byte[]> _decoder = null!;
private readonly LruCache<string, int[]> _cache;
private readonly LruCache<string, int[]>? _cache;
private readonly IReadOnlyDictionary<string, int>? _specialTokensEncoder;
private readonly Dictionary<int, string>? _specialTokensDecoder;
private readonly Dictionary<string, int> _vocab = null!;
Expand Down Expand Up @@ -96,7 +96,14 @@ private Tiktoken(Stream tikTokenBpeFileStream, IReadOnlyDictionary<string, int>?

private Tiktoken(int cacheSize)
{
_cache = new LruCache<string, int[]>(cacheSize);
if (cacheSize < 0)
{
throw new ArgumentOutOfRangeException(nameof(cacheSize));
}
else if (cacheSize > 0)
{
_cache = new LruCache<string, int[]>(cacheSize);
}
}

/// <summary>
Expand Down Expand Up @@ -198,7 +205,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
throw new InvalidOperationException($"The special token {sequence} doesn't exist in the tokenizer");
}

if (_cache.Lookup(sequence, out int[] ids))
if (_cache?.Lookup(sequence, out int[] ids) is true)
{
tokens = new Token[ids.Length];
tokens[0] = new Token(ids[0], sequence, (0, sequence.Length));
Expand All @@ -222,7 +229,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok

int[] encodedIds = BytePairEncoder.BytePairEncode(arrayPoolArray.AsMemory(0, encodedLength), _encoder);
Debug.Assert(encodedIds.Length > 0);
_cache.Add(sequence, encodedIds);
_cache?.Add(sequence, encodedIds);

tokens = new Token[encodedIds.Length];
tokens[0] = new Token(encodedIds[0], sequence, (0, sequence.Length));
Expand Down Expand Up @@ -259,7 +266,7 @@ public override void TokenizeToIds(string sequence, bool isSpecialToken, IList<i
return;
}

if (_cache.Lookup(sequence, out int[] tokenIds))
if (_cache?.Lookup(sequence, out int[] tokenIds) is true)
{
accumulatedIds.AddRange(tokenIds);
return;
Expand All @@ -275,7 +282,7 @@ public override void TokenizeToIds(string sequence, bool isSpecialToken, IList<i
int encodedLength = GetUtf8Bytes(sequence.AsSpan(), arrayPoolArray);

int[] encodedIds = BytePairEncoder.BytePairEncode(arrayPoolArray.AsMemory(0, encodedLength), _encoder);
_cache.Add(sequence, encodedIds);
_cache?.Add(sequence, encodedIds);

accumulatedIds.AddRange(encodedIds);

Expand All @@ -301,7 +308,7 @@ public override int CountTokens(string sequence, bool isSpecialToken)
return _specialTokensEncoder.TryGetValue(sequence, out _) ? 1 : 0;
}

if (_cache.Lookup(sequence, out int[] ids))
if (_cache?.Lookup(sequence, out int[] ids) is true)
{
return ids.Length;
}
Expand All @@ -315,7 +322,7 @@ public override int CountTokens(string sequence, bool isSpecialToken)
int encodedLength = GetUtf8Bytes(sequence.AsSpan(), arrayPoolArray);

int[] encodedIds = BytePairEncoder.BytePairEncode(arrayPoolArray.AsMemory(0, encodedLength), _encoder);
_cache.Add(sequence, encodedIds);
_cache?.Add(sequence, encodedIds);

ArrayPool<byte>.Shared.Return(arrayPoolArray);
return encodedIds.Length;
Expand Down Expand Up @@ -346,7 +353,7 @@ public override int CountTokens(string sequence, bool isSpecialToken)
return specialTokenId;
}

if (_cache.Lookup(token, out int[] ids))
if (_cache?.Lookup(token, out int[] ids) is true)
{
if (ids.Length == 1)
{
Expand All @@ -367,7 +374,7 @@ public override int CountTokens(string sequence, bool isSpecialToken)
int encodedLength = GetUtf8Bytes(token.AsSpan(), arrayPoolArray);

int[] idsToCache = BytePairEncoder.BytePairEncode(arrayPoolArray.AsMemory(0, encodedLength), _encoder);
_cache.Add(token, idsToCache);
_cache?.Add(token, idsToCache);

if (idsToCache.Length == 1)
{
Expand Down