Fix build after rebase

dotnet · Mar 19, 2019 · cbc96e7 · cbc96e7
1 parent bb7253e
commit cbc96e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Microsoft.ML.Data/Data/SchemaDefinition.cs b/src/Microsoft.ML.Data/Data/SchemaDefinition.cs
@@ -258,6 +258,11 @@ public void AddAnnotation<T>(string kind, T value, DataViewType annotationType)
                 AnnotationInfos[kind] = new AnnotationInfo<T>(kind, value, annotationType);
             }
 
+            internal void AddAnnotation(string kind, AnnotationInfo info)
+            {
+                AnnotationInfos[kind] = info;
+            }
+
             /// <summary>
             /// Returns annotations kind and type associated with this column.
             /// </summary>

diff --git a/src/Microsoft.ML.Data/DataView/DataViewConstructionUtils.cs b/src/Microsoft.ML.Data/DataView/DataViewConstructionUtils.cs
@@ -74,7 +74,7 @@ internal static SchemaDefinition GetSchemaDefinition<TRow>(IHostEnvironment env,
                     foreach (var annotation in annotations.Schema)
                     {
                         var info = Utils.MarshalInvoke(GetAnnotationInfo<int>, annotation.Type.RawType, annotation.Name, annotations);
-                        schemaDefinitionCol.Annotations.Add(annotation.Name, info);
+                        schemaDefinitionCol.AddAnnotation(annotation.Name , info);
                     }
                 }
             }

diff --git a/test/Microsoft.ML.Functional.Tests/SchemaDefinitionTests.cs b/test/Microsoft.ML.Functional.Tests/SchemaDefinitionTests.cs
@@ -48,11 +48,11 @@ public void SchemaDefinitionForPredictionEngine()
 
             var outputSchemaDefinition = SchemaDefinition.Create(typeof(OutputData));
             outputSchemaDefinition["Features"].ColumnType = model1.GetOutputSchema(data.Schema)["Features"].Type;
-            var engine1 = model1.CreatePredictionEngine<InputData, OutputData>(_ml, outputSchemaDefinition: outputSchemaDefinition);
+            var engine1 = _ml.Model.CreatePredictionEngine<InputData, OutputData>(model1, outputSchemaDefinition: outputSchemaDefinition);
 
             outputSchemaDefinition = SchemaDefinition.Create(typeof(OutputData));
             outputSchemaDefinition["Features"].ColumnType = model2.GetOutputSchema(data.Schema)["Features"].Type;
-            var engine2 = model2.CreatePredictionEngine<InputData, OutputData>(_ml, outputSchemaDefinition: outputSchemaDefinition);
+            var engine2 = _ml.Model.CreatePredictionEngine<InputData, OutputData>(model2, outputSchemaDefinition: outputSchemaDefinition);
 
             var prediction = engine1.Predict(new InputData() { Workclass = "Self-emp-not-inc", NumericFeatures = new float[6] });
             Assert.Equal((engine1.OutputSchema["Features"].Type as VectorType).Size, prediction.Features.Length);