Don't include the SDK in our helix payload - #6918

Merged
ericstj merged 2 commits into
dotnet:mainfrom
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged

Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom
ericstj:removeSdkFromHelix

Conversation

@ericstj

@ericstjericstj commented Dec 20, 2023

Copy link
Copy Markdown
Member

I noticed that the tests included the latest SDK - including the host - in our helix payloads.

This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.

Since our tests shouldn't need the full CLI, remove this from our helix payloads.

We'll instead get just the runtime we need through AdditionalDotNetPackage

@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost assigned ericstjDec 20, 2023
@ericstj

ericstj commented Dec 20, 2023

Copy link
Copy Markdown
MemberAuthor

I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15

So we might need to tweak our command line for executing the tests:

machinelearning/eng/helix.proj

Line 151 in 5483ba9

<Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>

@ericstj

ericstj commented Dec 20, 2023•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result

Now to get dotnet back on the path.

@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov

codecovBot commented Dec 20, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️

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

see 2 files with indirect coverage changes

@ericstj
ericstj merged commit b8f71b9 into dotnet:mainDec 21, 2023
@ericstjericstj mentioned this pull request Jan 5, 2024
Merged
ericstj added a commit that referenced this pull request Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit that referenced this pull request Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer
@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp
, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp

, '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
Don't include the SDK in our helix payload - #6918
Merged
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Dec 21, 2023
Merged
Don't include the SDK in our helix payload#6918
ericstj merged 2 commits into
dotnet:mainfrom 
ericstj:removeSdkFromHelix
Conversation
@ericstj
@ericstjericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

Member
I noticed that the tests included the latest SDK - including the host - in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix payloads.
We'll instead get just the runtime we need through AdditionalDotNetPackage
@ericstj
Don't include the SDK in our helix payload
3904637
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
@ghostghost
assigned ericstjDec 20, 2023
@ericstj
ericstj
commented
Dec 20, 2023

Copy link


Copy Markdown

MemberAuthor
I noticed that we might not get dotnet added to the path:
https://github.com/dotnet/arcade/blob/c0c425d9b85b125bbaf59581639355f1d2b99149/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets#L15
So we might need to tweak our command line for executing the tests:
machinelearning/eng/helix.proj

Line 151
in
5483ba9
 <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command> 
@ericstj
ericstj
commented
Dec 20, 2023•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Yep, right on time as I discovered this the tests hit it. I do see this is having the desired effect (runtime added, but no SDK): https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-f33c5c7d-ade1-462f-bbf7-9c7eceea97510e66aa157474e3aad/job-list-92e85b36-8b0e-416c-b245-155dc7a13ad0.json?helixlogtype=result
Now to get dotnet back on the path.
@ericstj
Place Helix downloaded runtime on the PATH
51a7461
Helix only sets the path when the CLI is included, however we don't
need the CLI.
@codecov
codecovBot
commented
Dec 20, 2023

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Comparison is base (efab011) 68.79% compared to head (51a7461) 68.79%.

Report is 1 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@## main #6918 +/- ##
=======================================
Coverage 68.79% 68.79% =======================================
Files 1249 1249 Lines 249431 249431 Branches 25510 25510 =======================================
+ Hits 171604 171606 +2 
Misses 71214 71214 + Partials 6613 6611 -2 
FlagCoverage Δ
Debug68.79% <ø> (+<0.01%)⬆️
production63.25% <ø> (+<0.01%)⬆️
test88.49% <ø> (+<0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes
@ericstj
ericstj
merged commit b8f71b9
into
dotnet:mainDec 21, 2023
@ericstjericstj
mentioned this pull request
Jan 5, 2024
 Merged

ericstj added a commit
that referenced
this pull request
Jan 5, 2024
@ericstj
Don't include the SDK in our helix payload (#6918)
7bb71bb
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
michaelgsharp added a commit
that referenced
this pull request
Jan 9, 2024
@dotnet-maestro@michaelgsharp@ericstj
[release/3.0] Update dependencies from dotnet/arcade (#6938)
f602581
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2
* Fixed version update breaks.
* Update XUnitVersion
* Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
* Rollback OnnxRuntime and suppress warning
* Update to Xunit with fix for xunit/xunit#2821
* Update Centos docker containers
* Fix packaging step
* Try including stdint.h to fix missing uint8_t on centos
* Update Centos test queue
* Attempt to use runtime centos-stream8-helix container for tests
* Use centos-stream8-mlnet-helix container for testing
* Undo changes to test data
* Make NETFRAMEWORK ifdef versionless
* Only use semi-colons for NoWarn
* Fix assert by only accessing idx (#6924)
Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a
case where `_rowCount`'s update was reordered before `_valueBoundaries`
This was unnecessary, since this method doesn't need to use `_rowCount`.
Instead, make the asserts use only `idx` which will be maintained
consistent with the waiter logic in this cache.
�Ensure we only ever use `_rowCount` from the caching thread, so write
reordering won't matter.
* Don't include the SDK in our helix payload (#6918)
* Don't include the SDK in our helix payload
I noticed that the tests included the latest SDK - including the host -
in our helix payloads.
This is a large amount of unnecessary downloads and it also makes it so
we use the latest host on the older frameworks which can fail when the
latest host drops support for distros.
Since our tests shouldn't need the full CLI, remove this from our helix
payloads.
We'll instead get just the runtime we need through `AdditionalDotNetPackage`
* Place Helix downloaded runtime on the PATH
Helix only sets the path when the CLI is included, however we don't
need the CLI.
* Make double assertions compare with tolerance instead of precision (#6923)
Precision might cause small differences to round to a different number.
Instead compare with a tolerance which is not sensitive to rounding.
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jan 21, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


1 more reviewer

@michaelgsharpmichaelgsharpmichaelgsharp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@ericstjericstj

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@ericstj@michaelgsharp