Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes onnx exports for binary classification trainers #4463

Merged
merged 4 commits into from
Dec 2, 2019
Merged

Fixes onnx exports for binary classification trainers #4463

merged 4 commits into from
Dec 2, 2019

Conversation

Lynx1820
Copy link
Contributor

@Lynx1820 Lynx1820 commented Nov 9, 2019 •
edited
Loading

This PR fixes the issues with exporting the following binary classification trainers to onnx:

  • SymbolicSgdLogisticRegression(),
  • SgdCalibrated(),
  • AveragedPerceptron(),
  • FastForest(),
  • LinearSvm(),
  • SdcaNonCalibrated(),
  • SgdNonCalibrated(),
  • FastTree(),
  • LbfgsLogisticRegression(),
  • Trainers.LightGbm(),
  • SdcaLogisticRegression(),

Note: I couldn't create consistent regression models, even when seeding, so I didn't include baseline comparison on these tests.

@Lynx1820 Lynx1820 requested a review from a team as a code owner November 9, 2019 00:02
@codecov
Copy link

codecov bot commented Nov 15, 2019 •
edited
Loading

Codecov Report

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

@@            Coverage Diff            @@
##             master    #4463   +/-   ##
=========================================
  Coverage          ?   74.87%           
=========================================
  Files             ?      908           
  Lines             ?   159920           
  Branches          ?    17221           
=========================================
  Hits              ?   119747           
  Misses            ?    35364           
  Partials          ?     4809
Flag Coverage Δ
#Debug 74.87% <96.96%> (?)
#production 70.23% <100%> (?)
#test 90.2% <95.65%> (?)
Impacted Files Coverage Δ
...StandardTrainers/Standard/LinearModelParameters.cs 60.05% <100%> (ø)
...icrosoft.ML.Data/Scorers/BinaryClassifierScorer.cs 87% <100%> (ø)
src/Microsoft.ML.FastTree/FastTree.cs 80.62% <100%> (ø)
test/Microsoft.ML.Tests/OnnxConversionTest.cs 95.43% <95.65%> (ø)

@harishsk harishsk closed this Nov 22, 2019
@harishsk harishsk reopened this Nov 22, 2019
@Lynx1820
Squashed commit of the following:
0d49e9c 
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fa d7f9996
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.

    Fix dotnet#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

    Fixes dotnet#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: 93388b6 c96d690
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
@Lynx1820
update name and remove some dependency code
edb0167
@Lynx1820
baseline file changes
b8f694a
harishsk
harishsk approved these changes Dec 2, 2019
View reviewed changes
Copy link
Contributor

@harishsk harishsk left a comment

Choose a reason for hiding this comment

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

:shipit:

@Lynx1820 Lynx1820 merged commit d9584cf into dotnet:master Dec 2, 2019
@ghost ghost locked as resolved and limited conversation to collaborators Mar 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@harishsk harishsk harishsk approved these changes

@ganik ganik Awaiting requested review from ganik

@KsenijaS KsenijaS Awaiting requested review from KsenijaS

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
@Lynx1820 @harishsk