work with NumSharp v0.9

Oceania2018 · Oceania2018 · commit bfdaa6b94d59 · 2019-04-03T23:45:55.000-05:00
diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln
@@ -1,7 +1,7 @@
 &#65279;
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.136
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.UnitTest", "test\TensorFlowNET.UnitTest\TensorFlowNET.UnitTest.csproj", "{029A8CF1-CF95-4DCB-98AA-9D3D96A83B3E}"
 EndProject
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Core", "src\T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Visualization", "src\TensorFlowNET.Visualization\TensorFlowNET.Visualization.csproj", "{0254BFF9-453C-4FE0-9609-3644559A79CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumSharp.Core", "..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj", "{647E7590-9B50-48D9-B9E2-47743E9EAA56}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumSharp.Core", "..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj", "{7BCAA225-997B-4BB0-987A-153E1CD1896B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{647E7590-9B50-48D9-B9E2-47743E9EAA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{647E7590-9B50-48D9-B9E2-47743E9EAA56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{647E7590-9B50-48D9-B9E2-47743E9EAA56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{647E7590-9B50-48D9-B9E2-47743E9EAA56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BCAA225-997B-4BB0-987A-153E1CD1896B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BCAA225-997B-4BB0-987A-153E1CD1896B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BCAA225-997B-4BB0-987A-153E1CD1896B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BCAA225-997B-4BB0-987A-153E1CD1896B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/TensorFlowNET.Core/APIs/tf.tile.cs b/src/TensorFlowNET.Core/APIs/tf.tile.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Gradients/gradients_impl.py.cs b/src/TensorFlowNET.Core/Gradients/gradients_impl.py.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs b/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs
@@ -1,5 +1,4 @@
-&#65279;using NumSharp.Core;
-using System;
+&#65279;using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
diff --git a/src/TensorFlowNET.Core/Keras/Sequence.cs b/src/TensorFlowNET.Core/Keras/Sequence.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Operations/array_ops.py.cs b/src/TensorFlowNET.Core/Operations/array_ops.py.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Operations/gen_array_ops.cs b/src/TensorFlowNET.Core/Operations/gen_array_ops.cs
@@ -1,9 +1,8 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Tensorflow;
 using Tensorflow.Eager;
 
 namespace Tensorflow
diff --git a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs
@@ -1,5 +1,4 @@
-&#65279;using NumSharp.Core;
-using System;
+&#65279;using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -42,7 +41,9 @@ public static Tensor arg_min(Tensor input, int dimension, TF_DataType output_typ
 
         /// <summary>
         /// Computes the mean of elements across dimensions of a tensor.
-        /// Reduces `input` along the dimensions given in `axis`. Unless        /// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in        /// `axis`. If `keep_dims` is true, the reduced dimensions are retained with length 1.
+        /// Reduces `input` along the dimensions given in `axis`. Unless
+        /// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
+        /// `axis`. If `keep_dims` is true, the reduced dimensions are retained with length 1.
         /// </summary>
         /// <param name="input">A `Tensor`. Must be one of the following types: 
         /// `float32`, `float64`, `int32`, `uint8`, `int16`, `int8`, `complex64`, `int64`, `qint8`, `quint8`, `qint32`, `bfloat16`, `uint16`, `complex128`, `half`, `uint32`, `uint64`. 
diff --git a/src/TensorFlowNET.Core/Operations/math_ops.cs b/src/TensorFlowNET.Core/Operations/math_ops.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Python.cs b/src/TensorFlowNET.Core/Python.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Sessions/FeedItem.cs b/src/TensorFlowNET.Core/Sessions/FeedItem.cs
@@ -1,5 +1,4 @@
-&#65279;using NumSharp.Core;
-using System;
+&#65279;using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/src/TensorFlowNET.Core/Sessions/_ElementFetchMapper.cs b/src/TensorFlowNET.Core/Sessions/_ElementFetchMapper.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Sessions/_FetchHandler.cs b/src/TensorFlowNET.Core/Sessions/_FetchHandler.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Sessions/_FetchMapper.cs b/src/TensorFlowNET.Core/Sessions/_FetchMapper.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs b/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -1,5 +1,5 @@
 &#65279;//using Newtonsoft.Json;
-using NumSharp.Core;
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Tensors/TensorShape.cs b/src/TensorFlowNET.Core/Tensors/TensorShape.cs
@@ -1,5 +1,5 @@
 &#65279;using Google.Protobuf.Collections;
-using NumSharp.Core;
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/TensorFlowNET.Core/Tensors/constant_op.cs b/src/TensorFlowNET.Core/Tensors/constant_op.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Tensors/tensor_util.cs b/src/TensorFlowNET.Core/Tensors/tensor_util.cs
@@ -1,10 +1,8 @@
-&#65279;using NumSharp.Core;
-using NumSharp.Core.Interfaces;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using tensor_pb2 = Tensorflow;
 
 namespace Tensorflow
 {
@@ -45,7 +43,7 @@ private static NDArray _ConstantValue(Tensor tensor, bool partial)
         public static NDArray MakeNdarray(TensorProto tensor)
         {
             var shape = tensor.TensorShape.Dim.Select(x => (int)x.Size).ToArray();
-            long num_elements = np.prod(shape);
+            int num_elements = np.prod(shape);
             var tensor_dtype =  tensor.Dtype.as_numpy_dtype();
 
             if (tensor.TensorContent.Length > 0)
@@ -199,7 +197,7 @@ public static TensorProto make_tensor_proto(object values, TF_DataType dtype = T
                 is_same_size = shape_size == nparray.size;
             }
 
-            var tensor_proto = new tensor_pb2.TensorProto
+            var tensor_proto = new TensorProto
             {
                 Dtype = numpy_dtype.as_datatype_enum(),
                 TensorShape = tensor_util.as_shape(shape)
@@ -316,12 +314,12 @@ public static TensorShape to_shape(long[] dims)
             return new TensorShape(dims.Select(x => (int)x).ToArray());
         }
 
-        public static TensorShape as_shape(this IShape shape)
+        public static TensorShape as_shape(this Shape shape)
         {
             return new TensorShape(shape.Dimensions);
         }
 
-        public static TensorShape reshape(this IShape shape, int[] dims)
+        public static TensorShape reshape(this Shape shape, int[] dims)
         {
             return new TensorShape(dims);
         }
diff --git a/src/TensorFlowNET.Core/Tensors/tf.constant.cs b/src/TensorFlowNET.Core/Tensors/tf.constant.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/Variables/gen_state_ops.py.cs b/src/TensorFlowNET.Core/Variables/gen_state_ops.py.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/TensorFlowNET.Core/ops.py.cs b/src/TensorFlowNET.Core/ops.py.cs
@@ -4,12 +4,10 @@
 using System.Text;
 using System.Threading;
 using Tensorflow;
-using node_def_pb2 = Tensorflow;
 using Google.Protobuf;
 using System.Linq;
-using NumSharp.Core;
+using NumSharp;
 using System.ComponentModel;
-using Tensorflow.Gradients;
 
 namespace Tensorflow
 {
@@ -176,7 +174,7 @@ public static OpDef _get_op_def(Graph graph, string type)
 
         public static NodeDef _NodeDef(string op_type, string name, string device = "", Dictionary<string, AttrValue> attrs = null)
         {
-            var node_def = new node_def_pb2.NodeDef();
+            var node_def = new NodeDef();
             node_def.Op = op_type;
             node_def.Name = name;
 
diff --git a/test/TensorFlowNET.Examples/BasicOperations.cs b/test/TensorFlowNET.Examples/BasicOperations.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/test/TensorFlowNET.Examples/ImageRecognition.cs b/test/TensorFlowNET.Examples/ImageRecognition.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/TensorFlowNET.Examples/InceptionArchGoogLeNet.cs b/test/TensorFlowNET.Examples/InceptionArchGoogLeNet.cs
@@ -1,6 +1,6 @@
 &#65279;using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
-using NumSharp.Core;
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/TensorFlowNET.Examples/KMeansClustering.cs b/test/TensorFlowNET.Examples/KMeansClustering.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/test/TensorFlowNET.Examples/LinearRegression.cs b/test/TensorFlowNET.Examples/LinearRegression.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/test/TensorFlowNET.Examples/LogisticRegression.cs b/test/TensorFlowNET.Examples/LogisticRegression.cs
@@ -1,5 +1,4 @@
-&#65279;using Newtonsoft.Json;
-using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/TensorFlowNET.Examples/NaiveBayesClassifier.cs b/test/TensorFlowNET.Examples/NaiveBayesClassifier.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Tensorflow;
-using NumSharp.Core;
+using NumSharp;
 using System.Linq;
 
 namespace TensorFlowNET.Examples
diff --git a/test/TensorFlowNET.Examples/NearestNeighbor.cs b/test/TensorFlowNET.Examples/NearestNeighbor.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -47,9 +47,10 @@ public bool Run()
                     // Get nearest neighbor
                     long nn_index = sess.run(pred, new FeedItem(xtr, Xtr), new FeedItem(xte, Xte[i]));
                     // Get nearest neighbor class label and compare it to its true label
-                    print($"Test {i} Prediction: {np.argmax(Ytr[nn_index])} True Class: {np.argmax(Yte[i] as NDArray)}");
+                    int index = (int)nn_index;
+                    print($"Test {i} Prediction: {np.argmax(Ytr[(NDArray)index])} True Class: {np.argmax(Yte[i] as NDArray)}");
                     // Calculate accuracy
-                    if (np.argmax(Ytr[nn_index]) == np.argmax(Yte[i] as NDArray))
+                    if (np.argmax(Ytr[(NDArray)index]) == np.argmax(Yte[i] as NDArray))
                         accuracy += 1f/ Xte.shape[0];
                 }
 
diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj" />
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\TensorFlowNET.Core.csproj" />
   </ItemGroup>
 
diff --git a/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs b/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs b/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs
@@ -1,5 +1,4 @@
-&#65279;using NumSharp.Core;
-using System;
+&#65279;using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/test/TensorFlowNET.Examples/TextClassification/TextClassificationWithMovieReviews.cs b/test/TensorFlowNET.Examples/TextClassification/TextClassificationWithMovieReviews.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using Tensorflow;
-using NumSharp.Core;
 using Newtonsoft.Json;
 using System.Linq;
 using System.Text.RegularExpressions;
+using NumSharp;
 
 namespace TensorFlowNET.Examples
 {
@@ -71,8 +71,8 @@ public void PrepareData()
             labels_test = labels_test[indices_test];
 
             // not completed
-            var xs = x_train.hstack(x_test);
-            var labels = labels_train.hstack(labels_test);
+            var xs = x_train.hstack<int>(x_test);
+            var labels = labels_train.hstack<int>(labels_test);
 
             var idx = x_train.size;
             var y_train = labels_train;
diff --git a/test/TensorFlowNET.Examples/Utility/DataSet.cs b/test/TensorFlowNET.Examples/Utility/DataSet.cs
@@ -1,4 +1,4 @@
-&#65279;using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/test/TensorFlowNET.Examples/Utility/MnistDataSet.cs b/test/TensorFlowNET.Examples/Utility/MnistDataSet.cs
@@ -1,6 +1,4 @@
-&#65279;using ICSharpCode.SharpZipLib.Core;
-using ICSharpCode.SharpZipLib.GZip;
-using NumSharp.Core;
+&#65279;using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/TensorFlowNET.UnitTest/CApiGradientsTest.cs b/test/TensorFlowNET.UnitTest/CApiGradientsTest.cs
@@ -1,5 +1,5 @@
 &#65279;using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NumSharp.Core;
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/test/TensorFlowNET.UnitTest/CSession.cs b/test/TensorFlowNET.UnitTest/CSession.cs
@@ -1,5 +1,4 @@
-&#65279;using NumSharp.Core;
-using System;
+&#65279;using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
diff --git a/test/TensorFlowNET.UnitTest/ConstantTest.cs b/test/TensorFlowNET.UnitTest/ConstantTest.cs
@@ -1,5 +1,5 @@
 &#65279;using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NumSharp.Core;
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/test/TensorFlowNET.UnitTest/OperationsTest.cs b/test/TensorFlowNET.UnitTest/OperationsTest.cs
@@ -1,5 +1,4 @@
 &#65279;using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NumSharp.Core;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/test/TensorFlowNET.UnitTest/SessionTest.cs b/test/TensorFlowNET.UnitTest/SessionTest.cs
diff --git a/test/TensorFlowNET.UnitTest/TensorTest.cs b/test/TensorFlowNET.UnitTest/TensorTest.cs
diff --git a/test/TensorFlowNET.UnitTest/VariableTest.cs b/test/TensorFlowNET.UnitTest/VariableTest.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using NumSharp.Core;`
	`1`	`+using NumSharp;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Text;`