diff --git a/‎src/TensorFlowNET.Core/Graphs/Graph.Import.cs‎
Lines changed: 0 additions & 1 deletion b/‎src/TensorFlowNET.Core/Graphs/Graph.Import.cs‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/NumPy/AutoNumPyAttribute.cs‎
Lines changed: 8 additions & 1 deletion b/‎src/TensorFlowNET.Core/NumPy/AutoNumPyAttribute.cs‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Numpy/NDArray.cs‎
Lines changed: 1 addition & 0 deletions b/‎src/TensorFlowNET.Core/Numpy/NDArray.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/TensorFlowNET.Core/Operations/math_ops.cs‎
Lines changed: 0 additions & 1 deletion b/‎src/TensorFlowNET.Core/Operations/math_ops.cs‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Tensors/constant_op.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/TensorFlowNET.Core/Tensors/constant_op.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/TensorFlowNET.UnitTest/Utilities/FluentExtension.cs‎
Lines changed: 0 additions & 7 deletions b/‎test/TensorFlowNET.UnitTest/Utilities/FluentExtension.cs‎
Lines changed: 0 additions & 7 deletions
@@ -52,7 +52,6 @@ public bool Import(byte[] bytes, string prefix = "")
             using (var status = new Status())
             using (var graph_def = new Buffer(bytes))
             {
-                as_default();
                 c_api.TF_ImportGraphDefOptionsSetPrefix(opts.Handle, prefix);
                 c_api.TF_GraphImportGraphDef(_handle, graph_def.Handle, opts.Handle, status.Handle);
                 status.Check(true);
 
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Threading;
 using static Tensorflow.Binding;
 
 namespace Tensorflow.NumPy
@@ -10,9 +11,12 @@ namespace Tensorflow.NumPy
     public sealed class AutoNumPyAttribute : OnMethodBoundaryAspect
     {
         bool _changedMode = false;
-
+        bool _locked = false;
+        static object locker = new Object();
         public override void OnEntry(MethodExecutionArgs args)
         {
+            Monitor.Enter(locker, ref _locked);
+            
             if (!tf.executing_eagerly())
             {
                 tf.Context.eager_mode();
@@ -24,6 +28,9 @@ public override void OnExit(MethodExecutionArgs args)
         {
             if (_changedMode)
                 tf.Context.restore_mode();
+
+            if (_locked)
+                Monitor.Exit(locker);
         }
     }
 }
@@ -30,6 +30,7 @@ public partial class NDArray : Tensor, IEnumerable<NDArray>
 
         [AutoNumPy]
         public NDArray reshape(Shape newshape) => new NDArray(tf.reshape(this, newshape));
+        [AutoNumPy]
         public NDArray astype(TF_DataType dtype) => new NDArray(math_ops.cast(this, dtype));
         public NDArray ravel() => throw new NotImplementedException("");
         public void shuffle(NDArray nd) => np.random.shuffle(nd);
 
@@ -126,7 +126,6 @@ public static Tensor cast(Tensor x, TF_DataType dtype = TF_DataType.DtInvalid, s
             return tf_with(ops.name_scope(name, "Cast", new { x }), scope =>
             {
                 name = scope;
-                x = ops.convert_to_tensor(x, name: "x");
                 if (x.dtype.as_base_dtype() != base_type)
                     x = gen_math_ops.cast(x, base_type, name: name);
 
 
@@ -101,7 +101,7 @@ private static Tensor convert_to_eager_tensor(object value, Context ctx, TF_Data
                 value is NDArray nd &&
                 nd.dtype != dtype)
             {
-                value = nd.astype(dtype);
+                value = math_ops.cast(nd, dtype);
             }
 
             // non ascii char
 
@@ -197,13 +197,6 @@ public AndConstraint<NDArrayAssertions> BeScalar()
             return new AndConstraint<NDArrayAssertions>(this);
         }
 
-        public AndConstraint<NDArrayAssertions> BeScalar(object value)
-        {
-            Subject.shape.IsScalar.Should().BeTrue();
-            Subject.GetValue().Should().Be(value);
-            return new AndConstraint<NDArrayAssertions>(this);
-        }
-
         public AndConstraint<NDArrayAssertions> BeOfType(Type typeCode)
         {
             Subject.dtype.Should().Be(typeCode);
Original file line number	Diff line number	Diff line change
@@ -52,7 +52,6 @@ public bool Import(byte[] bytes, string prefix = "")
52	52	using (var status = new Status())
53	53	using (var graph_def = new Buffer(bytes))
54	54	{
55		- as_default();
56	55	c_api.TF_ImportGraphDefOptionsSetPrefix(opts.Handle, prefix);
57	56	c_api.TF_GraphImportGraphDef(_handle, graph_def.Handle, opts.Handle, status.Handle);
58	57	status.Check(true);
Original file line number	Diff line number	Diff line change
@@ -2,6 +2,7 @@
2	2	using System;
3	3	using System.Collections.Generic;
4	4	using System.Diagnostics;
	5	+ using System.Threading;
5	6	using static Tensorflow.Binding;
6	7
7	8	namespace Tensorflow.NumPy
@@ -10,9 +11,12 @@ namespace Tensorflow.NumPy
10	11	public sealed class AutoNumPyAttribute : OnMethodBoundaryAspect
11	12	{
12	13	bool _changedMode = false;
13		-
	14	+ bool _locked = false;
	15	+ static object locker = new Object();
14	16	public override void OnEntry(MethodExecutionArgs args)
15	17	{
	18	+ Monitor.Enter(locker, ref _locked);
	19	+
16	20	if (!tf.executing_eagerly())
17	21	{
18	22	tf.Context.eager_mode();
@@ -24,6 +28,9 @@ public override void OnExit(MethodExecutionArgs args)
24	28	{
25	29	if (_changedMode)
26	30	tf.Context.restore_mode();
	31	+
	32	+ if (_locked)
	33	+ Monitor.Exit(locker);
27	34	}
28	35	}
29	36	}
Original file line number	Diff line number	Diff line change
@@ -126,7 +126,6 @@ public static Tensor cast(Tensor x, TF_DataType dtype = TF_DataType.DtInvalid, s
126	126	return tf_with(ops.name_scope(name, "Cast", new { x }), scope =>
127	127	{
128	128	name = scope;
129		- x = ops.convert_to_tensor(x, name: "x");
130	129	if (x.dtype.as_base_dtype() != base_type)
131	130	x = gen_math_ops.cast(x, base_type, name: name);
132	131
Original file line number	Diff line number	Diff line change
@@ -101,7 +101,7 @@ private static Tensor convert_to_eager_tensor(object value, Context ctx, TF_Data
101	101	value is NDArray nd &&
102	102	nd.dtype != dtype)
103	103	{
104		- value = nd.astype(dtype);
	104	+ value = math_ops.cast(nd, dtype);
105	105	}
106	106
107	107	// non ascii char
Original file line number	Diff line number	Diff line change
@@ -197,13 +197,6 @@ public AndConstraint<NDArrayAssertions> BeScalar()
197	197	return new AndConstraint<NDArrayAssertions>(this);
198	198	}
199	199
200		- public AndConstraint<NDArrayAssertions> BeScalar(object value)
201		- {
202		- Subject.shape.IsScalar.Should().BeTrue();
203		- Subject.GetValue().Should().Be(value);
204		- return new AndConstraint<NDArrayAssertions>(this);
205		- }
206		-
207	200	public AndConstraint<NDArrayAssertions> BeOfType(Type typeCode)
208	201	{
209	202	Subject.dtype.Should().Be(typeCode);