From 14e486b767dac559c6ade05544bc48ac0958ba3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Do=C5=82bniak?= <tomasz.dolbniak@intel.com>
Date: Thu, 10 Jun 2021 22:34:36 +0200
Subject: [PATCH] MVN test with opset6 version of the op (#6111)

---
 ngraph/python/tests/__init__.py               |  1 -
 .../tests/test_ngraph/test_ops_fused.py       | 29 +++++++++----------
 ngraph/test/runtime/ie/unit_test.manifest     |  8 -----
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/ngraph/python/tests/__init__.py b/ngraph/python/tests/__init__.py
index f54930f40d9..817d4584534 100644
--- a/ngraph/python/tests/__init__.py
+++ b/ngraph/python/tests/__init__.py
@@ -51,7 +51,6 @@ xfail_issue_35923 = xfail_test(reason="RuntimeError: PReLU without weights is no
 xfail_issue_35927 = xfail_test(reason="RuntimeError: B has zero dimension that is not allowable")
 xfail_issue_36486 = xfail_test(reason="RuntimeError: HardSigmoid operation should be converted "
                                       "to HardSigmoid_IE")
-xfail_issue_36487 = xfail_test(reason="Assertion error - mvn operator computation mismatch")
 xfail_issue_38084 = xfail_test(reason="RuntimeError: AssertionFailed: layer->get_output_partial_shape(i)"
                                       "is_static() nGraph <value> operation with name: <value> cannot be"
                                       "converted to <value> layer with name: <value> because output"
diff --git a/ngraph/python/tests/test_ngraph/test_ops_fused.py b/ngraph/python/tests/test_ngraph/test_ops_fused.py
index 48fff1623c5..d96f870f604 100644
--- a/ngraph/python/tests/test_ngraph/test_ops_fused.py
+++ b/ngraph/python/tests/test_ngraph/test_ops_fused.py
@@ -6,9 +6,7 @@ import pytest
 
 import ngraph as ng
 from tests.runtime import get_runtime
-from tests import (xfail_issue_36486,
-                   xfail_issue_36487,
-                   xfail_issue_44976)
+from tests import (xfail_issue_36486, xfail_issue_44976)
 
 
 def test_elu_operator_with_scalar_and_array():
@@ -424,14 +422,14 @@ def test_hard_sigmoid_operator():
     assert np.allclose(result, expected)
 
 
-@xfail_issue_36487
 def test_mvn_operator():
     runtime = get_runtime()
 
     data_shape = [3, 3, 3, 1]
-    across_channels = True
+    axes = [0, 2, 3]
     normalize_variance = True
     eps = np.float32(1e-9)
+    eps_mode = "outside_sqrt"
 
     data_value = np.array(
         [
@@ -456,7 +454,7 @@ def test_mvn_operator():
 
     parameter_data = ng.parameter(data_shape, name="Data", dtype=np.float32)
 
-    model = ng.mvn(parameter_data, across_channels, normalize_variance, eps)
+    model = ng.mvn(parameter_data, axes, normalize_variance, eps, eps_mode)
     computation = runtime.computation(model, parameter_data)
 
     result = computation(data_value)
@@ -464,21 +462,22 @@ def test_mvn_operator():
     expected = np.array(
         [
             [
-                [[0.9951074], [0.14548765], [-1.410561]],
-                [[-1.4999886], [-1.1923014], [-0.03975919]],
-                [[0.8463296], [1.2926502], [1.3340596]],
+                [[1.3546423], [0.33053496], [-1.5450814]],
+                [[-1.2106764], [-0.8925952], [0.29888135]],
+                [[0.38083088], [0.81808794], [0.85865635]],
             ],
             [
-                [[-1.0463363], [-0.1747985], [-0.7784088]],
-                [[0.47672555], [-1.5383], [0.32375798]],
-                [[1.2404392], [1.3878832], [-1.2228798]],
+                [[-1.1060555], [-0.05552877], [-0.78310335]],
+                [[0.83281356], [-1.250282], [0.67467856]],
+                [[0.7669372], [0.9113869], [-1.6463585]],
             ],
             [
-                [[-0.3228847], [1.2063044], [0.22751297]],
-                [[0.91956615], [0.81839436], [-1.2279599]],
-                [[0.5312334], [0.067952], [-1.3592235]],
+                [[-0.23402764], [1.6092131], [0.42940593]],
+                [[1.2906139], [1.1860244], [-0.92945826]],
+                [[0.0721334], [-0.38174], [-1.7799333]],
             ],
         ],
+        dtype=np.float32,
     )
 
     assert np.allclose(result, expected)
diff --git a/ngraph/test/runtime/ie/unit_test.manifest b/ngraph/test/runtime/ie/unit_test.manifest
index c476f2dfac3..f95ce0d951e 100644
--- a/ngraph/test/runtime/ie/unit_test.manifest
+++ b/ngraph/test/runtime/ie/unit_test.manifest
@@ -1667,14 +1667,6 @@ IE_CPU.evaluate_ctc_greedy_decoder_seq_len_f16
 minimum_u16
 IE_CPU/ElemTypesTests/1.onnx_test_add_abc_set_precission
 
-# not implemented in CPU and GPU
-evaluate_mvn_6_no_variance
-evaluate_mvn_6
-evaluate_mvn_6_inside_sqrt
-evaluate_mvn_6_across_chanells
-evaluate_mvn_6_across_batch
-IE_CPU.onnx_mvn_v6
-
 # not yet implemented on CPU/GPU Gather 7
 gather_v7_data_int32_2d_indices_axis_1_negative_batch_dims
 gather_v7_1d_int32