Merge pull request #1215 from novikov-alexander/alnovi/pythontests_common

refactor: python test common class moved to a separate common assembly

TensorFlow.NET.sln

@@ -39,7 +39,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Benchmark", "too
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Console", "tools\TensorFlowNET.Console\Tensorflow.Console.csproj", "{1DC32255-BA1F-4D6D-A9C9-5BD5ED71CAA0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlow.Kernel.UnitTest", "test\TensorFlow.Kernel.UnitTest\TensorFlow.Kernel.UnitTest.csproj", "{654A027D-1364-4729-880B-144DFE1FF5BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlow.Kernel.UnitTest", "test\TensorFlow.Kernel.UnitTest\TensorFlow.Kernel.UnitTest.csproj", "{654A027D-1364-4729-880B-144DFE1FF5BB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tensorflow.UnitTest", "test\Tensorflow.UnitTest\Tensorflow.UnitTest.csproj", "{A73DF5A6-866E-4AED-9017-AA2EE86368C4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -342,6 +344,24 @@ Global
 		{654A027D-1364-4729-880B-144DFE1FF5BB}.Release|x64.Build.0 = Release|Any CPU
 		{654A027D-1364-4729-880B-144DFE1FF5BB}.Release|x86.ActiveCfg = Release|Any CPU
 		{654A027D-1364-4729-880B-144DFE1FF5BB}.Release|x86.Build.0 = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Debug|x86.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|Any CPU.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|Any CPU.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|x64.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|x64.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|x86.ActiveCfg = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.GPU|x86.Build.0 = Debug|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|x64.Build.0 = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -363,6 +383,7 @@ Global
 		{C23563DB-FE21-48E7-A411-87A109E4A899} = {E1A5D2B7-10AF-4876-85C0-7714EF274214}
 		{1DC32255-BA1F-4D6D-A9C9-5BD5ED71CAA0} = {E1A5D2B7-10AF-4876-85C0-7714EF274214}
 		{654A027D-1364-4729-880B-144DFE1FF5BB} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
+		{A73DF5A6-866E-4AED-9017-AA2EE86368C4} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2DEAD3CC-486B-4918-A607-50B0DE7B114A}

test/TensorFlow.Kernel.UnitTest/TensorFlow.Kernel.UnitTest.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" />

test/TensorFlowNET.Graph.UnitTest/GradientTest/GradientTest.cs

@@ -625,25 +625,6 @@ namespace TensorFlowNET.UnitTest.Gradient
             }
         }
 
-        // TODO: remove when np.testing.assert_allclose(a, b) is implemented
-        private class CollectionComparer : System.Collections.IComparer
-        {
-            private readonly double _epsilon = 1e-07;
-
-            public int Compare(object x, object y)
-            {
-                var a = (double)x;
-                var b = (double)y;
-
-                double delta = Math.Abs(a - b);
-                if (delta < _epsilon)
-                {
-                    return 0;
-                }
-                return a.CompareTo(b);
-            }
-        }
-
         private struct Case
         {
             public Tensor[] grad1;
@@ -748,8 +729,7 @@ namespace TensorFlowNET.UnitTest.Gradient
                     var npgrad2 = result[1];
                     foreach (var (a, b) in npgrad1.Zip(npgrad2))
                     {
-                        // TODO: np.testing.assert_allclose(a, b);
-                        CollectionAssert.AreEqual(a.ToArray(), b.ToArray(), new CollectionComparer());
+                        self.assertAllClose(a, b);
                     }
                 }
             }

test/TensorFlowNET.Graph.UnitTest/PythonTest.cs

@@ -1,448 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json.Linq;
-using Tensorflow.NumPy;
-using System;
-using System.Collections;
-using System.Linq;
-using Tensorflow;
-using static Tensorflow.Binding;
-using OneOf.Types;
-using System.Collections.Generic;
-
-namespace TensorFlowNET.UnitTest
-{
-    /// <summary>
-    /// Use as base class for test classes to get additional assertions
-    /// </summary>
-    public class PythonTest
-    {
-        #region python compatibility layer
-        protected PythonTest self { get => this; }
-        protected int None => -1;
-        #endregion
-
-        #region pytest assertions
-
-        public void assertItemsEqual(ICollection given, ICollection expected)
-        {
-            if (given is Hashtable && expected is Hashtable)
-            {
-                Assert.AreEqual(JObject.FromObject(expected).ToString(), JObject.FromObject(given).ToString());
-                return;
-            }
-            Assert.IsNotNull(expected);
-            Assert.IsNotNull(given);
-            var e = expected.OfType<object>().ToArray();
-            var g = given.OfType<object>().ToArray();
-            Assert.AreEqual(e.Length, g.Length, $"The collections differ in length expected {e.Length} but got {g.Length}");
-            for (int i = 0; i < e.Length; i++)
-            {
-                /*if (g[i] is NDArray && e[i] is NDArray)
-                    assertItemsEqual((g[i] as NDArray).GetData<object>(), (e[i] as NDArray).GetData<object>());
-                else*/
-                if (e[i] is ICollection && g[i] is ICollection)
-                    assertEqual(g[i], e[i]);
-                else
-                    Assert.AreEqual(e[i], g[i], $"Items differ at index {i}, expected {e[i]} but got {g[i]}");
-            }
-        }
-
-        public void assertAllEqual(ICollection given, ICollection expected)
-        {
-            assertItemsEqual(given, expected);
-        }
-
-        public void assertFloat32Equal(float expected, float actual, string msg)
-        {
-            float eps = 1e-6f;
-            Assert.IsTrue(Math.Abs(expected - actual) < eps * Math.Max(1.0f, Math.Abs(expected)), $"{msg}: expected {expected} vs actual {actual}");
-        }
-
-        public void assertFloat64Equal(double expected, double actual, string msg)
-        {
-            double eps = 1e-16f;
-            Assert.IsTrue(Math.Abs(expected - actual) < eps * Math.Max(1.0f, Math.Abs(expected)), $"{msg}: expected {expected} vs actual {actual}");
-        }
-
-        public void assertEqual(object given, object expected)
-        {
-            /*if (given is NDArray && expected is NDArray)
-            {
-                assertItemsEqual((given as NDArray).GetData<object>(), (expected as NDArray).GetData<object>());
-                return;
-            }*/
-            if (given is Hashtable && expected is Hashtable)
-            {
-                Assert.AreEqual(JObject.FromObject(expected).ToString(), JObject.FromObject(given).ToString());
-                return;
-            }
-            if (given is ICollection && expected is ICollection)
-            {
-                assertItemsEqual(given as ICollection, expected as ICollection);
-                return;
-            }
-            if (given is float && expected is float)
-            {
-                assertFloat32Equal((float)expected, (float)given, "");
-                return;
-            }
-            if (given is double && expected is double)
-            {
-                assertFloat64Equal((double)expected, (double)given, "");
-                return;
-            }
-            Assert.AreEqual(expected, given);
-        }
-
-        public void assertEquals(object given, object expected)
-        {
-            assertEqual(given, expected);
-        }
-
-        public void assert(object given)
-        {
-            if (given is bool)
-                Assert.IsTrue((bool)given);
-            Assert.IsNotNull(given);
-        }
-
-        public void assertIsNotNone(object given)
-        {
-            Assert.IsNotNull(given);
-        }
-
-        public void assertFalse(bool cond)
-        {
-            Assert.IsFalse(cond);
-        }
-
-        public void assertTrue(bool cond)
-        {
-            Assert.IsTrue(cond);
-        }
-
-        public void assertAllClose(NDArray array1, NDArray array2, double eps = 1e-5)
-        {
-            Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
-        }
-
-        public void assertAllClose(double value, NDArray array2, double eps = 1e-5)
-        {
-            var array1 = np.ones_like(array2) * value;
-            // Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
-        }
-
-        public void assertProtoEquals(object toProto, object o)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-
-        #region tensor evaluation and test session
-
-        private Session _cached_session = null;
-        private Graph _cached_graph = null;
-        private object _cached_config = null;
-        private bool _cached_force_gpu = false;
-
-        private void _ClearCachedSession()
-        {
-            if (self._cached_session != null)
-            {
-                self._cached_session.Dispose();
-                self._cached_session = null;
-            }
-        }
-
-
-        //protected object _eval_helper(Tensor[] tensors)
-        //{
-        //    if (tensors == null)
-        //        return null;
-        //    return nest.map_structure(self._eval_tensor, tensors);
-        //}
-
-        protected object _eval_tensor(object tensor)
-        {
-            if (tensor == null)
-                return None;
-            //else if (callable(tensor))
-            //     return self._eval_helper(tensor())
-            else
-            {
-                try
-                {
-                    //TODO:
-                    //       if sparse_tensor.is_sparse(tensor):
-                    //         return sparse_tensor.SparseTensorValue(tensor.indices, tensor.values,
-                    //                                                tensor.dense_shape)
-                    //return (tensor as Tensor).numpy();
-                }
-                catch (Exception)
-                {
-                    throw new ValueError("Unsupported type: " + tensor.GetType());
-                }
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// This function is used in many original tensorflow unit tests to evaluate tensors 
-        /// in a test session with special settings (for instance constant folding off)
-        /// 
-        /// </summary>
-        public T evaluate<T>(Tensor tensor)
-        {
-            object result = null;
-            //  if context.executing_eagerly():
-            //    return self._eval_helper(tensors)
-            //  else:
-            {
-                var sess = tf.Session();
-                var ndarray = tensor.eval(sess);
-                if (typeof(T) == typeof(double))
-                {
-                    double x = ndarray;
-                    result = x;
-                }
-                else if (typeof(T) == typeof(int))
-                {
-                    int x = ndarray;
-                    result = x;
-                }
-                else
-                {
-                    result = ndarray;
-                }
-
-                return (T)result;
-            }
-        }
-
-        ///Returns a TensorFlow Session for use in executing tests.
-        public Session cached_session(
-            Graph graph = null, object config = null, bool use_gpu = false, bool force_gpu = false)
-        {
-            // This method behaves differently than self.session(): for performance reasons
-            // `cached_session` will by default reuse the same session within the same
-            // test.The session returned by this function will only be closed at the end
-            // of the test(in the TearDown function).
-
-            // Use the `use_gpu` and `force_gpu` options to control where ops are run.If
-            // `force_gpu` is True, all ops are pinned to `/ device:GPU:0`. Otherwise, if
-            // `use_gpu` is True, TensorFlow tries to run as many ops on the GPU as
-            // possible.If both `force_gpu and `use_gpu` are False, all ops are pinned to
-            // the CPU.
-
-            // Example:
-            // python
-            // class MyOperatorTest(test_util.TensorFlowTestCase) :
-            //   def testMyOperator(self):
-            //     with self.cached_session() as sess:
-            //       valid_input = [1.0, 2.0, 3.0, 4.0, 5.0]
-            //     result = MyOperator(valid_input).eval()
-            //       self.assertEqual(result, [1.0, 2.0, 3.0, 5.0, 8.0]
-            //       invalid_input = [-1.0, 2.0, 7.0]
-            //     with self.assertRaisesOpError("negative input not supported"):
-            //         MyOperator(invalid_input).eval()
-
-
-            // Args:
-            //   graph: Optional graph to use during the returned session.
-            //   config: An optional config_pb2.ConfigProto to use to configure the
-            //     session.
-            //   use_gpu: If True, attempt to run as many ops as possible on GPU.
-            //   force_gpu: If True, pin all ops to `/device:GPU:0`.
-
-            // Yields:
-            //   A Session object that should be used as a context manager to surround
-            //   the graph building and execution code in a test case.
-
-
-            // TODO:
-            //  if context.executing_eagerly():
-            //    return self._eval_helper(tensors)
-            //  else:
-            {
-                var sess = self._get_cached_session(
-                    graph, config, force_gpu, crash_if_inconsistent_args: true);
-                using var cached = self._constrain_devices_and_set_default(sess, use_gpu, force_gpu);
-                return cached; 
-            }
-        }
-
-        //Returns a TensorFlow Session for use in executing tests.
-        public Session session(Graph graph = null, object config = null, bool use_gpu = false, bool force_gpu = false)
-        {
-            //Note that this will set this session and the graph as global defaults.
-
-            //Use the `use_gpu` and `force_gpu` options to control where ops are run.If
-            //`force_gpu` is True, all ops are pinned to `/device:GPU:0`. Otherwise, if
-            //`use_gpu` is True, TensorFlow tries to run as many ops on the GPU as
-            //possible.If both `force_gpu and `use_gpu` are False, all ops are pinned to
-            //the CPU.
-
-            //Example:
-            //```python
-            //class MyOperatorTest(test_util.TensorFlowTestCase):
-            //  def testMyOperator(self):
-            //    with self.session(use_gpu= True):
-            //      valid_input = [1.0, 2.0, 3.0, 4.0, 5.0]
-            //    result = MyOperator(valid_input).eval()
-            //      self.assertEqual(result, [1.0, 2.0, 3.0, 5.0, 8.0]
-            //      invalid_input = [-1.0, 2.0, 7.0]
-            //    with self.assertRaisesOpError("negative input not supported"):
-            //        MyOperator(invalid_input).eval()
-            //```
-
-            //Args:
-            //  graph: Optional graph to use during the returned session.
-            //  config: An optional config_pb2.ConfigProto to use to configure the
-            //    session.
-            //  use_gpu: If True, attempt to run as many ops as possible on GPU.
-            //  force_gpu: If True, pin all ops to `/device:GPU:0`.
-
-            //Yields:
-            //  A Session object that should be used as a context manager to surround
-            //  the graph building and execution code in a test case.
-
-            Session s = null;
-            //if (context.executing_eagerly())
-            //  yield None
-            //else 
-            //{
-            s = self._create_session(graph, config, force_gpu);
-            //}
-            return s.as_default();
-        }
-
-        private Session _constrain_devices_and_set_default(Session sess, bool use_gpu, bool force_gpu)
-        {
-            // Set the session and its graph to global default and constrain devices."""
-            if (tf.executing_eagerly())
-                return null;
-            else {
-                sess.graph.as_default();
-                sess.as_default();
-                {
-                    if (force_gpu)
-                    {
-                        // TODO:
-
-                        // Use the name of an actual device if one is detected, or
-                        // '/device:GPU:0' otherwise
-                        /* var gpu_name = gpu_device_name();
-                        if (!gpu_name)
-                            gpu_name = "/device:GPU:0"
-                        using (sess.graph.device(gpu_name)) {
-                            yield return sess;
-                        }*/
-                        return sess;
-                    }
-                    else if (use_gpu)
-                        return sess;
-                    else 
-                        using (sess.graph.device("/device:CPU:0"))
-                            return sess;
-                }
-                
-            }
-        }
-
-        // See session() for details.
-        private Session _create_session(Graph graph, object cfg, bool forceGpu)
-        {
-            var prepare_config = new Func<object, object>((config) =>
-            {
-                //  """Returns a config for sessions.
-                //  Args:
-                //        config: An optional config_pb2.ConfigProto to use to configure the
-                //      session.
-                //  Returns:
-                //    A config_pb2.ConfigProto object.
-
-                //TODO: config
-
-                //  # use_gpu=False. Currently many tests rely on the fact that any device
-                //  # will be used even when a specific device is supposed to be used.
-                //  allow_soft_placement = not force_gpu
-                //  if config is None:
-                //    config = config_pb2.ConfigProto()
-                //    config.allow_soft_placement = allow_soft_placement
-                //    config.gpu_options.per_process_gpu_memory_fraction = 0.3
-                //  elif not allow_soft_placement and config.allow_soft_placement:
-                //    config_copy = config_pb2.ConfigProto()
-                //    config_copy.CopyFrom(config)
-                //    config = config_copy
-                //    config.allow_soft_placement = False
-                //  # Don't perform optimizations for tests so we don't inadvertently run
-                //  # gpu ops on cpu
-                //  config.graph_options.optimizer_options.opt_level = -1
-                //  # Disable Grappler constant folding since some tests & benchmarks
-                //  # use constant input and become meaningless after constant folding.
-                //  # DO NOT DISABLE GRAPPLER OPTIMIZERS WITHOUT CONSULTING WITH THE
-                //  # GRAPPLER TEAM.
-                //  config.graph_options.rewrite_options.constant_folding = (
-                //      rewriter_config_pb2.RewriterConfig.OFF)
-                //  config.graph_options.rewrite_options.pin_to_host_optimization = (
-                //      rewriter_config_pb2.RewriterConfig.OFF)
-                return config;
-            });
-            //TODO: use this instead of normal session
-            //return new ErrorLoggingSession(graph = graph, config = prepare_config(config))
-            return new Session(graph);//, config = prepare_config(config))
-        }
-
-        private Session _get_cached_session(
-                          Graph graph = null,
-                          object config = null,
-                          bool force_gpu = false,
-                          bool crash_if_inconsistent_args = true)
-        {
-            // See cached_session() for documentation.
-            if (self._cached_session == null)
-            {
-                var sess = self._create_session(graph, config, force_gpu);
-                self._cached_session = sess;
-                self._cached_graph = graph;
-                self._cached_config = config;
-                self._cached_force_gpu = force_gpu;
-                return sess;
-            } else {
-
-                if (crash_if_inconsistent_args && !self._cached_graph.Equals(graph))
-                    throw new ValueError(@"The graph used to get the cached session is 
-                                           different than the one that was used to create the
-                                           session. Maybe create a new session with 
-                                           self.session()");
-                if (crash_if_inconsistent_args && !self._cached_config.Equals(config)) {
-                    throw new ValueError(@"The config used to get the cached session is 
-                                           different than the one that was used to create the 
-                                           session. Maybe create a new session with 
-                                           self.session()");
-                }
-                if (crash_if_inconsistent_args && !self._cached_force_gpu.Equals(force_gpu)) {
-                    throw new ValueError(@"The force_gpu value used to get the cached session is 
-                                           different than the one that was used to create the 
-                                           session. Maybe create a new session with 
-                                           self.session()");
-                }
-                return _cached_session;
-            }
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            _ClearCachedSession();
-        }
-
-        #endregion
-
-        public void AssetSequenceEqual<T>(T[] a, T[] b)
-        {
-            Assert.IsTrue(Enumerable.SequenceEqual(a, b));
-        }
-    }
-}

test/TensorFlowNET.Graph.UnitTest/TensorFlowNET.Graph.UnitTest.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">
@@ -36,6 +36,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
     <ProjectReference Include="..\..\tools\Tensorflow.UnitTest.RedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
+    <ProjectReference Include="..\Tensorflow.UnitTest\Tensorflow.UnitTest.csproj" />
     <ProjectReference Include="..\TensorFlowNET.Keras.UnitTest\Tensorflow.Keras.UnitTest.csproj" />
   </ItemGroup>
 

test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">
@@ -25,6 +25,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Keras\Tensorflow.Keras.csproj" />
     <ProjectReference Include="..\..\tools\Tensorflow.UnitTest.RedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
+    <ProjectReference Include="..\TensorFlow.Kernel.UnitTest\TensorFlow.Kernel.UnitTest.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/TensorFlowNET.Native.UnitTest/Tensorflow.Native.UnitTest.csproj

@@ -44,7 +44,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">

test/TensorFlowNET.UnitTest/Tensorflow.Binding.UnitTest.csproj

@@ -51,6 +51,7 @@
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
     <ProjectReference Include="..\..\src\TensorFlowNET.Text\Tensorflow.Text.csproj" />
     <ProjectReference Include="..\..\tools\Tensorflow.UnitTest.RedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
+    <ProjectReference Include="..\Tensorflow.UnitTest\Tensorflow.UnitTest.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/TensorFlowNET.UnitTest/PythonTest.cs → test/Tensorflow.UnitTest/PythonTest.cs

@@ -1,12 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Linq;
 using Tensorflow.NumPy;
-using System;
 using System.Collections;
-using System.Linq;
 using Tensorflow;
 using static Tensorflow.Binding;
-using System.Collections.Generic;
 
 namespace TensorFlowNET.UnitTest
 {
@@ -89,9 +86,9 @@ namespace TensorFlowNET.UnitTest
                 Assert.AreEqual(JObject.FromObject(expected).ToString(), JObject.FromObject(given).ToString());
                 return;
             }
-            if (given is ICollection && expected is ICollection)
+            if (given is ICollection collectionGiven && expected is ICollection collectionExpected)
             {
-                assertItemsEqual(given as ICollection, expected as ICollection);
+                assertItemsEqual(collectionGiven, collectionExpected);
                 return;
             }
             if (given is float && expected is float)
@@ -136,13 +133,23 @@ namespace TensorFlowNET.UnitTest
 
         public void assertAllClose(NDArray array1, NDArray array2, double eps = 1e-5)
         {
-            Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
+            CollectionAssert.AreEqual(array1.ToArray(), array2.ToArray(), new CollectionComparer(eps));
+
+            //TODO: Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
         }
 
         public void assertAllClose(double value, NDArray array2, double eps = 1e-5)
         {
+            if (array2.shape.IsScalar)
+            {
+                double value2 = array2;
+                Assert.AreEqual(value, value2, eps);
+                return;
+            }
             var array1 = np.ones_like(array2) * value;
-            Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
+            CollectionAssert.AreEqual(array1.ToArray(), array2.ToArray(), new CollectionComparer(eps));
+
+            //TODO: Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
         }
 
         private class CollectionComparer : IComparer
@@ -153,8 +160,21 @@ namespace TensorFlowNET.UnitTest
             {
                 _epsilon = eps;
             }
-            public int Compare(object x, object y)
+            public int Compare(object? x, object? y)
             {
+                if (x == null && y == null)
+                {
+                    return 0;
+                }
+                else if (x == null)
+                {
+                    return -1;
+                }
+                else if (y == null)
+                {
+                    return 1;
+                }
+
                 var a = (double)x;
                 var b = (double)y;
 
@@ -188,9 +208,9 @@ namespace TensorFlowNET.UnitTest
 
         #region tensor evaluation and test session
 
-        private Session _cached_session = null;
-        private Graph _cached_graph = null;
-        private object _cached_config = null;
+        private Session? _cached_session = null;
+        private Graph? _cached_graph = null;
+        private object? _cached_config = null;
         private bool _cached_force_gpu = false;
 
         private void _ClearCachedSession()
@@ -209,7 +229,7 @@ namespace TensorFlowNET.UnitTest
         //    return nest.map_structure(self._eval_tensor, tensors);
         //}
 
-        protected object _eval_tensor(object tensor)
+        protected object? _eval_tensor(object tensor)
         {
             if (tensor == null)
                 return None;
@@ -240,7 +260,7 @@ namespace TensorFlowNET.UnitTest
         /// </summary>
         public T evaluate<T>(Tensor tensor)
         {
-            object result = null;
+            object? result = null;
             //  if context.executing_eagerly():
             //    return self._eval_helper(tensors)
             //  else:
@@ -276,8 +296,8 @@ namespace TensorFlowNET.UnitTest
 
 
         ///Returns a TensorFlow Session for use in executing tests.
-        public Session cached_session(
-            Graph graph = null, object config = null, bool use_gpu = false, bool force_gpu = false)
+        public Session? cached_session(
+            Graph? graph = null, object? config = null, bool use_gpu = false, bool force_gpu = false)
         {
             // This method behaves differently than self.session(): for performance reasons
             // `cached_session` will by default reuse the same session within the same
@@ -328,7 +348,7 @@ namespace TensorFlowNET.UnitTest
         }
 
         //Returns a TensorFlow Session for use in executing tests.
-        public Session session(Graph graph = null, object config = null, bool use_gpu = false, bool force_gpu = false)
+        public Session session(Graph? graph = null, object? config = null, bool use_gpu = false, bool force_gpu = false)
         {
             //Note that this will set this session and the graph as global defaults.
 
@@ -362,7 +382,7 @@ namespace TensorFlowNET.UnitTest
             //  A Session object that should be used as a context manager to surround
             //  the graph building and execution code in a test case.
 
-            Session s = null;
+            Session? s = null;
             //if (context.executing_eagerly())
             //  yield None
             //else 
@@ -372,7 +392,7 @@ namespace TensorFlowNET.UnitTest
             return s.as_default();
         }
 
-        private Session _constrain_devices_and_set_default(Session sess, bool use_gpu, bool force_gpu)
+        private Session? _constrain_devices_and_set_default(Session sess, bool use_gpu, bool force_gpu)
         {
             // Set the session and its graph to global default and constrain devices."""
             if (tf.executing_eagerly())
@@ -407,7 +427,7 @@ namespace TensorFlowNET.UnitTest
         }
 
         // See session() for details.
-        private Session _create_session(Graph graph, object cfg, bool forceGpu)
+        private Session _create_session(Graph? graph, object? cfg, bool forceGpu)
         {
             var prepare_config = new Func<object, object>((config) =>
             {
@@ -451,8 +471,8 @@ namespace TensorFlowNET.UnitTest
         }
 
         private Session _get_cached_session(
-                          Graph graph = null,
-                          object config = null,
+                          Graph? graph = null,
+                          object? config = null,
                           bool force_gpu = false,
                           bool crash_if_inconsistent_args = true)
         {
@@ -488,7 +508,7 @@ namespace TensorFlowNET.UnitTest
                                            session. Maybe create a new session with 
                                            self.session()");
                 }
-                return _cached_session;
+                return self._cached_session;
             }
         }
 

test/Tensorflow.UnitTest/Tensorflow.UnitTest.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
+    <ProjectReference Include="..\..\tools\Tensorflow.UnitTest.RedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
+  </ItemGroup>
+
+</Project>

test/TensorflowNET.Hub.Unittest/Tensorflow.Hub.Unittest.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />