Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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 \u003e 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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik
, '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

Added onnx export support for KeyToValueMappingTransformer - #4455

Merged
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2
Nov 14, 2019
Merged

Added onnx export support for KeyToValueMappingTransformer#4455
harishsk merged 1 commit into
dotnet:masterfrom
harishsk:keytovalue2

Conversation

@harishsk

@harishskharishsk commented Nov 7, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@harishsk
harishsk requested a review from a team as a code ownerNovember 7, 2019 18:00
ganik
ganik approved these changes Nov 13, 2019
View reviewed changes

@ganikganik left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@codecov

codecovBot commented Nov 14, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@c1e190a). Click here to learn what that means.
The diff coverage is 78.88%.

@@ Coverage Diff @@## master #4455 +/- ##
=========================================
Coverage ? 74.86% =========================================
Files ? 908 Lines ? 159862 Branches ? 17214 =========================================
Hits ? 119679 Misses ? 35371 Partials ? 4812
FlagCoverage Δ
#Debug74.86% <78.88%> (?)
#production70.22% <60.46%> (?)
#test90.19% <95.74%> (?)
Impacted FilesCoverage Δ
src/Microsoft.ML.Data/Transforms/KeyToValue.cs76.9% <60.46%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs95.1% <95.74%> (ø)

@harishsk
harishsk merged commit b7db4fa into dotnet:masterNov 14, 2019
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Nov 14, 2019
@kere-nel
Squashed commit of the following:
f0a9163
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit to kere-nel/machinelearning that referenced this pull request Dec 2, 2019
@kere-nel
Squashed commit of the following:
0d49e9c
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (dotnet#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (dotnet#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (dotnet#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (dotnet#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (dotnet#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fixdotnet#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (dotnet#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixesdotnet#4292 about using PFI with BPT and CMPB (dotnet#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (dotnet#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (dotnet#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
kere-nel added a commit that referenced this pull request Dec 2, 2019
@kere-nel
Fixes onnx exports for binary classification trainers (#4463)
d9584cf
* Squashed commit of the following:
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fad7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Nov 14 14:51:21 2019 -0800
Merge branch 'onnx_bin_classifiers' of https://github.com/Lynx1820/machinelearning into onnx_bin_classifiers
commit b7db4fa
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 17:41:12 2019 +0000
Added onnx export support for KeyToValueMappingTransformer (#4455)
commit f3e0f6b
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu Nov 14 07:22:12 2019 -0600
Fix a flaky Extensions.ML test. (#4458)
* Fix a flaky Extensions.ML test.
Make the reload model tests more resistant to timing changes.
* PR feedback.
commit c1e190a
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 05:24:14 2019 +0000
Added onnx export support for OptionalColumnTransform (#4454)
* Initial work for adding onnx export support for OptionalColumnTransform
* Implemented support for optional initializers in OnnxTranformer to support OptionalColumnTransform
* Fixed handling of double values and non-long numeric types
* Removed redundant line
* Updated review comment
commit f96761b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Thu Nov 14 03:17:12 2019 +0000
Fixed model saving and loading of OneVersusAllTrainer to include SoftMax (#4472)
* Fixed model saving and loading of OneVersusAllTrainer to include SoftMax
* Modified existing test to include SoftMax option
* Modified test to verify both cases: when UseSoftmax is true and false
commit d45cc8a
Author: Jake <31937616+JakeRadMSFT@users.noreply.github.com>
Date: Wed Nov 13 17:26:49 2019 -0800
Add InternalsVisibleTo in AutoML and CodeGenerator for the assembly Microsoft.ML.ModelBuilder.AutoMLService.Gpu (#4474)
commit 5e83e23
Author: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed Nov 13 16:09:05 2019 -0600
CpuMathNative assembly is not getting copied when using packages.config. (#4465)
When we refactored CpuMath to support netcoreapp3.0, we broke the packages.config support to copy the native assembly. This fixes it again by copying the file from the correct location.
Fix#93
commit 693250b
Author: Harish Kulkarni <harishsk@users.noreply.github.com>
Date: Wed Nov 13 21:58:07 2019 +0000
Added onnx export support for WordTokenizingTransformer and NgramExtractingTransformer (#4451)
* Added onnx export support for string related transforms
* Updated baseline test files
A large portion of this commit is upgrading the baseline test files. The rest of the fixes deal with build breaks resulting from the upgrade of ORT version.
* Fixed bugs in ValueToKeyMappingTransformer and added additional tests
commit 5910910
Author: Antonio Velázquez <38739674+antoniovs1029@users.noreply.github.com>
Date: Mon Nov 11 17:19:39 2019 -0800
Fixes#4292 about using PFI with BPT and CMPB (#4306)
*Changes in PredictionTransformer.cs and Calibrator.cs to fix the problem of the create methods not being called, to make CMP load its internal calibrator and predictor first so to assign the correct paramaters types and runtimes, and added a PredictionTransformerLoadTypeAttribute so that the binary prediction transformer knows what type to assign when loading a CMP as its internal model.
*Added a working sample for using PFI with BPT and CMPB while loading a model from disk. This is based entirely in the original sample.
*Added file CalibratedModelParametersTests.cs with tests that the CMPs modified in this PR are now being correctly loaded from disk.
*Changed a couple of tests in LbfgsTests.cs that failed because they used casts that now return 'null'.
commit bcdac55
Author: Brian Stark <54910472+bpstark@users.noreply.github.com>
Date: Mon Nov 11 13:42:42 2019 -0800
Stabilize the LR test (#4446)
* Stabilize the LR test
Found issue with how we were using random for our
ImageClassificationTrainer. This caused instability in our unit test, as
we were not able to control the random seed. Modified the code to now
use the same random object throughout, the trainer, thus allowing us to
control the seed and therefor have predictable output.
commit d7f9996
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:33:17 2019 -0800
workaround Scores
commit 7fba31c
Merge: 93388b6c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:25:28 2019 -0800
merging changes
commit 93388b6
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Mon Nov 11 11:19:59 2019 -0800
Added extraction of score column before node creation
commit ea71828
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 6fad293
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 83c1c80
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
commit 8884161
Author: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Fri Nov 8 20:20:53 2019 -0800
nightly build pipeline (#4444)
* nightly build pipeline
commit c96d690
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Fri Nov 8 15:53:11 2019 -0800
fix for binary classification trainers export to onnx
commit 8100364
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:26:43 2019 -0700
Revert "draft regression test"
This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.
commit 81381e2
Author: Keren Fuentes <dkeren@seas.upenn.edu>
Date: Thu Oct 31 15:24:23 2019 -0700
draft regression test
* update name and remove some dependency code
* baseline file changes
* Refactored function
@harishsk
harishsk deleted the keytovalue2 branch April 21, 2020 23:57
@ghostghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@codemzscodemzsAwaiting requested review from codemzs
@eerhardteerhardtAwaiting requested review from eerhardt
1 more reviewer
@ganikganikganik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harishsk@ganik