Cleanup dataset UT: use md5 npz in test_zip for images

pull/1019/head
Cathy Wong 5 years ago
parent 47f5abceb4
commit 58226addd6

@ -20,16 +20,13 @@ import mindspore.dataset.transforms.vision.c_transforms as vision
import numpy as np import numpy as np
import mindspore.dataset as ds import mindspore.dataset as ds
from mindspore import log as logger 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"] 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" 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(): def test_decode_op():
""" """
Test Decode op Test Decode op

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 from mindspore import log as logger
import mindspore.dataset as ds import mindspore.dataset as ds
@ -58,7 +58,7 @@ def test_zip_02():
dataz = ds.zip((data1, data2)) dataz = ds.zip((data1, data2))
# Note: zipped dataset has 3 rows and 4 columns # Note: zipped dataset has 3 rows and 4 columns
filename = "zip_02_result.npz" 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(): def test_zip_03():
@ -72,7 +72,7 @@ def test_zip_03():
dataz = ds.zip((data1, data2)) dataz = ds.zip((data1, data2))
# Note: zipped dataset has 3 rows and 7 columns # Note: zipped dataset has 3 rows and 7 columns
filename = "zip_03_result.npz" 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(): def test_zip_04():
@ -87,7 +87,7 @@ def test_zip_04():
dataz = ds.zip((data1, data2, data3)) dataz = ds.zip((data1, data2, data3))
# Note: zipped dataset has 3 rows and 9 columns # Note: zipped dataset has 3 rows and 9 columns
filename = "zip_04_result.npz" 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(): def test_zip_05():

Loading…
Cancel
Save