From ee6415bd1cb21102be7d4c49df88442877bc1f35 Mon Sep 17 00:00:00 2001 From: Hamdi Sahloul Date: Sat, 1 Sep 2018 23:56:40 +0900 Subject: [PATCH] Improves a UMat unit test --- modules/python/test/test_umat.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/python/test/test_umat.py b/modules/python/test/test_umat.py index 004d70171b..102bb12bfb 100644 --- a/modules/python/test/test_umat.py +++ b/modules/python/test/test_umat.py @@ -73,14 +73,17 @@ class UMat(NewOpenCVTests): _p1_mask_err = cv.calcOpticalFlowPyrLK(img1, img2, p0, None) - _p1_mask_err_umat0 = map(cv.UMat.get, cv.calcOpticalFlowPyrLK(img1, img2, p0_umat, None)) - _p1_mask_err_umat1 = map(cv.UMat.get, cv.calcOpticalFlowPyrLK(cv.UMat(img1), img2, p0_umat, None)) - _p1_mask_err_umat2 = map(cv.UMat.get, cv.calcOpticalFlowPyrLK(img1, cv.UMat(img2), p0_umat, None)) + _p1_mask_err_umat0 = list(map(lambda umat: umat.get(), cv.calcOpticalFlowPyrLK(img1, img2, p0_umat, None))) + _p1_mask_err_umat1 = list(map(lambda umat: umat.get(), cv.calcOpticalFlowPyrLK(cv.UMat(img1), img2, p0_umat, None))) + _p1_mask_err_umat2 = list(map(lambda umat: umat.get(), cv.calcOpticalFlowPyrLK(img1, cv.UMat(img2), p0_umat, None))) - # # results of OCL optical flow differs from CPU implementation, so result can not be easily compared - # for p1_mask_err_umat in [p1_mask_err_umat0, p1_mask_err_umat1, p1_mask_err_umat2]: - # for data, data_umat in zip(p1_mask_err, p1_mask_err_umat): - # self.assertTrue(np.allclose(data, data_umat)) + for _p1_mask_err_umat in [_p1_mask_err_umat0, _p1_mask_err_umat1, _p1_mask_err_umat2]: + for data, data_umat in zip(_p1_mask_err, _p1_mask_err_umat): + self.assertEqual(data.shape, data_umat.shape) + self.assertEqual(data.dtype, data_umat.dtype) + for _p1_mask_err_umat in [_p1_mask_err_umat1, _p1_mask_err_umat2]: + for data_umat0, data_umat in zip(_p1_mask_err_umat0[:2], _p1_mask_err_umat[:2]): + self.assertTrue(np.allclose(data_umat0, data_umat)) if __name__ == '__main__': NewOpenCVTests.bootstrap()