TensorSliceDataset

Oceania2018 · Oceania2018 · commit 71ea081ea8f0 · 2020-06-21T17:07:15.000-05:00
diff --git a/src/TensorFlowNET.Core/APIs/c_api.cs b/src/TensorFlowNET.Core/APIs/c_api.cs
@@ -1,5 +1,5 @@
 &#65279;/*****************************************************************************
-   Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
+   Copyright 2020 Haiping Chen. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ namespace Tensorflow
     /// </summary>
     public partial class c_api
     {
-        public const string TensorFlowLibName = "tensorflow";
+        public const string TensorFlowLibName = @"D:\SciSharp\tensorflow-google\bazel-bin\tensorflow\tensorflow.dll";
 
         public static string StringPiece(IntPtr handle)
         {
diff --git a/src/TensorFlowNET.Core/APIs/tf.data.cs b/src/TensorFlowNET.Core/APIs/tf.data.cs
@@ -24,7 +24,7 @@ public partial class tensorflow
 
         public class DataOps
         {
-            public TensorSliceDataset Dataset { get; } = new TensorSliceDataset();
+            public DatasetManager Dataset { get; } = new DatasetManager();
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/Data/DatasetManager.cs b/src/TensorFlowNET.Core/Data/DatasetManager.cs
@@ -0,0 +1,13 @@
+&#65279;using NumSharp;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow
+{
+    public class DatasetManager
+    {
+        public IDatasetV2 from_tensor_slices(NDArray features, NDArray labels)
+            => new TensorSliceDataset(features, labels);
+    }
+}
diff --git a/src/TensorFlowNET.Core/Data/IDatasetV2.cs b/src/TensorFlowNET.Core/Data/IDatasetV2.cs
@@ -0,0 +1,11 @@
+&#65279;using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow
+{
+    public interface IDatasetV2
+    {
+
+    }
+}
diff --git a/src/TensorFlowNET.Core/Data/TensorSliceDataset.cs b/src/TensorFlowNET.Core/Data/TensorSliceDataset.cs
@@ -5,16 +5,15 @@
 
 namespace Tensorflow
 {
-    public class TensorSliceDataset
+    public class TensorSliceDataset : IDatasetV2
     {
-        public TensorSliceDataset(params NDArray[] elements)
-        {
-
-        }
+        NDArray features;
+        NDArray labels;
 
-        public TensorSliceDataset from_tensor_slices(params NDArray[] elements)
+        public TensorSliceDataset(NDArray features, NDArray labels)
         {
-            throw new NotImplementedException("");
+            this.features = features;
+            this.labels = labels;
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/TensorFlow.Binding.csproj b/src/TensorFlowNET.Core/TensorFlow.Binding.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>TensorFlow.NET</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>2.2.0</TargetTensorFlow>
-    <Version>0.20.0-preview1</Version>
+    <Version>0.20.0-preview2</Version>
     <LangVersion>8.0</LangVersion>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
     <Company>SciSharp STACK</Company>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*****************************************************************************`
`2`		`- Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.`
	`2`	`+ Copyright 2020 Haiping Chen. All Rights Reserved.`
`3`	`3`
`4`	`4`	`Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`you may not use this file except in compliance with the License.`
`@@ -43,7 +43,7 @@ namespace Tensorflow`
`43`	`43`	`/// </summary>`
`44`	`44`	`public partial class c_api`
`45`	`45`	`{`
`46`		`- public const string TensorFlowLibName = "tensorflow";`
	`46`	`+ public const string TensorFlowLibName = @"D:\SciSharp\tensorflow-google\bazel-bin\tensorflow\tensorflow.dll";`
`47`	`47`
`48`	`48`	`public static string StringPiece(IntPtr handle)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public partial class tensorflow`
`24`	`24`
`25`	`25`	`public class DataOps`
`26`	`26`	`{`
`27`		`- public TensorSliceDataset Dataset { get; } = new TensorSliceDataset();`
	`27`	`+ public DatasetManager Dataset { get; } = new DatasetManager();`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,15 @@`
`5`	`5`
`6`	`6`	`namespace Tensorflow`
`7`	`7`	`{`
`8`		`- public class TensorSliceDataset`
	`8`	`+ public class TensorSliceDataset : IDatasetV2`
`9`	`9`	`{`
`10`		`- public TensorSliceDataset(params NDArray[] elements)`
`11`		`- {`
`12`		`-`
`13`		`- }`
	`10`	`+ NDArray features;`
	`11`	`+ NDArray labels;`
`14`	`12`
`15`		`- public TensorSliceDataset from_tensor_slices(params NDArray[] elements)`
	`13`	`+ public TensorSliceDataset(NDArray features, NDArray labels)`
`16`	`14`	`{`
`17`		`- throw new NotImplementedException("");`
	`15`	`+ this.features = features;`
	`16`	`+ this.labels = labels;`
`18`	`17`	`}`
`19`	`18`	`}`
`20`	`19`	`}`