Fix ReadValueMatrix ReadBytes issue in .NET 6.0. #880

Oceania2018 · Oceania2018 · commit 19363cdf1133 · 2022-11-09T18:41:08.000-06:00
diff --git a/src/TensorFlowNET.Console/Tensorflow.Console.csproj b/src/TensorFlowNET.Console/Tensorflow.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Tensorflow</RootNamespace>
     <AssemblyName>Tensorflow</AssemblyName>
     <Platforms>AnyCPU;x64</Platforms>
diff --git a/src/TensorFlowNET.Core/NumPy/Implementation/NumPyImpl.Creation.cs b/src/TensorFlowNET.Core/NumPy/Implementation/NumPyImpl.Creation.cs
@@ -90,9 +90,8 @@ Array ReadValueMatrix(BinaryReader reader, Array matrix, int bytes, Type type, i
             int total = 1;
             for (int i = 0; i < shape.Length; i++)
                 total *= shape[i];
-            var buffer = new byte[bytes * total];
-
-            reader.Read(buffer, 0, buffer.Length);
+            
+            var buffer = reader.ReadBytes(bytes * total);
             System.Buffer.BlockCopy(buffer, 0, matrix, 0, buffer.Length);
 
             return matrix;
diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Tensorflow.Binding</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>2.2.0</TargetTensorFlow>
-    <Version>0.70.1</Version>
+    <Version>0.70.2</Version>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
diff --git a/src/TensorFlowNet.Benchmarks/Tensorflow.Benchmark.csproj b/src/TensorFlowNet.Benchmarks/Tensorflow.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
diff --git a/test/TensorFlowNET.Graph.UnitTest/TensorFlowNET.Graph.UnitTest.csproj b/test/TensorFlowNET.Graph.UnitTest/TensorFlowNET.Graph.UnitTest.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <IsPackable>false</IsPackable>
     <AssemblyName>TensorFlowNET.UnitTest</AssemblyName>
diff --git a/test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj b/test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
diff --git a/test/TensorFlowNET.Native.UnitTest/Tensorflow.Native.UnitTest.csproj b/test/TensorFlowNET.Native.UnitTest/Tensorflow.Native.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/LinalgTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/LinalgTest.cs
@@ -77,5 +77,16 @@ public void Tensordot()
             Assert.AreEqual(c.shape.ndim, 0);
             Assert.AreEqual(c.numpy(), 8);
         }
+
+        [TestMethod]
+        public void Matmul()
+        {
+            var a = tf.constant(new[] { 1, 2, 3, 4, 5, 6 }, shape: (2, 3));
+            var b = tf.constant(new[] { 7, 8, 9, 10, 11, 12 }, shape: (3, 2));
+            var c = tf.linalg.matmul(a, b);
+
+            Assert.AreEqual(c.shape, (2, 2));
+            AssetSequenceEqual(c.ToArray<int>(), new[] { 58, 64, 139, 154 });
+        }
     }
 }
diff --git a/test/TensorFlowNET.UnitTest/Tensorflow.Binding.UnitTest.csproj b/test/TensorFlowNET.UnitTest/Tensorflow.Binding.UnitTest.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,16 @@ public void Tensordot()`
`77`	`77`	`Assert.AreEqual(c.shape.ndim, 0);`
`78`	`78`	`Assert.AreEqual(c.numpy(), 8);`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ [TestMethod]`
	`82`	`+ public void Matmul()`
	`83`	`+ {`
	`84`	`+ var a = tf.constant(new[] { 1, 2, 3, 4, 5, 6 }, shape: (2, 3));`
	`85`	`+ var b = tf.constant(new[] { 7, 8, 9, 10, 11, 12 }, shape: (3, 2));`
	`86`	`+ var c = tf.linalg.matmul(a, b);`
	`87`	`+`
	`88`	`+ Assert.AreEqual(c.shape, (2, 2));`
	`89`	`+ AssetSequenceEqual(c.ToArray<int>(), new[] { 58, 64, 139, 154 });`
	`90`	`+ }`
`80`	`91`	`}`
`81`	`92`	`}`