Skip to content

Make CpuMath not depending on ML.Core again #1724

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

Merged
merged 12 commits into from
Nov 27, 2018
Merged

Make CpuMath not depending on ML.Core again #1724

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f0b8c36
Make CpuMath not depending on ML.Core again
wschin Nov 26, 2018
1ee058d
Modify BestFriend attributes and their analyzer
wschin Nov 27, 2018
c89cf1f
Drop redundant macro variable
wschin Nov 27, 2018
25c3b62
Update src/Microsoft.ML.Core/Properties/PublicKey.cs
wschin Nov 27, 2018
911aee6
Use distinct messages for the two BestFriend analyzers
wschin Nov 27, 2018
7f374c6
Remove wrong symbols
wschin Nov 27, 2018
36e3a3c
Revert "Use distinct messages for the two BestFriend analyzers"
wschin Nov 27, 2018
037c3c9
Address comments
wschin Nov 27, 2018
ec4bdf1
Rename PRIVATE_CONTRACTS compiler flag to CPUMATH_INFRASTRUCTURE
wschin Nov 27, 2018
2a9451d
Remove unused namespace
wschin Nov 27, 2018
9d0b892
Swap usings
wschin Nov 27, 2018
9bd1d0d
Fix comment
wschin Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions tools-local/Microsoft.ML.InternalCodeAnalyzer/BestFriendAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ public sealed class BestFriendAnalyzer : DiagnosticAnalyzer
private const string Category = "Access";
internal const string DiagnosticId = "MSML_NoBestFriendInternal";

private string Title => "Cross-assembly internal access requires referenced item to have " + _attributeName + " attribute.";
private string Format => "Access of '{0}' is a cross assembly internal " +
private const string Title = "Cross-assembly internal access requires referenced item to have " + AttributeName + " attribute.";
private const string Format = "Access of '{0}' is a cross assembly internal " +
"reference, and the declaring assembly wants these accesses to be on something " +
"with the attribute " + _attributeName + ".";
private string Description =>
"with the attribute " + AttributeName + ".";
private const string Description =
"The identifier indicated is defined as an internal member of an assembly that has the " +
_assemblyAttributeName + " assembly-level attribute set. Even with friend access to that " +
"assembly, such a usage requires that the item have the " + _attributeName + " on it.";
AssemblyAttributeName + " assembly-level attribute set. Even with friend access to that " +
"assembly, such a usage requires that the item have the " + AttributeName + " on it.";

private DiagnosticDescriptor Rule =>
private static DiagnosticDescriptor Rule =
new DiagnosticDescriptor(DiagnosticId, Title, Format, Category,
DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);

private string _attributeName;
private string _assemblyAttributeName;
private const string AttributeName = "Microsoft.ML.BestFriendAttribute (or Microsoft.ML.Runtime.Internal.CpuMath.BestFriendAttribute)";
private const string AssemblyAttributeName = "Microsoft.ML.WantsToBeBestFriendsAttribute (or Microsoft.ML.Runtime.Internal.CpuMath.WantsToBeBestFriendsAttribute)";

public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
ImmutableArray.Create(Rule);
Expand Down Expand Up @@ -110,15 +110,8 @@ private void AnalyzeCore(SemanticModelAnalysisContext context, string attributeN

private void Analyze(SemanticModelAnalysisContext context)
{
// Analyzer function for BestFriend defined in Microsoft.ML
_attributeName = "Microsoft.ML.BestFriendAttribute";
_assemblyAttributeName = "Microsoft.ML.WantsToBeBestFriendsAttribute";
AnalyzeCore(context, _attributeName, _assemblyAttributeName);

// Analyzer function for BestFriend defined in Microsoft.ML.Hidden
_attributeName = "Microsoft.ML.Hidden.BestFriendAttribute";
_assemblyAttributeName = "Microsoft.ML.Hidden.WantsToBeBestFriendsAttribute";
AnalyzeCore(context, _attributeName, _assemblyAttributeName);
AnalyzeCore(context, "Microsoft.ML.BestFriendAttribute", "Microsoft.ML.WantsToBeBestFriendsAttribute");
AnalyzeCore(context, "Microsoft.ML.Hidden.BestFriendAttribute", "Microsoft.ML.Hidden.WantsToBeBestFriendsAttribute");
}
}
}