Add new type to key-value converter (#6973)

* Add new type to key-value * Make it IDataView * clean * add dataview support in source generator * Update type_converter_search_space.json * Update search-space-schema.json --------- Co-authored-by: XiaoYun Zhang <xiaoyuz@microsoft.com> Co-authored-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>
dotnet · Jan 26, 2024 · 4d69110 · 4d69110
1 parent 4c44e92
commit 4d69110
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/Microsoft.ML.AutoML/CodeGen/map_value_to_key_search_space.json b/src/Microsoft.ML.AutoML/CodeGen/map_value_to_key_search_space.json
@@ -14,6 +14,10 @@
       "name": "AddKeyValueAnnotationsAsText",
       "type": "boolean",
       "default": false
+    },
+    {
+      "name": "KeyData",
+      "type": "dataView"
     }
   ]
 }
diff --git a/src/Microsoft.ML.AutoML/CodeGen/search-space-schema.json b/src/Microsoft.ML.AutoML/CodeGen/search-space-schema.json
@@ -240,7 +240,8 @@
         "predictedAnswerColumnName",
         "TopKAnswers",
         "TargetType",
-        "PredictionColumnName"
+        "PredictionColumnName",
+        "KeyData"
       ]
     },
     "option_type": {
@@ -259,7 +260,8 @@
         "dnnModelFactory",
         "bertArchitecture",
         "imageClassificationArchType",
-        "dataKind"
+        "dataKind",
+        "dataView"
       ]
     }
   },

diff --git a/src/Microsoft.ML.AutoML/CodeGen/type_converter_search_space.json b/src/Microsoft.ML.AutoML/CodeGen/type_converter_search_space.json
@@ -14,6 +14,10 @@
       "name": "TargetType",
       "type": "dataKind",
       "default": "DataKind.Single"
+    },
+    {
+      "name": "KeyData",
+      "type": "dataView"
     }
   ]
 }
diff --git a/src/Microsoft.ML.AutoML/SweepableEstimator/Estimators/MapValueToKey.cs b/src/Microsoft.ML.AutoML/SweepableEstimator/Estimators/MapValueToKey.cs
@@ -8,7 +8,7 @@ internal partial class MapValueToKey
     {
         public override IEstimator<ITransformer> BuildFromOption(MLContext context, MapValueToKeyOption param)
         {
-            return context.Transforms.Conversion.MapValueToKey(param.OutputColumnName, param.InputColumnName, addKeyValueAnnotationsAsText: param.AddKeyValueAnnotationsAsText);
+            return context.Transforms.Conversion.MapValueToKey(param.OutputColumnName, param.InputColumnName, addKeyValueAnnotationsAsText: param.AddKeyValueAnnotationsAsText, keyData: param.KeyData);
         }
     }
 

diff --git a/tools-local/Microsoft.ML.AutoML.SourceGenerator/SearchSpaceGenerator.cs b/tools-local/Microsoft.ML.AutoML.SourceGenerator/SearchSpaceGenerator.cs
@@ -57,6 +57,7 @@ public void Execute(GeneratorExecutionContext context)
                         "bertArchitecture" => "BertArchitecture",
                         "imageClassificationArchType" => "Microsoft.ML.Vision.ImageClassificationTrainer.Architecture",
                         "dataKind" => "Microsoft.ML.Data.DataKind",
+                        "dataView" => "Microsoft.ML.IDataView",
                         _ => throw new ArgumentException("unknown type"),
                     };
 
@@ -76,6 +77,7 @@ public void Execute(GeneratorExecutionContext context)
                         (_, "BertArchitecture") => defaultToken.GetValue<string>(),
                         (_, "Microsoft.ML.Vision.ImageClassificationTrainer.Architecture") => defaultToken.GetValue<string>(),
                         (_, "Microsoft.ML.Data.DataKind") => defaultToken.GetValue<string>(),
+                        (_, "Microsoft.ML.IDataView") => defaultToken.GetValue<string>(),
                         (_, _) => throw new ArgumentException("unknown"),
                     };