np.ones_like and np.zeros_like

Oceania2018 · Oceania2018 · commit ec340eeff57c · 2023-02-04T12:06:21.000-06:00
diff --git a/src/TensorFlowNET.Console/SimpleRnnTest.cs b/src/TensorFlowNET.Console/SimpleRnnTest.cs
@@ -12,7 +12,6 @@ public class SimpleRnnTest
     {
         public void Run()
         {
-            tf.UseKeras<KerasInterface>();
             var inputs = np.random.random((6, 10, 8)).astype(np.float32);
             //var simple_rnn = tf.keras.layers.SimpleRNN(4);
             //var output = simple_rnn.Apply(inputs);  // The output has shape `[32, 4]`.
diff --git a/src/TensorFlowNET.Core/Numpy/Numpy.Creation.cs b/src/TensorFlowNET.Core/Numpy/Numpy.Creation.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Numerics;
 using System.Text;
 using static Tensorflow.Binding;
 
@@ -103,11 +102,15 @@ public static NDArray ndarray(Shape shape, TF_DataType dtype = TF_DataType.TF_DO
         public static NDArray ones(Shape shape, TF_DataType dtype = TF_DataType.TF_DOUBLE)
             => new NDArray(tf.ones(shape, dtype: dtype));
 
-        public static NDArray ones_like(NDArray a, Type dtype = null)
-            => throw new NotImplementedException("");
+        public static NDArray ones_like(NDArray a, TF_DataType dtype = TF_DataType.DtInvalid)
+            => new NDArray(tf.ones_like(a, dtype: dtype));
 
         [AutoNumPy]
         public static NDArray zeros(Shape shape, TF_DataType dtype = TF_DataType.TF_DOUBLE)
             => new NDArray(tf.zeros(shape, dtype: dtype));
+
+        [AutoNumPy]
+        public static NDArray zeros_like(NDArray a, TF_DataType dtype = TF_DataType.DtInvalid)
+            => new NDArray(tf.zeros_like(a, dtype: dtype));
     }
 }
diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs
@@ -291,7 +291,14 @@ private void _extend_graph()
         protected override void DisposeUnmanagedResources(IntPtr handle)
         {
             // c_api.TF_CloseSession(handle, tf.Status.Handle);
-            c_api.TF_DeleteSession(handle, c_api.TF_NewStatus());
+            if (tf.Status == null || tf.Status.Handle.IsInvalid)
+            {
+                c_api.TF_DeleteSession(handle, c_api.TF_NewStatus());
+            }
+            else
+            {
+                c_api.TF_DeleteSession(handle, tf.Status.Handle);
+            }
         }
     }
 }
diff --git a/src/python/simple_rnn.py b/src/python/simple_rnn.py
@@ -1,15 +1,17 @@
 import numpy as np
 import tensorflow as tf
+import tensorflow.experimental.numpy as tnp
 
 # tf.experimental.numpy
-inputs = np.random.random([32, 10, 8]).astype(np.float32)
-simple_rnn = tf.keras.layers.SimpleRNN(4)
+inputs = np.arange(6 * 10 * 8).reshape([6, 10, 8]).astype(np.float32)
+# simple_rnn = tf.keras.layers.SimpleRNN(4)
 
-output = simple_rnn(inputs)  # The output has shape `[32, 4]`.
+# output = simple_rnn(inputs)  # The output has shape `[6, 4]`.
 
-simple_rnn = tf.keras.layers.SimpleRNN(
-    4, return_sequences=True, return_state=True)
+simple_rnn = tf.keras.layers.SimpleRNN(4, return_sequences=True, return_state=True)
 
-# whole_sequence_output has shape `[32, 10, 4]`.
-# final_state has shape `[32, 4]`.
-whole_sequence_output, final_state = simple_rnn(inputs)
+# whole_sequence_output has shape `[6, 10, 4]`.
+# final_state has shape `[6, 4]`.
+whole_sequence_output, final_state = simple_rnn(inputs)
+print(whole_sequence_output)
+print(final_state)
diff --git a/test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj b/test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-	<LangVersion>11.0</LangVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public class SimpleRnnTest`
`12`	`12`	`{`
`13`	`13`	`public void Run()`
`14`	`14`	`{`
`15`		`- tf.UseKeras<KerasInterface>();`
`16`	`15`	`var inputs = np.random.random((6, 10, 8)).astype(np.float32);`
`17`	`16`	`//var simple_rnn = tf.keras.layers.SimpleRNN(4);`
`18`	`17`	//var output = simple_rnn.Apply(inputs); // The output has shape `[32, 4]`.
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,14 @@ private void _extend_graph()`
`291`	`291`	`protected override void DisposeUnmanagedResources(IntPtr handle)`
`292`	`292`	`{`
`293`	`293`	`// c_api.TF_CloseSession(handle, tf.Status.Handle);`
`294`		`- c_api.TF_DeleteSession(handle, c_api.TF_NewStatus());`
	`294`	`+ if (tf.Status == null \|\| tf.Status.Handle.IsInvalid)`
	`295`	`+ {`
	`296`	`+ c_api.TF_DeleteSession(handle, c_api.TF_NewStatus());`
	`297`	`+ }`
	`298`	`+ else`
	`299`	`+ {`
	`300`	`+ c_api.TF_DeleteSession(handle, tf.Status.Handle);`
	`301`	`+ }`
`295`	`302`	`}`
`296`	`303`	`}`
`297`	`304`	`}`