Skip to content

Fix build break #2030

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 1 commit into from
Jan 5, 2019
Merged

Fix build break #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Data.CustomTextLoader Import a dataset from a text file Microsoft.ML.EntryPoints
Data.DataViewReference Pass dataview from memory to experiment Microsoft.ML.EntryPoints.DataViewReference ImportData Microsoft.ML.EntryPoints.DataViewReference+Input Microsoft.ML.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter Create an array variable of IDataView Microsoft.ML.EntryPoints.MacroUtils MakeArray Microsoft.ML.EntryPoints.MacroUtils+ArrayIDataViewInput Microsoft.ML.EntryPoints.MacroUtils+ArrayIDataViewOutput
Data.PredictorModelArrayConverter Create an array variable of PredictorModel Microsoft.ML.EntryPoints.MacroUtils MakeArray Microsoft.ML.EntryPoints.MacroUtils+ArrayIPredictorModelInput Microsoft.ML.EntryPoints.MacroUtils+ArrayIPredictorModelOutput
Data.TextLoader Import a dataset from a text file Microsoft.ML.Legacy.EntryPoints.ImportTextData TextLoader Microsoft.ML.Legacy.EntryPoints.ImportTextData+LoaderInput Microsoft.ML.EntryPoints.ImportTextData+Output
Models.AnomalyDetectionEvaluator Evaluates an anomaly detection scored dataset. Microsoft.ML.Data.Evaluate AnomalyDetection Microsoft.ML.Data.AnomalyDetectionMamlEvaluator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.AnomalyPipelineEnsemble Combine anomaly detection models into an ensemble Microsoft.ML.EntryPoints.EnsembleCreator CreateAnomalyPipelineEnsemble Microsoft.ML.EntryPoints.EnsembleCreator+PipelineAnomalyInput Microsoft.ML.EntryPoints.CommonOutputs+AnomalyDetectionOutput
Models.BinaryClassificationEvaluator Evaluates a binary classification scored dataset. Microsoft.ML.Data.Evaluate Binary Microsoft.ML.Data.BinaryClassifierMamlEvaluator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Expand Down
354 changes: 354 additions & 0 deletions test/BaselineOutput/Common/EntryPoints/core_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,356 @@
}
]
},
{
"Name": "Data.TextLoader",
"Desc": "Import a dataset from a text file",
"FriendlyName": null,
"ShortName": null,
"Inputs": [
{
"Name": "InputFile",
"Type": "FileHandle",
"Desc": "Location of the input file",
"Aliases": [
"data"
],
"Required": true,
"SortOrder": 1.0,
"IsNullable": false
},
{
"Name": "Arguments",
"Type": {
"Kind": "Struct",
"Fields": [
{
"Name": "Column",
"Type": {
"Kind": "Array",
"ItemType": {
"Kind": "Struct",
"Fields": [
{
"Name": "Name",
"Type": "String",
"Desc": "Name of the column",
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": null
},
{
"Name": "Type",
"Type": {
"Kind": "Enum",
"Values": [
"I1",
"U1",
"I2",
"U2",
"I4",
"U4",
"I8",
"U8",
"R4",
"Num",
"R8",
"TX",
"Text",
"TXT",
"BL",
"Bool",
"TimeSpan",
"TS",
"DT",
"DateTime",
"DZ",
"DateTimeZone",
"UG",
"U16"
]
},
"Desc": "Type of the items in the column",
"Required": false,
"SortOrder": 150.0,
"IsNullable": true,
"Default": null
},
{
"Name": "Source",
"Type": {
"Kind": "Array",
"ItemType": {
"Kind": "Struct",
"Fields": [
{
"Name": "Min",
"Type": "Int",
"Desc": "First index in the range",
"Required": true,
"SortOrder": 150.0,
"IsNullable": false,
"Default": 0
},
{
"Name": "Max",
"Type": "Int",
"Desc": "Last index in the range",
"Required": false,
"SortOrder": 150.0,
"IsNullable": true,
"Default": null
},
{
"Name": "AutoEnd",
"Type": "Bool",
"Desc": "This range extends to the end of the line, but should be a fixed number of items",
"Aliases": [
"auto"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
},
{
"Name": "VariableEnd",
"Type": "Bool",
"Desc": "This range extends to the end of the line, which can vary from line to line",
"Aliases": [
"var"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
},
{
"Name": "AllOther",
"Type": "Bool",
"Desc": "This range includes only other indices not specified",
"Aliases": [
"other"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
},
{
"Name": "ForceVector",
"Type": "Bool",
"Desc": "Force scalar columns to be treated as vectors of length one",
"Aliases": [
"vector"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
}
]
}
},
"Desc": "Source index range(s) of the column",
"Aliases": [
"src"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": null
},
{
"Name": "KeyRange",
"Type": {
"Kind": "Struct",
"Fields": [
{
"Name": "Min",
"Type": "UInt",
"Desc": "First index in the range",
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": 0
},
{
"Name": "Max",
"Type": "UInt",
"Desc": "Last index in the range",
"Required": false,
"SortOrder": 150.0,
"IsNullable": true,
"Default": null
},
{
"Name": "Contiguous",
"Type": "Bool",
"Desc": "Whether the key is contiguous",
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": true
}
]
},
"Desc": "For a key column, this defines the range of values",
"Aliases": [
"key"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": null
}
]
}
},
"Desc": "Column groups. Each group is specified as name:type:numeric-ranges, eg, col=Features:R4:1-17,26,35-40",
"Aliases": [
"col"
],
"Required": false,
"SortOrder": 1.0,
"IsNullable": false,
"Default": null
},
{
"Name": "UseThreads",
"Type": "Bool",
"Desc": "Use separate parsing threads?",
"Aliases": [
"threads"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": true
},
{
"Name": "HeaderFile",
"Type": "String",
"Desc": "File containing a header with feature names. If specified, header defined in the data file (header+) is ignored.",
"Aliases": [
"hf"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": null
},
{
"Name": "MaxRows",
"Type": "Int",
"Desc": "Maximum number of rows to produce",
"Aliases": [
"rows"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": true,
"Default": null
},
{
"Name": "AllowQuoting",
"Type": "Bool",
"Desc": "Whether the input may include quoted values, which can contain separator characters, colons, and distinguish empty values from missing values. When true, consecutive separators denote a missing value and an empty value is denoted by \"\". When false, consecutive separators denote an empty value.",
"Aliases": [
"quote"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": true
},
{
"Name": "AllowSparse",
"Type": "Bool",
"Desc": "Whether the input may include sparse representations",
"Aliases": [
"sparse"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": true
},
{
"Name": "InputSize",
"Type": "Int",
"Desc": "Number of source columns in the text data. Default is that sparse rows contain their size information.",
"Aliases": [
"size"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": true,
"Default": null
},
{
"Name": "Separator",
"Type": {
"Kind": "Array",
"ItemType": "Char"
},
"Desc": "Source column separator.",
"Aliases": [
"sep"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": [
"\t"
]
},
{
"Name": "TrimWhitespace",
"Type": "Bool",
"Desc": "Remove trailing whitespace from lines",
"Aliases": [
"trim"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
},
{
"Name": "HasHeader",
"Type": "Bool",
"Desc": "Data file has header with feature names. Header is read only if options 'hs' and 'hf' are not specified.",
"Aliases": [
"header"
],
"Required": false,
"SortOrder": 150.0,
"IsNullable": false,
"Default": false
}
]
},
"Desc": "Arguments",
"Aliases": [
"args"
],
"Required": true,
"SortOrder": 2.0,
"IsNullable": false
}
],
"Outputs": [
{
"Name": "Data",
"Type": "DataView",
"Desc": "The resulting data view"
}
],
"InputKind": [
"ILearningPipelineLoader"
]
},
{
"Name": "Models.AnomalyDetectionEvaluator",
"Desc": "Evaluates an anomaly detection scored dataset.",
Expand Down Expand Up @@ -28846,6 +29196,10 @@
}
]
},
{
"Kind": "ILearningPipelineLoader",
"Settings": []
},
{
"Kind": "IMulticlassClassificationOutput",
"Settings": []
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public static TEnvironment AddStandardComponents<TEnvironment>(this TEnvironment
env.ComponentCatalog.RegisterAssembly(typeof(EnsembleModelParameters).Assembly); // ML.Ensemble
env.ComponentCatalog.RegisterAssembly(typeof(KMeansModelParameters).Assembly); // ML.KMeansClustering
env.ComponentCatalog.RegisterAssembly(typeof(PcaModelParameters).Assembly); // ML.PCA
#pragma warning disable 612
env.ComponentCatalog.RegisterAssembly(typeof(Experiment).Assembly); // ML.Legacy
#pragma warning restore 612
env.ComponentCatalog.RegisterAssembly(typeof(CVSplit).Assembly); // ML.EntryPoints
return env;
}
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<ProjectReference Include="..\..\src\Microsoft.ML.EntryPoints\Microsoft.ML.EntryPoints.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.Legacy\Microsoft.ML.Legacy.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.Parquet\Microsoft.ML.Parquet.csproj" />
<ProjectReference Include="..\..\src\Microsoft.ML.PCA\Microsoft.ML.PCA.csproj" />
Expand Down