diff --git a/tests/ut/data/dataset/golden/zip_02_result.npz b/tests/ut/data/dataset/golden/zip_02_result.npz index 00a59e585d..90f9883d34 100644 Binary files a/tests/ut/data/dataset/golden/zip_02_result.npz and b/tests/ut/data/dataset/golden/zip_02_result.npz differ diff --git a/tests/ut/data/dataset/golden/zip_03_result.npz b/tests/ut/data/dataset/golden/zip_03_result.npz index 0e1d28a159..ad6bde9ff2 100644 Binary files a/tests/ut/data/dataset/golden/zip_03_result.npz and b/tests/ut/data/dataset/golden/zip_03_result.npz differ diff --git a/tests/ut/data/dataset/golden/zip_04_result.npz b/tests/ut/data/dataset/golden/zip_04_result.npz index 6e0a859d0b..425d717713 100644 Binary files a/tests/ut/data/dataset/golden/zip_04_result.npz and b/tests/ut/data/dataset/golden/zip_04_result.npz differ diff --git a/tests/ut/python/dataset/test_decode.py b/tests/ut/python/dataset/test_decode.py index 6e4dd332de..47426812a7 100644 --- a/tests/ut/python/dataset/test_decode.py +++ b/tests/ut/python/dataset/test_decode.py @@ -20,16 +20,13 @@ import mindspore.dataset.transforms.vision.c_transforms as vision import numpy as np import mindspore.dataset as ds from mindspore import log as logger +from util import diff_mse + DATA_DIR = ["../data/dataset/test_tf_file_3_images/train-0000-of-0001.data"] SCHEMA_DIR = "../data/dataset/test_tf_file_3_images/datasetSchema.json" -def diff_mse(in1, in2): - mse = (np.square(in1.astype(float) / 255 - in2.astype(float) / 255)).mean() - return mse * 100 - - def test_decode_op(): """ Test Decode op diff --git a/tests/ut/python/dataset/test_zip.py b/tests/ut/python/dataset/test_zip.py index 2aa86eddfc..e6512ff74d 100644 --- a/tests/ut/python/dataset/test_zip.py +++ b/tests/ut/python/dataset/test_zip.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================== -from util import save_and_check_dict +from util import save_and_check_dict, save_and_check_md5 from mindspore import log as logger import mindspore.dataset as ds @@ -58,7 +58,7 @@ def test_zip_02(): dataz = ds.zip((data1, data2)) # Note: zipped dataset has 3 rows and 4 columns filename = "zip_02_result.npz" - save_and_check_dict(dataz, filename, generate_golden=GENERATE_GOLDEN) + save_and_check_md5(dataz, filename, generate_golden=GENERATE_GOLDEN) def test_zip_03(): @@ -72,7 +72,7 @@ def test_zip_03(): dataz = ds.zip((data1, data2)) # Note: zipped dataset has 3 rows and 7 columns filename = "zip_03_result.npz" - save_and_check_dict(dataz, filename, generate_golden=GENERATE_GOLDEN) + save_and_check_md5(dataz, filename, generate_golden=GENERATE_GOLDEN) def test_zip_04(): @@ -87,7 +87,7 @@ def test_zip_04(): dataz = ds.zip((data1, data2, data3)) # Note: zipped dataset has 3 rows and 9 columns filename = "zip_04_result.npz" - save_and_check_dict(dataz, filename, generate_golden=GENERATE_GOLDEN) + save_and_check_md5(dataz, filename, generate_golden=GENERATE_GOLDEN) def test_zip_05():