Add NameEntityRecognition and Q&A deep learning tasks.

build/ci/job-template.yml

@@ -68,7 +68,7 @@ jobs:
     steps:
     # Extra MacOS step required to install OS-specific dependencies
     - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross')))  }}:
-      - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew update && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
+      - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
         displayName: Install MacOS build dependencies
     # Extra Apple MacOS step required to install OS-specific dependencies
     - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross'))  }}:

src/Microsoft.ML.Tokenizers/Model/BPE.cs

@@ -195,6 +195,14 @@ public override IReadOnlyList<Token> Tokenize(string sequence)
             return null;
         }
 
+        /// <summary>
+        /// Map the tokenized Id to the token.
+        /// </summary>
+        /// <param name="id">The Id to map to the token.</param>
+        /// <param name="skipSpecialTokens">Indicate if want to skip the special tokens during the decoding.</param>
+        /// <returns>The mapped token of the Id.</returns>
+        public override string? IdToString(int id, bool skipSpecialTokens = false) => throw new NotImplementedException();
+
         /// <summary>
         /// Gets the dictionary mapping tokens to Ids.
         /// </summary>
@@ -443,6 +451,11 @@ internal List<Token> TokenizeWithCache(string sequence)
             return tokens;
         }
 
+        public override bool IsValidChar(char ch)
+        {
+            throw new NotImplementedException();
+        }
+
         internal static readonly List<Token> EmptyTokensList = new();
     }
 }

src/Microsoft.ML.Tokenizers/Model/EnglishRoberta.cs

@@ -135,6 +135,28 @@ public EnglishRoberta(Stream vocabularyStream, Stream mergeStream, Stream highes
         public override string? IdToToken(int id, bool skipSpecialTokens = false) =>
             skipSpecialTokens && id < 0 ? null : _vocabReverse.TryGetValue(id, out var value) ? value : null;
 
+        /// <summary>
+        /// Map the tokenized Id to the original string.
+        /// </summary>
+        /// <param name="id">The Id to map to the string.</param>
+        /// <param name="skipSpecialTokens">Indicate if want to skip the special tokens during the decoding.</param>
+        /// <returns>The mapped token of the Id.</returns>
+        public override string? IdToString(int id, bool skipSpecialTokens = false)
+        {
+            if (skipSpecialTokens && id < 0)
+                return null;
+            if (_vocabReverse.TryGetValue(id, out var value))
+            {
+                var textChars = string.Join("", value)
+                    .Where(c => _unicodeToByte.ContainsKey(c))
+                    .Select(c => _unicodeToByte[c]);
+                var text = new string(textChars.ToArray());
+                return text;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Save the model data into the vocabulary, merges, and occurrence mapping files.
         /// </summary>
@@ -565,6 +587,11 @@ private List<Token> BpeToken(Span<char> token, Span<int> indexMapping)
 
             return pairs;
         }
+
+        public override bool IsValidChar(char ch)
+        {
+            return _byteToUnicode.ContainsKey(ch);
+        }
     }
 
     /// <summary>

src/Microsoft.ML.Tokenizers/Model/Model.cs

@@ -35,6 +35,8 @@ public abstract class Model
         /// <returns>The mapped token of the Id.</returns>
         public abstract string? IdToToken(int id, bool skipSpecialTokens = false);
 
+        public abstract string? IdToString(int id, bool skipSpecialTokens = false);
+
         /// <summary>
         /// Gets the dictionary mapping tokens to Ids.
         /// </summary>
@@ -57,6 +59,14 @@ public abstract class Model
         /// Gets a trainer object to use in training the model.
         /// </summary>
         public abstract Trainer? GetTrainer();
+
+        /// <summary>
+        /// Return true if the char is valid in the tokenizer; otherwise return false.
+        /// </summary>
+        /// <param name="ch"></param>
+        /// <returns></returns>
+        public abstract bool IsValidChar(char ch);
+
     }
 
 }

src/Microsoft.ML.Tokenizers/Tokenizer.cs

@@ -137,7 +137,10 @@ public TokenizerResult Encode(string sequence)
 
             foreach (int id in ids)
             {
-                tokens.Add(Model.IdToToken(id) ?? "");
+                if (Model.GetType() == typeof(EnglishRoberta))
+                    tokens.Add(Model.IdToString(id) ?? "");
+                else
+                    tokens.Add(Model.IdToToken(id) ?? "");
             }
 
             return Decoder?.Decode(tokens) ?? string.Join("", tokens);
@@ -187,5 +190,10 @@ public void TrainFromFiles(
             // To Do: support added vocabulary in the tokenizer which will include this returned special_tokens.
             // self.add_special_tokens(&special_tokens);
         }
+
+        public bool IsValidChar(char ch)
+        {
+            return Model.IsValidChar(ch);
+        }
     }
 }

src/Microsoft.ML.TorchSharp/AutoFormerV2/ObjectDetectionTrainer.cs

@@ -17,19 +17,12 @@
 using static TorchSharp.torch.optim.lr_scheduler;
 using Microsoft.ML.TorchSharp.Utils;
 using Microsoft.ML;
-using Microsoft.ML.TorchSharp.NasBert;
 using System.IO;
 using Microsoft.ML.Data.IO;
 using Microsoft.ML.TorchSharp.Loss;
 using Microsoft.ML.Transforms.Image;
 using static Microsoft.ML.TorchSharp.AutoFormerV2.ObjectDetectionTrainer;
 using Microsoft.ML.TorchSharp.AutoFormerV2;
-using Microsoft.ML.Tokenizers;
-using Microsoft.ML.TorchSharp.Extensions;
-using Microsoft.ML.TorchSharp.NasBert.Models;
-using static Microsoft.ML.TorchSharp.NasBert.NasBertTrainer;
-using TorchSharp.Modules;
-using System.Text;
 using static Microsoft.ML.Data.AnnotationUtils;
 
 [assembly: LoadableClass(typeof(ObjectDetectionTransformer), null, typeof(SignatureLoadModel),
@@ -503,7 +496,7 @@ private void CheckInputSchema(SchemaShape inputSchema)
         }
     }
 
-    public class ObjectDetectionTransformer : RowToRowTransformerBase
+    public class ObjectDetectionTransformer : RowToRowTransformerBase, IDisposable
     {
         private protected readonly Device Device;
         private protected readonly AutoFormerV2 Model;
@@ -522,6 +515,7 @@ public class ObjectDetectionTransformer : RowToRowTransformerBase
 
         private static readonly FuncStaticMethodInfo1<object, Delegate> _decodeInitMethodInfo
             = new FuncStaticMethodInfo1<object, Delegate>(DecodeInit<int>);
+        private bool _disposedValue;
 
         internal ObjectDetectionTransformer(IHostEnvironment env, ObjectDetectionTrainer.Options options, AutoFormerV2 model, DataViewSchema.DetachedColumn labelColumn)
            : base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ObjectDetectionTransformer)))
@@ -992,5 +986,31 @@ private protected override Func<int, bool> GetDependenciesCore(Func<int, bool> a
                 return col => (activeOutput(0) || activeOutput(1) || activeOutput(2)) && _inputColIndices.Any(i => i == col);
             }
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                }
+
+                Model.Dispose();
+                _disposedValue = true;
+            }
+        }
+
+        ~ObjectDetectionTransformer()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: false);
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/Microsoft.ML.TorchSharp/NasBert/BertModelType.cs

@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.ML.TorchSharp.NasBert
+{
+    internal enum BertModelType
+    {
+        NasBert,
+        Roberta
+    }
+}

src/Microsoft.ML.TorchSharp/NasBert/BertTaskType.cs

@@ -16,6 +16,8 @@ public enum BertTaskType
         None = 0,
         MaskedLM = 1,
         TextClassification = 2,
-        SentenceRegression = 3
+        SentenceRegression = 3,
+        NameEntityRecognition = 4,
+        QuestionAnswering = 5
     }
 }

src/Microsoft.ML.TorchSharp/NasBert/Models/BaseHead.cs

@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using TorchSharp;
 
 namespace Microsoft.ML.TorchSharp.NasBert.Models

src/Microsoft.ML.TorchSharp/NasBert/Models/BaseModel.cs

@@ -3,23 +3,22 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.ML.TorchSharp.Utils;
 using TorchSharp;
 
 namespace Microsoft.ML.TorchSharp.NasBert.Models
 {
     internal abstract class BaseModel : torch.nn.Module<torch.Tensor, torch.Tensor, torch.Tensor>
     {
         protected readonly NasBertTrainer.NasBertOptions Options;
-        public BertTaskType HeadType => Options.TaskType;
+        public BertModelType EncoderType => Options.ModelType;
 
-        //public ModelType EncoderType => Options.ModelType;
+        public BertTaskType HeadType => Options.TaskType;
 
 #pragma warning disable CA1024 // Use properties where appropriate: Modules should be fields in TorchSharp
         public abstract TransformerEncoder GetEncoder();
+
+        public abstract BaseHead GetHead();
+
 #pragma warning restore CA1024 // Use properties where appropriate
 
         protected BaseModel(NasBertTrainer.NasBertOptions options)

src/Microsoft.ML.TorchSharp/NasBert/Models/ModelPrediction.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using TorchSharp;
+
+namespace Microsoft.ML.TorchSharp.NasBert.Models
+{
+    internal sealed class ModelForPrediction : NasBertModel
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "MSML_PrivateFieldName:Private field name not in: _camelCase format", Justification = "Has to match TorchSharp model.")]
+        private readonly PredictionHead PredictionHead;
+
+        public override BaseHead GetHead() => PredictionHead;
+
+        public ModelForPrediction(NasBertTrainer.NasBertOptions options, int padIndex, int symbolsCount, int numClasses)
+            : base(options, padIndex, symbolsCount)
+        {
+            PredictionHead = new PredictionHead(
+                inputDim: Options.EncoderOutputDim,
+                numClasses: numClasses,
+                dropoutRate: Options.PoolerDropout);
+            Initialize();
+            RegisterComponents();
+        }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "MSML_GeneralName:This name should be PascalCased", Justification = "Need to match TorchSharp.")]
+        public override torch.Tensor forward(torch.Tensor srcTokens, torch.Tensor tokenMask = null)
+        {
+            using var disposeScope = torch.NewDisposeScope();
+            var x = ExtractFeatures(srcTokens);
+            x = PredictionHead.call(x);
+            return x.MoveToOuterDisposeScope();
+        }
+    }
+}