sy00000
/
mindspore
forked from OSSInnovation/mindspore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!14549 fix BUG to master 

From: @shenwei41
Reviewed-by: @liucunwei,@pandoublefeng
Signed-off-by: @liucunwei
This commit is contained in:
mindspore-ci-bot 2021-04-03 06:29:59 +08:00 committed by Gitee
parent 28f4759537 5ee3fb7648
commit 25b8c0d6e3
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc
View File

@ -1412,21 +1412,21 @@ void CalculationMatrix(int n, int m, std::vector<double> &W, LiteMat &A, LiteMat
} }
for (int i = 0; i < n - 1; i++) { for (int i = 0; i < n - 1; i++) {
int j = i; int mid = i;
for (int k = i + 1; k < n; k++) { for (int j = i + 1; j < n; j++) {
if (W[j] < W[k]) { if (W[mid] < W[j]) {
j = k; mid = j;
} }
} }
if (i != j) { if (i != mid) {
std::swap(W[i], W[j]); std::swap(W[i], W[mid]);
for (int k = 0; k < m; k++) { for (int j = 0; j < m; j++) {
std::swap(A.ptr<T>(i)[k], A.ptr<T>(j)[k]); std::swap(A.ptr<T>(i)[j], A.ptr<T>(mid)[j]);
} }
for (int k = 0; k < n; k++) { for (int j = 0; j < n; j++) {
std::swap(V.ptr<T>(i)[k], V.ptr<T>(j)[k]); std::swap(V.ptr<T>(i)[j], V.ptr<T>(mid)[j]);
} }
} }
} }
@ -1451,8 +1451,8 @@ void JacobiSVD(LiteMat &A, LiteMat &_W, LiteMat &V) {
std::uniform_int_distribution<unsigned int> dis(0, 4294967294); std::uniform_int_distribution<unsigned int> dis(0, 4294967294);
for (int i = 0; i < urows; i++) { for (int i = 0; i < urows; i++) {
double sd = i < n ? W[i] : 0; double mid = i < n ? W[i] : 0;
for (int ii = 0; ii < 100 && sd <= min_val; ii++) { for (int ii = 0; ii < 100 && mid <= min_val; ii++) {
const T val0 = (T)(1. / m); const T val0 = (T)(1. / m);
for (int k = 0; k < m; k++) { for (int k = 0; k < m; k++) {
unsigned int rng = dis(gen); unsigned int rng = dis(gen);
@ -1460,15 +1460,15 @@ void JacobiSVD(LiteMat &A, LiteMat &_W, LiteMat &V) {
A.ptr<T>(i)[k] = val; A.ptr<T>(i)[k] = val;
} }
for (int iter = 0; iter < 2; iter++) { for (int inner = 0; inner < 2; inner++) {
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
sd = 0; mid = 0;
for (int k = 0; k < m; k++) { for (int k = 0; k < m; k++) {
sd += A.ptr<T>(i)[k] * A.ptr<T>(j)[k]; mid += A.ptr<T>(i)[k] * A.ptr<T>(j)[k];
} }
T asum = 0; T asum = 0;
for (int k = 0; k < m; k++) { for (int k = 0; k < m; k++) {
T t = (T)(A.ptr<T>(i)[k] - sd * A.ptr<T>(j)[k]); T t = (T)(A.ptr<T>(i)[k] - mid * A.ptr<T>(j)[k]);
A.ptr<T>(i)[k] = t; A.ptr<T>(i)[k] = t;
asum += std::abs(t); asum += std::abs(t);
} }
@ -1480,15 +1480,15 @@ void JacobiSVD(LiteMat &A, LiteMat &_W, LiteMat &V) {
} }
} }
sd = 0; mid = 0;
for (int k = 0; k < m; k++) { for (int k = 0; k < m; k++) {
T t = A.ptr<T>(i)[k]; T t = A.ptr<T>(i)[k];
sd += static_cast<double>(t * t); mid += static_cast<double>(t * t);
} }
sd = std::sqrt(sd); mid = std::sqrt(mid);
} }
T s = (T)(sd > min_val ? 1 / sd : 0.); T s = (T)(mid > min_val ? 1 / mid : 0.);
for (int k = 0; k < m; k++) { for (int k = 0; k < m; k++) {
A.ptr<T>(i)[k] *= s; A.ptr<T>(i)[k] *= s;
} }

3
mindspore/dataset/vision/py_transforms.py
View File

@ -33,6 +33,7 @@ from .validators import check_prob, check_crop, check_resize_interpolation, chec
check_random_perspective, check_random_erasing, check_cutout, check_linear_transform, check_random_affine, \ check_random_perspective, check_random_erasing, check_cutout, check_linear_transform, check_random_affine, \
check_mix_up, check_positive_degrees, check_uniform_augment_py, check_auto_contrast check_mix_up, check_positive_degrees, check_uniform_augment_py, check_auto_contrast
from .utils import Inter, Border from .utils import Inter, Border
from .py_transforms_util import is_pil
DE_PY_INTER_MODE = {Inter.NEAREST: Image.NEAREST, DE_PY_INTER_MODE = {Inter.NEAREST: Image.NEAREST,
Inter.ANTIALIAS: Image.ANTIALIAS, Inter.ANTIALIAS: Image.ANTIALIAS,
@ -964,6 +965,8 @@ class RandomPerspective:
Returns: Returns:
img (PIL image), Image after being perspectively transformed randomly. img (PIL image), Image after being perspectively transformed randomly.
""" """
if not is_pil(img):
raise ValueError("Input image should be a Pillow image.")
if self.prob > random.random(): if self.prob > random.random():
start_points, end_points = util.get_perspective_params(img, self.distortion_scale) start_points, end_points = util.get_perspective_params(img, self.distortion_scale)
return util.perspective(img, start_points, end_points, self.interpolation) return util.perspective(img, start_points, end_points, self.interpolation)

2
mindspore/dataset/vision/validators.py
View File

@ -458,6 +458,8 @@ def check_random_perspective(method):
def new_method(self, *args, **kwargs): def new_method(self, *args, **kwargs):
[distortion_scale, prob, interpolation], _ = parse_user_args(method, *args, **kwargs) [distortion_scale, prob, interpolation], _ = parse_user_args(method, *args, **kwargs)
type_check(distortion_scale, (float,), "distortion_scale")
type_check(prob, (float,), "prob")
check_value(distortion_scale, [0., 1.], "distortion_scale") check_value(distortion_scale, [0., 1.], "distortion_scale")
check_value(prob, [0., 1.], "prob") check_value(prob, [0., 1.], "prob")
type_check(interpolation, (Inter,), "interpolation") type_check(interpolation, (Inter,), "interpolation")