Consolidate MapDataset function.

Author: Oceania2018

src/TensorFlowNET.Console/Tensorflow.Console.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Tensorflow</RootNamespace>
     <AssemblyName>Tensorflow</AssemblyName>
     <Platforms>AnyCPU;x64</Platforms>

src/TensorFlowNET.Core/APIs/c_api.cs

@@ -43,7 +43,7 @@ namespace Tensorflow
     /// </summary>
     public partial class c_api
     {
-        public const string TensorFlowLibName = @"D:\Projects\tensorflow-haiping\bazel-bin\tensorflow\tensorflow";
+        public const string TensorFlowLibName = "tensorflow";
 
         public static string StringPiece(IntPtr handle)
         {

src/TensorFlowNET.Core/APIs/tf.strings.cs

@@ -24,6 +24,30 @@ public class StringsApi
         {
             string_ops ops = new string_ops();
 
+            /// <summary>
+            /// Converts all uppercase characters into their respective lowercase replacements.
+            /// </summary>
+            /// <param name="input"></param>
+            /// <param name="encoding"></param>
+            /// <param name="name"></param>
+            /// <returns></returns>
+            public Tensor lower(Tensor input, string encoding = "", string name = null)
+                => ops.lower(input: input, encoding: encoding, name: name);
+
+            /// <summary>
+            /// 
+            /// </summary>
+            /// <param name="input"></param>
+            /// <param name="pattern"></param>
+            /// <param name="rewrite"></param>
+            /// <param name="replace_global"></param>
+            /// <param name="name"></param>
+            /// <returns></returns>
+            public Tensor regex_replace(Tensor input, string pattern, string rewrite,
+                bool replace_global = true, string name = null)
+                => ops.regex_replace(input, pattern, rewrite,
+                    replace_global: replace_global, name: name);
+
             /// <summary>
             /// Return substrings from `Tensor` of strings.
             /// </summary>

src/TensorFlowNET.Core/Data/DatasetV2.cs

@@ -14,6 +14,7 @@ namespace Tensorflow
     public class DatasetV2 : IDatasetV2
     {
         protected dataset_ops ops = new dataset_ops();
+        public string[] class_names { get; set; }
         public Tensor variant_tensor { get; set; }
 
         public TensorSpec[] structure { get; set; }
@@ -54,7 +55,7 @@ public IDatasetV2 skip(int count)
         public IDatasetV2 optimize(string[] optimizations, string[] optimization_configs)
             => new OptimizeDataset(this, optimizations, optimization_configs: optimization_configs);
 
-        public IDatasetV2 map(Func<Tensor, Tensor> map_func,
+        public IDatasetV2 map(Func<Tensors, Tensors> map_func,
             bool use_inter_op_parallelism = true,
             bool preserve_cardinality = true,
             bool use_legacy_function = false)
@@ -64,7 +65,7 @@ public IDatasetV2 map(Func<Tensor, Tensor> map_func,
                 preserve_cardinality: preserve_cardinality,
                 use_legacy_function: use_legacy_function);
 
-        public IDatasetV2 map(Func<Tensors, Tensors> map_func, int num_parallel_calls = -1)
+        public IDatasetV2 map(Func<Tensors, Tensors> map_func, int num_parallel_calls)
             => new ParallelMapDataset(this, map_func, num_parallel_calls: num_parallel_calls);
 
         public IDatasetV2 flat_map(Func<Tensor, IDatasetV2> map_func)

src/TensorFlowNET.Core/Data/IDatasetV2.cs

@@ -6,6 +6,8 @@ namespace Tensorflow
 {
     public interface IDatasetV2 : IEnumerable<(Tensor, Tensor)>
     {
+        string[] class_names { get; set; }
+
         Tensor variant_tensor { get; set; }
 
         TensorShape[] output_shapes { get; }
@@ -62,13 +64,13 @@ public interface IDatasetV2 : IEnumerable<(Tensor, Tensor)>
 
         IDatasetV2 optimize(string[] optimizations, string[] optimization_configs);
 
-        IDatasetV2 map(Func<Tensor, Tensor> map_func,
+        IDatasetV2 map(Func<Tensors, Tensors> map_func,
             bool use_inter_op_parallelism = true,
             bool preserve_cardinality = true,
             bool use_legacy_function = false);
 
         IDatasetV2 map(Func<Tensors, Tensors> map_func,
-            int num_parallel_calls = -1);
+            int num_parallel_calls);
 
         IDatasetV2 flat_map(Func<Tensor, IDatasetV2> map_func);
 

src/TensorFlowNET.Core/Data/MapDataset.cs

@@ -10,7 +10,7 @@ namespace Tensorflow
     public class MapDataset : UnaryDataset
     {
         public MapDataset(IDatasetV2 input_dataset,
-            Func<Tensor, Tensor> map_func,
+            Func<Tensors, Tensors> map_func,
             bool use_inter_op_parallelism = true,
             bool preserve_cardinality = false,
             bool use_legacy_function = false) : base(input_dataset)

src/TensorFlowNET.Core/Framework/Models/TensorSpec.cs

@@ -15,7 +15,7 @@ public TensorSpec _unbatch()
             if (_shape.ndim == 0)
                 throw new ValueError("Unbatching a tensor is only supported for rank >= 1");
 
-            return new TensorSpec(_shape.dims[1..], _dtype);
+            return new TensorSpec(_shape.dims.Skip(1).ToArray(), _dtype);
         }
 
         public TensorSpec _batch(int dim = -1)

src/TensorFlowNET.Core/Gradients/image_grad.cs

@@ -30,7 +30,7 @@ public static Tensor[] _ResizeNearestNeighborGrad(Operation op, Tensor[] grads)
             var shape = new TensorShape(image.shape.Skip(1).Take(2).ToArray());
             Tensor image_shape = null;
             if (shape.is_fully_defined())
-                image_shape = constant_op.constant(image.shape[1..3]);
+                image_shape = constant_op.constant(image.shape.Skip(1).Take(2).ToArray());
             else
                 image_shape = array_ops.shape(image)["1:3"];
 

src/TensorFlowNET.Core/Keras/ArgsDefinition/Preprocessing/PreprocessingLayerArgs.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow.Keras.ArgsDefinition
+{
+    public class PreprocessingLayerArgs : LayerArgs
+    {
+    }
+}

src/TensorFlowNET.Core/Keras/ArgsDefinition/Preprocessing/TextVectorizationArgs.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow.Keras.ArgsDefinition
+{
+    public class TextVectorizationArgs : PreprocessingLayerArgs
+    {
+        public Func<Tensor, Tensor> Standardize { get; set; }
+        public string Split { get; set; } = "standardize";
+        public int MaxTokens { get; set; } = -1;
+        public string OutputMode { get; set; } = "int";
+        public int OutputSequenceLength { get; set; } = -1;
+    }
+}