First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh
, '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

First round of perf improvements for tiktoken - #7012

Merged
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf
Feb 18, 2024
Merged

First round of perf improvements for tiktoken#7012
tarekgh merged 1 commit into
dotnet:mainfrom
stephentoub:firstroundtiktokenperf

Conversation

@stephentoub

Copy link
Copy Markdown
Member

Before:

MethodMeanAllocated
CountTokensCached3.677 s4.82 GB
CountTokensUncached2.309 s3.03 GB

After:

MethodMeanAllocated
CountTokensCached2.545 s637.63 MB
CountTokensUncached1.627 s408.34 MB
usingBenchmarkDotNet.Attributes;usingBenchmarkDotNet.Running;usingMicrosoft.ML.Tokenizers;BenchmarkSwitcher.FromAssembly(typeof(Tests).Assembly).Run(args);[MemoryDiagnoser(false)][HideColumns("Job","Error","StdDev","Median","RatioSD")]publicclassTests{privateTokenizer_tokenizer;privatestring[]_tests;[GlobalSetup]publicasyncTaskSetup(){_tokenizer=awaitTokenizer.CreateByModelNameAsync("gpt-3.5-turbo");usingHttpClientclient=newHttpClient();stringtext=string.Concat(Enumerable.Repeat(Poem,8));_tests=newstring[8192];// LruCache sizefor(inti=0;i<_tests.Length;i++){_tests[i]=text.Substring(0,text.Length-i);}}[Benchmark]publicintCountTokensCached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[0]);// reuse same input each time}returnsum;}[Benchmark]publicintCountTokensUncached(){intsum=0;for(inti=0;i<_tests.Length;i++){sum+=_tokenizer.CountTokens(_tests[i]);// change the input to defeat the cache}returnsum;}privateconststringPoem=""" **Paws of Joy** In the morning's tender light, When dew-kissed grass awaits the sun, There stirs a creature, full of might, A friend whose loyalty is never undone. **The Dog**, with eyes like galaxies, Wags its tail, a metronome of glee, Its heart a map of boundless territories, Guiding us through life's vast sea. **Furry sentinels**, guardians of our hearth, They chase their tails in playful mirth, Their barks a symphony of love and merriment, Echoing through the quiet moments we've spent. **Nose to ground**, they follow scents, Unraveling mysteries with fervent intent, From squirrel trails to forgotten dreams, They lead us to places we've never seen. **Golden retrievers** with hearts of gold, **Dachshunds** with determination untold, **Greyhounds** racing against the wind, Each breed a chapter in the story they've pinned. **Labradors** dive into lakes with glee, **Chihuahuas** strut like tiny royalty, **Huskies** howl at the moon's silver glow, And **puppies**, oh sweet puppies, steal the show. Their eyes speak of trust, unwavering and true, Their fur holds secrets whispered by the dew, In their presence, worries seem to fade, As they teach us the art of living unafraid. So here's to the dogs, our steadfast friends, Who mend our hearts and heal life's bends, May their tails forever wag, their noses explore, For in their love, we find solace evermore. """;}

@stephentoub

Copy link
Copy Markdown
MemberAuthor

cc: @tarekgh

while (true)
{
string? line = reader.ReadLine();
string? line = useAsync ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is more of a reliability/scalability fix rather than throughput. The asynchronous creation code path and the synchronous creation code path were both sharing this routine, which resulted in the asynchronous code path doing synchronous I/O (on a network stream). Now the async path does async and the sync path does sync, still sharing this same routine.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why we don't always do async operation here regardless if the code is coming from sync or async callers?

@stephentoubstephentoubFeb 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Because if this is async, a sync caller will be forced to block this thread until the operation completes. The operation could easily require a thread pool thread to complete, yet if this is on a thread pool thread, it'd be blocking one of the very resources needed to make forward progress. The thing less scalable than sync I/O is sync-over-async I/O.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But I thought you wanted to have a constructor which execute async too. no?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I do (a factory method rather than a ctor, but yeah). It will use this.

Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs
Comment threadsrc/Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs
@codecov

codecovBot commented Feb 17, 2024

Copy link
Copy Markdown

Codecov Report

Attention: 67 lines in your changes are missing coverage. Please review.

Comparison is base (4635a86) 68.80% compared to head (ed88215) 68.81%.

Additional details and impacted files
@@ Coverage Diff @@## main #7012 +/- ##
=======================================
Coverage 68.80% 68.81% =======================================
Files 1258 1258 Lines 250652 250643 -9 Branches 25602 25606 +4 =======================================
Hits 172472 172472 + Misses 71548 71546 -2 + Partials 6632 6625 -7 
FlagCoverage Δ
Debug68.81% <70.08%> (+<0.01%)⬆️
production63.28% <70.08%> (+<0.01%)⬆️
test88.44% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...Microsoft.ML.Tokenizers/PreTokenizer/Whitespace.cs100.00% <100.00%> (ø)
src/Microsoft.ML.Tokenizers/TokenizerResult.cs100.00% <100.00%> (ø)
...Microsoft.ML.Tokenizers/Utils/ByteArrayComparer.cs100.00% <100.00%> (+35.29%)⬆️
...rc/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs67.36% <85.71%> (ø)
...rc/Microsoft.ML.Tokenizers/PreTokenizer/Roberta.cs66.66% <80.00%> (+9.52%)⬆️
...ML.Tokenizers/PreTokenizer/TikTokenPreTokenizer.cs90.24% <94.73%> (+12.58%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/BytePairEncoder.cs94.82% <75.00%> (-0.42%)⬇️
...crosoft.ML.Tokenizers/PreTokenizer/PreTokenizer.cs94.44% <90.00%> (+8.73%)⬆️
src/Microsoft.ML.Tokenizers/Tokenizer.cs83.61% <88.88%> (+0.20%)⬆️
...c/Microsoft.ML.Tokenizers/Utils/IListExtensions.cs25.00% <0.00%> (-16.67%)⬇️
... and 1 more

... and 4 files with indirect coverage changes

@tarekgh

Copy link
Copy Markdown
Member

Would this better handled in the csproj? include this file only when we target net8.0.


Refers to: src/Microsoft.ML.Tokenizers/AssemblyInfo.cs:8 in ed88215. [](commit_id = ed88215, deletion_comment = False)


private static unsafe int GetUtf8Bytes(ReadOnlySpan<char> source, Span<byte> destination)
{
#if NETCOREAPP

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have .netstandard and .netcoreapp cs files in the project. Will be good to move this code into these twp files and avoid using #if.

{
if ((uint)utf8ByteCount + (uint)tokenBytes.Length > (uint)utf8Bytes.Length)
{
ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

@tarekghtarekghFeb 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ArrayPoolGrow(ref utf8Bytes, ref arrayPoolArray, utf8ByteCount + tokenBytes.Length);

should we grow the array with more spaces just in case more stuff we can add later without regrowing it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

never mind, it is not going to grow more in this path.

@tarekghtarekgh left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is amazing. Thanks a lot @stephentoub.

I'll merge this and I can do the #if cleanup things in another PR.

@tarekgh
tarekgh merged commit f976424 into dotnet:mainFeb 18, 2024
@tarekghtarekgh added enhancement New feature or request and removed community-contribution labels Feb 18, 2024
@tarekghtarekgh mentioned this pull request Feb 20, 2024
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 20, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancementNew feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@stephentoub@tarekgh