Repository navigation
Make CpuMath not depending on ML.Core again - #1724
Merged
Merged
Conversation
Ivanidzo4ka
reviewed
Nov 26, 2018
Ivanidzo4ka
reviewed
Nov 26, 2018
wschin
commented
Nov 27, 2018
eerhardt
reviewed
Nov 27, 2018
eerhardt
reviewed
Nov 27, 2018
Member
(nit) I think it makes more sense for this file to live outside of the Refers to: src/Microsoft.ML.Core/Properties/PublicKey.cs:1 in 7f374c6. [](commit_id = 7f374c6, deletion_comment = False) |
eerhardt
reviewed
Nov 27, 2018
eerhardt
reviewed
Nov 27, 2018
This reverts commit 911aee6.
eerhardt
reviewed
Nov 27, 2018
eerhardt
reviewed
Nov 27, 2018
eerhardt
approved these changes
Nov 27, 2018
eerhardt
left a comment
Member
There was a problem hiding this comment.
Just the question about if using #if PRIVATE_CONTRACTS as the name still makes sense, and a minor question about the old namespace.
Other than those 2 things, this looks good.
Ivanidzo4ka
reviewed
Nov 27, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1688.
CpuMathproject now includesContract.csinML.Core. The fileContract.cscontains some if-else macros for distinguishing the part for general ML.NET (namespace:Microsoft.ML) from the part forCpuMath(namespace:Microsoft.ML.Runtime.Internal.CpuMath.Core). TheBestFriendAttributeinML.Core(namespace: Microsoft.ML) andCpuMath(namespace:Microsoft.ML.Runtime.Internal.CpuMath.Core) follow the same pattern for the same reason.BestFriendAnalyzeris also modified to support the two variants ofBestFriendattributes.Besides, we move
PublicKeyinto another file,PublicKey.cs,to avoid includingAssemblyInfo.cstwice in CpuMath project.