Tweak CreateByModelNameAsync#7015

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 1 commit into from
Feb 20, 2024
Merged

Tweak CreateByModelNameAsync #7015

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
/// </summary>
/// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
/// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
/// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
/// <returns>Map of byte[] to integer token id</returns>
/// <exception cref="InvalidOperationException"></exception>
internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
{
var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
while (true)
{
string? line = useAsync ?
await reader.ReadLineAsync().ConfigureAwait(false) :
await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
reader.ReadLine();
if (string.IsNullOrWhiteSpace(line))
{
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
throw new FormatException($"Invalid format in the BPE encoder file stream");
}

byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
{
byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

encoder[tokenBytes] = rank;
decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
// cache miss
if (_vocab.TryGetValue(sequence, out int mappedId))
{
return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
}

byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down
62 changes: 38 additions & 24 deletions src/Microsoft.ML.Tokenizers/Tokenizer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
/// <param name="modelName">Model name</param>
/// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
/// <param name="normalizer">To normalize the text before tokenization</param>
/// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
/// <returns>The tokenizer</returns>
public static async Task<Tokenizer> CreateByModelNameAsync(
public static Task<Tokenizer> CreateByModelNameAsync(
string modelName,
IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
Normalizer? normalizer = null)
Normalizer? normalizer = null,
CancellationToken cancellationToken = default)
{
ModelEncoding encoder;

if (!_modelToEncoding.TryGetValue(modelName, out encoder))
try
{
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
ModelEncoding encoder;

if (!_modelToEncoding.TryGetValue(modelName, out encoder))
{
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
{
encoder = Encoding;
break;
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
{
encoder = Encoding;
break;
}
}
}
}

if (encoder == ModelEncoding.None)
if (encoder == ModelEncoding.None)
{
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
}

return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
}
catch (Exception ex)
{
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
}

return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
}

private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
/// <param name="modelEncoding">Encoder label</param>
/// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
/// <param name="normalizer">To normalize the text before tokenization</param>
/// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
/// <returns>The tokenizer</returns>
/// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
private static async Task<Tokenizer> CreateByEncoderNameAsync(
private static Task<Tokenizer> CreateByEncoderNameAsync(
ModelEncoding modelEncoding,
IReadOnlyDictionary<string, int>? extraSpecialTokens,
Normalizer? normalizer)
Normalizer? normalizer,
CancellationToken cancellationToken)
{
switch (modelEncoding)
{
case ModelEncoding.Cl100kBase:
var specialTokens = new Dictionary<string, int>
{ { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

case ModelEncoding.P50kBase:
specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

case ModelEncoding.P50kEdit:
specialTokens = new Dictionary<string, int>
{ { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

case ModelEncoding.R50kBase:
specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

case ModelEncoding.GPT2:
specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

default:
Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
/// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
/// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
/// <param name="normalizer">To normalize the text before tokenization</param>
/// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
/// <returns>The tokenizer</returns>
private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
Regex regex,
string mergeableRanksFileUrl,
Dictionary<string, int> specialTokens,
IReadOnlyDictionary<string, int>? extraSpecialTokens,
Normalizer? normalizer)
Normalizer? normalizer,
CancellationToken cancellationToken)
{
if (extraSpecialTokens is not null)
{
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
{
using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
{
cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
}

_tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down
27 changes: 21 additions & 6 deletions src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
internal static class Helpers
{
public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
reader.ReadLineAsync(cancellationToken);

public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
client.GetStreamAsync(url, cancellationToken);

public static byte[] FromBase64String(string base64String, int offset, int length)
{
Span<byte> bytes = stackalloc byte[300];
if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
{
throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
}
return bytes.Slice(0, bytesWritten).ToArray();

byte[] bytes = new byte[decodedLength];
bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
Debug.Assert(success);
Debug.Assert(bytes.Length == bytesWritten);
return bytes;
}

internal static bool TryParseInt32(string s, int offset, out int result)
=> int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
}
}

19 changes: 18 additions & 1 deletion src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
internal static class Helpers
{
public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
return new ValueTask<string>(reader.ReadLineAsync());
}

public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
{
HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
}

public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

// Not support signed number
Expand Down
, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down

, '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
Tweak CreateByModelNameAsync#7015

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 1 commit into

from

Feb 20, 2024
 Merged


Tweak CreateByModelNameAsync
#7015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 8 additions & 5 deletions
src/Microsoft.ML.Tokenizers/Model/Tiktoken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -104,9 +105,11 @@ private Tiktoken(int cacheSize)
 /// </summary>
 /// <param name="tikTokenBpeFileStream">Stream to the BPE rank file</param>
 /// <param name="useAsync">Whether to perform I/O synchronously or asynchronously.</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>Map of byte[] to integer token id</returns>
 /// <exception cref="InvalidOperationException"></exception>
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(Stream tikTokenBpeFileStream, bool useAsync)
 internal static async ValueTask<(Dictionary<ReadOnlyMemory<byte>, int>, Dictionary<string, int>, IReadOnlyDictionary<int, byte[]>)> LoadTikTokenBpeAsync(
 Stream tikTokenBpeFileStream, bool useAsync, CancellationToken cancellationToken = default)
 {
 var encoder = new Dictionary<ReadOnlyMemory<byte>, int>(ReadOnlyMemoryByteComparer.Instance);
 var vocab = new Dictionary<string, int>();
Expand All@@ -119,7 +122,7 @@ private Tiktoken(int cacheSize)
 while (true)
 {
 string? line = useAsync ?
 await reader.ReadLineAsync().ConfigureAwait(false) :
 await Helpers.ReadLineAsync(reader, cancellationToken).ConfigureAwait(false) :
 reader.ReadLine();
 if (string.IsNullOrWhiteSpace(line))
 {
Expand All@@ -136,10 +139,10 @@ await reader.ReadLineAsync().ConfigureAwait(false) :
 throw new FormatException($"Invalid format in the BPE encoder file stream");
 }

 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 if (Helpers.TryParseInt32(line, spaceIndex + 1, out int rank))
 {
 byte[] tokenBytes = Helpers.FromBase64String(line, 0, spaceIndex);

 encoder[tokenBytes] = rank;
 decoder[rank] = tokenBytes;

Expand DownExpand Up@@ -214,7 +217,7 @@ public override IReadOnlyList<Token> Tokenize(string sequence, bool isSpecialTok
 // cache miss
 if (_vocab.TryGetValue(sequence, out int mappedId))
 {
 return new List<Token> { new(mappedId, sequence, (0, sequence.Length)) };
 return new Token[1] { new(mappedId, sequence, (0, sequence.Length)) };
 }

 byte[] arrayPoolArray = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetMaxByteCount(sequence.Length));
Expand Down

62 changes: 38 additions & 24 deletions
src/Microsoft.ML.Tokenizers/Tokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.IO;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
Expand DownExpand Up@@ -346,32 +347,41 @@ private static readonly (string Prefix, ModelEncoding Encoding)[] _modelPrefixTo
 /// <param name="modelName">Model name</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the model</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 public static async Task<Tokenizer> CreateByModelNameAsync(
 public static Task<Tokenizer> CreateByModelNameAsync(
 string modelName,
 IReadOnlyDictionary<string, int>? extraSpecialTokens = null,
 Normalizer? normalizer = null)
 Normalizer? normalizer = null,
 CancellationToken cancellationToken = default)
 {
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 try
 {
 foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 ModelEncoding encoder;

 if (!_modelToEncoding.TryGetValue(modelName, out encoder))
 {
if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
foreach ((string Prefix, ModelEncoding Encoding) in _modelPrefixToEncoding)
 {
 encoder = Encoding;
 break;
 if (modelName.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
 {
 encoder = Encoding;
 break;
 }
 }
 }
 }

 if (encoder == ModelEncoding.None)
 if (encoder == ModelEncoding.None)
 {
 throw new NotImplementedException($"Doesn't support this model [{modelName}]");
 }

 return CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer, cancellationToken);
 }
 catch (Exception ex)
 {
throw new NotImplementedException($"Doesn't support this model [{modelName}]");
return Task.FromException<Tokenizer>(ex);
 }

 return await CreateByEncoderNameAsync(encoder, extraSpecialTokens, normalizer).ConfigureAwait(false);
 }

 private const string Cl100kBaseRegexPattern = @"(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}{1,3}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+";
Expand DownExpand Up@@ -402,36 +412,38 @@ public static async Task<Tokenizer> CreateByModelNameAsync(
 /// <param name="modelEncoding">Encoder label</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 /// <exception cref="NotImplementedException">Throws if the encoder is not supported</exception>
 private static async Task<Tokenizer> CreateByEncoderNameAsync(
 private static Task<Tokenizer> CreateByEncoderNameAsync(
 ModelEncoding modelEncoding,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 switch (modelEncoding)
 {
 case ModelEncoding.Cl100kBase:
 var specialTokens = new Dictionary<string, int>
 { { EndOfText, 100257}, { FimPrefix, 100258}, { FimMiddle, 100259}, { FimSuffix, 100260}, { EndOfPrompt, 100276} };
 return await CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(Cl100kBaseRegex(), Cl100kBaseVocabUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.P50kEdit:
 specialTokens = new Dictionary<string, int>
 { { EndOfText, 50256 }, { FimPrefix, 50281 }, { FimMiddle, 50282 }, { FimSuffix, 50283 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), P50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.R50kBase:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 } };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), R50RanksUrl, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 case ModelEncoding.GPT2:
 specialTokens = new Dictionary<string, int> { { EndOfText, 50256 }, };
 return await CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer).ConfigureAwait(false);
 return CreateTikTokenTokenizerAsync(P50kBaseRegex(), GPT2Url, specialTokens, extraSpecialTokens, normalizer, cancellationToken);

 default:
 Debug.Assert(false, $"Unexpected encoder [{modelEncoding}]");
Expand All@@ -449,13 +461,15 @@ private static async Task<Tokenizer> CreateByEncoderNameAsync(
 /// <param name="specialTokens">Special tokens mapping. This may be mutated by the method.</param>
 /// <param name="extraSpecialTokens">Extra special tokens other than the built-in ones for the encoder</param>
 /// <param name="normalizer">To normalize the text before tokenization</param>
 /// <param name="cancellationToken"><see cref="CancellationToken"/> used to request cancellation of the operation.</param>
 /// <returns>The tokenizer</returns>
 private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(
 Regex regex,
 string mergeableRanksFileUrl,
 Dictionary<string, int> specialTokens,
 IReadOnlyDictionary<string, int>? extraSpecialTokens,
 Normalizer? normalizer)
 Normalizer? normalizer,
 CancellationToken cancellationToken)
 {
 if (extraSpecialTokens is not null)
 {
Expand All@@ -467,9 +481,9 @@ private static async Task<Tokenizer> CreateTikTokenTokenizerAsync(

 if (!_tiktokenCache.TryGetValue(mergeableRanksFileUrl, out (Dictionary<ReadOnlyMemory<byte>, int> encoder, Dictionary<string, int> vocab, IReadOnlyDictionary<int, byte[]> decoder) cache))
 {
 using (Stream stream = await _httpClient.GetStreamAsync(mergeableRanksFileUrl).ConfigureAwait(false))
 using (Stream stream = await Helpers.GetStreamAsync(_httpClient, mergeableRanksFileUrl, cancellationToken).ConfigureAwait(false))
 {
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true).ConfigureAwait(false);
 cache = await Tiktoken.LoadTikTokenBpeAsync(stream, useAsync: true, cancellationToken).ConfigureAwait(false);
 }

 _tiktokenCache.TryAdd(mergeableRanksFileUrl, cache);
Expand Down

27 changes: 21 additions & 6 deletions
src/Microsoft.ML.Tokenizers/Utils/Helpers.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Buffers.Text;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
using System.Threading;
using System.Net.Http;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string?> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken) =>
 reader.ReadLineAsync(cancellationToken);

 public static Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken) =>
 client.GetStreamAsync(url, cancellationToken);

 public static byte[] FromBase64String(string base64String, int offset, int length)
 {
 Span<byte> bytes = stackalloc byte[300];
 if (!Convert.TryFromBase64Chars(base64String.AsSpan().Slice(offset, length), bytes, out int bytesWritten))
 if (!Base64.IsValid(base64String.AsSpan(offset, length), out int decodedLength))
 {
 throw new System.FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 throw new FormatException($"Invalid base64 string '{base64String.Substring(offset, length)}'");
 }
 return bytes.Slice(0, bytesWritten).ToArray();

 byte[] bytes = new byte[decodedLength];
 bool success = Convert.TryFromBase64Chars(base64String.AsSpan(offset, length), bytes, out int bytesWritten);
 Debug.Assert(success);
 Debug.Assert(bytes.Length == bytesWritten);
 return bytes;
 }

 internal static bool TryParseInt32(string s, int offset, out int result)
 => int.TryParse(s.AsSpan().Slice(offset), NumberStyles.None, CultureInfo.InvariantCulture, out result);
 }
}


19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Tokenizers/Utils/Helpers.netstandard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.ML.Tokenizers
{
 internal static class Helpers
 {
 public static ValueTask<string> ReadLineAsync(StreamReader reader, CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
 return new ValueTask<string>(reader.ReadLineAsync());
 }

 public static async Task<Stream> GetStreamAsync(HttpClient client, string url, CancellationToken cancellationToken)
 {
 HttpResponseMessage response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 response.EnsureSuccessStatusCode();
 return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 }

 public static byte[] FromBase64String(string base64String, int offset, int length) => Convert.FromBase64String(base64String.Substring(offset, length));

 // Not support signed number
Expand Down