From 1caa2012bbedef5a5645cd64d7118bbfa8169187 Mon Sep 17 00:00:00 2001
From: Cathy Wong <cathy.wong@huawei.com>
Date: Thu, 12 May 2022 16:00:08 -0400
Subject: [PATCH] [MD] Normalize md5 tests - new golden files, unskip tests

---
 .../dataset/golden/normalize_01_c_result.npz    | Bin 644 -> 644 bytes
 .../golden/normalize_01_to_pil_result.npz       | Bin 644 -> 644 bytes
 .../golden/normalize_02_to_pil_result.npz       | Bin 644 -> 644 bytes
 .../golden/normalize_03_to_pil_result.npz       | Bin 644 -> 644 bytes
 .../golden/normalize_04_to_pil_result.npz       | Bin 644 -> 644 bytes
 tests/ut/python/dataset/test_normalize_op.py    |  16 ++++++++--------
 .../dataset_deprecated/test_normalize_op.py     |  16 ++++++++--------
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/ut/data/dataset/golden/normalize_01_c_result.npz b/tests/ut/data/dataset/golden/normalize_01_c_result.npz
index 031e48f4f569ce258f018ae2d326cf452009e7f8..9222f48571246b0cdc267ae357719196429e5094 100644
GIT binary patch
delta 99
zcmZo+ZDAD(@MdNaVSoTdhEt~se{B?6z$maZ#_rjgc?(`N)`S!;oLB!~@*zeQ0mu5Q
yukIXE+|zFuTjy+YGIH`apy0K0p2yo>TUYNl&njd&(48|`i%FIRWX@!7CQAS@94Mav

delta 99
zcmZo+ZDAD(@MdNaVSoTdhNSfemuwVTz$g%>G0nZUfTehe?6NPH4u8Bb`4FRufRkSQ
yV}^5U7nbi$7d_^md42LXprF2Jw&dyD_&a-6Szj&K%qTrsi%FIRWX@!7CQAT(79`jJ

diff --git a/tests/ut/data/dataset/golden/normalize_01_to_pil_result.npz b/tests/ut/data/dataset/golden/normalize_01_to_pil_result.npz
index 6c8abf960ddb3d24e2c5476601c6c3c63abf7736..9d794aa5f2331aca3728595469f9b43619c0922d 100644
GIT binary patch
delta 98
zcmZo+ZDAD(@MdNaVSoTdhTq~_g*FN;U=-Nxc5CI=+h?0w)~=edJ2&#><U@=q{6Ti{
z`3G;$*4c60CduD!-sG>0ssfsBQ%~`;z5Olhc3OPGq$v5xT1>JmAY&$bGg$%vsBI*j

delta 98
zcmZo+ZDAD(@MdNaVSoTdhL#l;^&5p2FbYg>TEFf5#oWG5mYYX*9MqjX`4FQD{}s2r
yi(L4+*G^yXYfZL>!{o1wssdMH9&7pD2vC&~6y5P&Sjua%7LzOs$e79AOqKwL9wX!c

diff --git a/tests/ut/data/dataset/golden/normalize_02_to_pil_result.npz b/tests/ut/data/dataset/golden/normalize_02_to_pil_result.npz
index a4fc2715fe7e4ef4bcfc3da77e429f23cd351ce0..82ab777c10b0f8d4276f955cbe17d58934ec7c0d 100644
GIT binary patch
delta 99
zcmZo+ZDAD(@MdNaVSoTdhNHfJ@-_-BU=+BowQgnllC6J?ji+mG*fx)E@*zeQf&B~h
y7Vqk?c^g_NWalYzE@SdHpkPA!jpIFs{1%Jtp4yYa%UnBIi%FIRWX@!7CQAU66C}_8

delta 99
zcmZo+ZDAD(@MdNaVSoTdhUOmG3mb(NFbe!oJyFA?t579AgNuV(WA=o}hZt1^#L9B3
x!})kF6a>UOz3ZJTJoy_?a2lt4)N3J;YjYp7T{m#pt3O$bNtOj<&SY;UO8`}c9_s)A

diff --git a/tests/ut/data/dataset/golden/normalize_03_to_pil_result.npz b/tests/ut/data/dataset/golden/normalize_03_to_pil_result.npz
index 6f136e324cf0b62e61ab03de435b36518e5630b0..44db3250a6a7252627f329bee25882bccd2a08d5 100644
GIT binary patch
delta 99
zcmZo+ZDAD(@MdNaVSoTdhRqwEEZ!)zfKgz!fp&tlcjM{qtJUWBf}cH~e27s+VEUn_
z2~)GSuYO)8oNJq%Yc}~CQ1C{W+-y_T`EPD*IXY?fl&upcYca{PfXtcf&14Ax){-ab

delta 99
zcmZo+ZDAD(@MdNaVSoTdhSEzWsvCtCFbasTbo{*SVP#OTh{?|MIqUaLKE$XZup#Z$
yISm`{zgL2DI+?D&t)2W0C>YS2@yoqkLvPauWA(ZBWb`I$G0C!k%$e-XWC;LeR3r!h

diff --git a/tests/ut/data/dataset/golden/normalize_04_to_pil_result.npz b/tests/ut/data/dataset/golden/normalize_04_to_pil_result.npz
index 1a5f55c69f07c9f8729896de16e5d524c094c443..a51404c5c3829a1d0466031c5038ba6216786feb 100644
GIT binary patch
delta 99
zcmZo+ZDAD(@MdNaVSoTd2H!>{;f+EI7zK_^n|{~l{fB8vx*KYiPJ4P|@*zeQ0Y<K0
yvz=eQ^lrIxD?c}0ZO`OyK*4A2TuawKy{XF)r(S<1iu?CuEhbqOkU5jRnJfXNh9v+1

delta 99
zcmZo+ZDAD(@MdNaVSoTdhAF4Jc{d6zU=)Zy(A^_g;S$BbA8Gd|@%XyQhZt1^T6sfn
xzvtNAlVbX^JvcD<&*X1F!C6_heH$4kIm~}%$-8O4D$issCRrAcIg`DaECB$!A}jy^

diff --git a/tests/ut/python/dataset/test_normalize_op.py b/tests/ut/python/dataset/test_normalize_op.py
index 83bdf2b51d9..d138c067321 100644
--- a/tests/ut/python/dataset/test_normalize_op.py
+++ b/tests/ut/python/dataset/test_normalize_op.py
@@ -205,7 +205,7 @@ def test_decode_normalize_op():
         num_iter += 1
 
 
-def skip_test_normalize_md5_01():
+def test_normalize_md5_01():
     """
     Test Normalize with md5 check: valid mean and std
     expected to pass
@@ -221,7 +221,7 @@ def skip_test_normalize_md5_01():
     save_and_check_md5(data_py, filename2, generate_golden=GENERATE_GOLDEN)
 
 
-def skip_test_normalize_md5_02():
+def test_normalize_md5_02():
     """
     Test Normalize with md5 check: len(mean)=len(std)=1 with RGB images
     expected to pass
@@ -310,7 +310,7 @@ def test_normalize_exception_invalid_range():
         assert "Input mean_value is not within the required interval of [0.0, 1.0]." in str(e)
 
 
-def skip_test_normalize_grayscale_md5_01():
+def test_normalize_grayscale_md5_01():
     """
     Test Normalize with md5 check: len(mean)=len(std)=1 with 1 channel grayscale images
     expected to pass
@@ -322,7 +322,7 @@ def skip_test_normalize_grayscale_md5_01():
     save_and_check_md5(data, filename, generate_golden=GENERATE_GOLDEN)
 
 
-def skip_test_normalize_grayscale_md5_02():
+def test_normalize_grayscale_md5_02():
     """
     Test Normalize with md5 check: len(mean)=len(std)=3 with 3 channel grayscale images
     expected to pass
@@ -452,15 +452,15 @@ if __name__ == "__main__":
     test_decode_normalize_op()
     test_normalize_op_hwc(plot=True)
     test_normalize_op_chw(plot=True)
-    skip_test_normalize_md5_01()
-    skip_test_normalize_md5_02()
+    test_normalize_md5_01()
+    test_normalize_md5_02()
     test_normalize_exception_unequal_size_1()
     test_normalize_exception_out_of_range()
     test_normalize_exception_unequal_size_2()
     test_normalize_exception_invalid_size()
     test_normalize_exception_invalid_range()
-    skip_test_normalize_grayscale_md5_01()
-    skip_test_normalize_grayscale_md5_02()
+    test_normalize_grayscale_md5_01()
+    test_normalize_grayscale_md5_02()
     test_normalize_grayscale_exception()
     test_multiple_channels()
     test_normalize_eager_hwc()
diff --git a/tests/ut/python/dataset_deprecated/test_normalize_op.py b/tests/ut/python/dataset_deprecated/test_normalize_op.py
index 99f3eaa6ca0..437cd67ec22 100644
--- a/tests/ut/python/dataset_deprecated/test_normalize_op.py
+++ b/tests/ut/python/dataset_deprecated/test_normalize_op.py
@@ -162,7 +162,7 @@ def test_normalize_op_py(plot=False):
         num_iter += 1
 
 
-def skip_test_normalize_md5_01():
+def test_normalize_md5_01():
     """
     Feature: Normalize Op
     Description: Test C++ op and Python op in same dataset pipeline
@@ -179,7 +179,7 @@ def skip_test_normalize_md5_01():
     save_and_check_md5(data_py, filename2, generate_golden=GENERATE_GOLDEN)
 
 
-def skip_test_normalize_md5_02():
+def test_normalize_md5_02():
     """
     Feature: Normalize Op
     Description: Test Python op with len(mean)=len(std)=1 and RGB images
@@ -269,7 +269,7 @@ def test_normalize_exception_invalid_range_py():
         assert "Input mean_value is not within the required interval of [0.0, 1.0]." in str(e)
 
 
-def skip_test_normalize_grayscale_md5_01():
+def test_normalize_grayscale_md5_01():
     """
     Feature: Normalize Op
     Description: Test Python op with len(mean)=len(std)=1 and 1 channel grayscale images
@@ -282,7 +282,7 @@ def skip_test_normalize_grayscale_md5_01():
     save_and_check_md5(data, filename, generate_golden=GENERATE_GOLDEN)
 
 
-def skip_test_normalize_grayscale_md5_02():
+def test_normalize_grayscale_md5_02():
     """
     Feature: Normalize Op
     Description: Test Python op with len(mean)=len(std)=1 and 3 channel grayscale images
@@ -348,12 +348,12 @@ def test_multiple_channels():
 if __name__ == "__main__":
     test_normalize_op_c(plot=True)
     test_normalize_op_py(plot=True)
-    skip_test_normalize_md5_01()
-    skip_test_normalize_md5_02()
+    test_normalize_md5_01()
+    test_normalize_md5_02()
     test_normalize_exception_unequal_size_c()
     test_normalize_exception_unequal_size_py()
     test_normalize_exception_invalid_size_py()
     test_normalize_exception_invalid_range_py()
-    skip_test_normalize_grayscale_md5_01()
-    skip_test_normalize_grayscale_md5_02()
+    test_normalize_grayscale_md5_01()
+    test_normalize_grayscale_md5_02()
     test_normalize_grayscale_exception()