Skip to content

CpuMathNative assembly is not getting copied when using packages.config. #4465

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
Merged
merged 1 commit into from
Nov 13, 2019
Merged

CpuMathNative assembly is not getting copied when using packages.config. #4465

merged 1 commit into from
Nov 13, 2019
+42 −1

Conversation

eerhardt
Copy link
Member

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

@eerhardt
CpuMathNative assembly is not getting copied when using packages.config.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
0ef7654 
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
@eerhardt eerhardt requested review from codemzs and safern November 11, 2019 15:43
@eerhardt eerhardt requested a review from a team as a code owner November 11, 2019 15:43
safern
safern reviewed Nov 11, 2019
View reviewed changes
pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
</Content>
</ItemGroup>

</Project>
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Extra line at EOF

safern
safern reviewed Nov 11, 2019
View reviewed changes
pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
@@ -0,0 +1,24 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
Copy link
Member

Choose a reason for hiding this comment

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

Is the xmlns metadata needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

We put it in there to support older MSBuild's - specifically we still support VS 2015 if you have the netstandard2.0 stuff installed on it.

Copy link
Member Author

Choose a reason for hiding this comment

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

We put it in there because this .props file gets loaded by the end-user's project. So we want to support as old of tools as possible. I believe we still support VS 2015 if you have the netstandard2.0 support installed.

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense.

@eerhardt eerhardt merged commit 5e83e23 into dotnet:master Nov 13, 2019
@eerhardt eerhardt deleted the Fix93Again branch November 13, 2019 22:09
Lynx1820 added a commit to Lynx1820/machinelearning that referenced this pull request Nov 14, 2019
@Lynx1820
Squashed commit of the following:
f0a9163 
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fa d7f9996
Author: Keren Fuentes <[email protected]>
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 <[email protected]>
Date:   Thu Nov 14 17:41:12 2019 +0000

    Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)

commit f3e0f6b
Author: Eric Erhardt <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Nov 11 11:33:17 2019 -0800

    workaround Scores

commit 7fba31c
Merge: 93388b6 c96d690
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:25:28 2019 -0800

    merging changes

commit 93388b6
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:19:59 2019 -0800

    Added extraction of score column before node creation

commit ea71828
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 6fad293
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 83c1c80
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test

commit 8884161
Author: frank-dong-ms <[email protected]>
Date:   Fri Nov 8 20:20:53 2019 -0800

    nightly build pipeline (dotnet#4444)

    * nightly build pipeline

commit c96d690
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 8100364
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 81381e2
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test
Lynx1820 added a commit to Lynx1820/machinelearning that referenced this pull request Dec 2, 2019
@Lynx1820
Squashed commit of the following:
0d49e9c 
commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fa d7f9996
Author: Keren Fuentes <[email protected]>
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 <[email protected]>
Date:   Thu Nov 14 17:41:12 2019 +0000

    Added onnx export support for KeyToValueMappingTransformer (dotnet#4455)

commit f3e0f6b
Author: Eric Erhardt <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Nov 11 11:33:17 2019 -0800

    workaround Scores

commit 7fba31c
Merge: 93388b6 c96d690
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:25:28 2019 -0800

    merging changes

commit 93388b6
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:19:59 2019 -0800

    Added extraction of score column before node creation

commit ea71828
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 6fad293
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 83c1c80
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test

commit 8884161
Author: frank-dong-ms <[email protected]>
Date:   Fri Nov 8 20:20:53 2019 -0800

    nightly build pipeline (dotnet#4444)

    * nightly build pipeline

commit c96d690
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 8100364
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 81381e2
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test
Lynx1820 added a commit that referenced this pull request Dec 2, 2019
@Lynx1820
Fixes onnx exports for binary classification trainers (#4463)
d9584cf 
* Squashed commit of the following:

commit a5e274ef8869576190bbb794360a5f56d998b470
Merge: b7db4fa d7f9996
Author: Keren Fuentes <[email protected]>
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 <[email protected]>
Date:   Thu Nov 14 17:41:12 2019 +0000

    Added onnx export support for KeyToValueMappingTransformer (#4455)

commit f3e0f6b
Author: Eric Erhardt <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Nov 11 11:33:17 2019 -0800

    workaround Scores

commit 7fba31c
Merge: 93388b6 c96d690
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:25:28 2019 -0800

    merging changes

commit 93388b6
Author: Keren Fuentes <[email protected]>
Date:   Mon Nov 11 11:19:59 2019 -0800

    Added extraction of score column before node creation

commit ea71828
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 6fad293
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 83c1c80
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test

commit 8884161
Author: frank-dong-ms <[email protected]>
Date:   Fri Nov 8 20:20:53 2019 -0800

    nightly build pipeline (#4444)

    * nightly build pipeline

commit c96d690
Author: Keren Fuentes <[email protected]>
Date:   Fri Nov 8 15:53:11 2019 -0800

    fix for binary classification trainers export to onnx

commit 8100364
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:26:43 2019 -0700

    Revert "draft regression test"

    This reverts commit 1ad45c995516b9d39fc05aca855ce2abe96c407b.

commit 81381e2
Author: Keren Fuentes <[email protected]>
Date:   Thu Oct 31 15:24:23 2019 -0700

    draft regression test

* update name and remove some dependency code

* baseline file changes

* Refactored function
@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

@safern safern

@codemzs codemzs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Microsoft.ML NuGet package doesn't work with packages.config
2 participants
@eerhardt @safern