diff --git a/examples/natural_robustness/natural_robustness_example.py b/examples/natural_robustness/natural_robustness_example.py index 34a5cfe..10fc9f5 100644 --- a/examples/natural_robustness/natural_robustness_example.py +++ b/examples/natural_robustness/natural_robustness_example.py @@ -17,7 +17,7 @@ import numpy as np import cv2 -from mindarmour.natural_robustness.image import Translate, Curve, Perspective, Scale, Shear, Rotate, SaltAndPepperNoise, \ +from mindarmour.natural_robustness.transform.image import Translate, Curve, Perspective, Scale, Shear, Rotate, SaltAndPepperNoise, \ NaturalNoise, GaussianNoise, UniformNoise, MotionBlur, GaussianBlur, GradientBlur, Contrast, GradientLuminance diff --git a/examples/natural_robustness/serving/server/perturbation/servable_config.py b/examples/natural_robustness/serving/server/perturbation/servable_config.py index aa5a16c..36772f9 100644 --- a/examples/natural_robustness/serving/server/perturbation/servable_config.py +++ b/examples/natural_robustness/serving/server/perturbation/servable_config.py @@ -21,7 +21,7 @@ import cv2 import numpy as np from PIL import Image from mindspore_serving.server import register -from mindarmour.natural_robustness.image import Contrast, GaussianBlur, SaltAndPepperNoise, Scale, Shear, \ +from mindarmour.natural_robustness.transform.image import Contrast, GaussianBlur, SaltAndPepperNoise, Scale, Shear, \ Translate, Rotate, MotionBlur, GradientBlur, GradientLuminance, NaturalNoise, Curve, Perspective diff --git a/mindarmour/natural_robustness/transform/__init__.py b/mindarmour/natural_robustness/transform/__init__.py new file mode 100644 index 0000000..4859766 --- /dev/null +++ b/mindarmour/natural_robustness/transform/__init__.py @@ -0,0 +1,16 @@ +# Copyright 2022 Huawei Technologies Co., Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +""" +Image Transform Method for Natural Robustness. +""" diff --git a/mindarmour/natural_robustness/image/__init__.py b/mindarmour/natural_robustness/transform/image/__init__.py similarity index 100% rename from mindarmour/natural_robustness/image/__init__.py rename to mindarmour/natural_robustness/transform/image/__init__.py diff --git a/mindarmour/natural_robustness/image/blur.py b/mindarmour/natural_robustness/transform/image/blur.py similarity index 98% rename from mindarmour/natural_robustness/image/blur.py rename to mindarmour/natural_robustness/transform/image/blur.py index 36b26b7..e63b52f 100644 --- a/mindarmour/natural_robustness/image/blur.py +++ b/mindarmour/natural_robustness/transform/image/blur.py @@ -18,7 +18,7 @@ Image Blur import numpy as np import cv2 -from mindarmour.natural_robustness.image.natural_perturb import _NaturalPerturb +from mindarmour.natural_robustness.transform.image.natural_perturb import _NaturalPerturb from mindarmour.utils._check_param import check_param_multi_types, check_int_positive, check_param_type from mindarmour.utils.logger import LogUtil diff --git a/mindarmour/natural_robustness/image/corruption.py b/mindarmour/natural_robustness/transform/image/corruption.py similarity index 99% rename from mindarmour/natural_robustness/image/corruption.py rename to mindarmour/natural_robustness/transform/image/corruption.py index cc723e0..e80019b 100644 --- a/mindarmour/natural_robustness/image/corruption.py +++ b/mindarmour/natural_robustness/transform/image/corruption.py @@ -18,7 +18,7 @@ import math import numpy as np import cv2 -from mindarmour.natural_robustness.image.natural_perturb import _NaturalPerturb +from mindarmour.natural_robustness.transform.image.natural_perturb import _NaturalPerturb from mindarmour.utils._check_param import check_param_multi_types, check_param_type from mindarmour.utils.logger import LogUtil diff --git a/mindarmour/natural_robustness/image/luminance.py b/mindarmour/natural_robustness/transform/image/luminance.py similarity index 99% rename from mindarmour/natural_robustness/image/luminance.py rename to mindarmour/natural_robustness/transform/image/luminance.py index 21df599..da9063d 100644 --- a/mindarmour/natural_robustness/image/luminance.py +++ b/mindarmour/natural_robustness/transform/image/luminance.py @@ -18,7 +18,7 @@ import math import numpy as np import cv2 -from mindarmour.natural_robustness.image.natural_perturb import _NaturalPerturb +from mindarmour.natural_robustness.transform.image.natural_perturb import _NaturalPerturb from mindarmour.utils._check_param import check_param_multi_types, check_param_in_range, check_param_type, \ check_value_non_negative from mindarmour.utils.logger import LogUtil diff --git a/mindarmour/natural_robustness/image/natural_perturb.py b/mindarmour/natural_robustness/transform/image/natural_perturb.py similarity index 100% rename from mindarmour/natural_robustness/image/natural_perturb.py rename to mindarmour/natural_robustness/transform/image/natural_perturb.py diff --git a/mindarmour/natural_robustness/image/transformation.py b/mindarmour/natural_robustness/transform/image/transformation.py similarity index 99% rename from mindarmour/natural_robustness/image/transformation.py rename to mindarmour/natural_robustness/transform/image/transformation.py index f692c68..0a90fed 100644 --- a/mindarmour/natural_robustness/image/transformation.py +++ b/mindarmour/natural_robustness/transform/image/transformation.py @@ -18,7 +18,7 @@ import math import numpy as np import cv2 -from mindarmour.natural_robustness.image.natural_perturb import _NaturalPerturb +from mindarmour.natural_robustness.transform.image.natural_perturb import _NaturalPerturb from mindarmour.utils._check_param import check_param_multi_types, check_param_type, check_value_non_negative from mindarmour.utils.logger import LogUtil diff --git a/tests/ut/python/natural_robustness/test_natural_robustness.py b/tests/ut/python/natural_robustness/test_natural_robustness.py index e7bfa05..0d4ea90 100644 --- a/tests/ut/python/natural_robustness/test_natural_robustness.py +++ b/tests/ut/python/natural_robustness/test_natural_robustness.py @@ -18,8 +18,9 @@ import pytest import numpy as np from mindspore import context -from mindarmour.natural_robustness.image import Translate, Curve, Perspective, Scale, Shear, Rotate, SaltAndPepperNoise, \ - NaturalNoise, GaussianNoise, UniformNoise, MotionBlur, GaussianBlur, GradientBlur, Contrast, GradientLuminance +from mindarmour.natural_robustness.transform.image import Translate, Curve, Perspective, Scale, Shear, Rotate, \ + SaltAndPepperNoise, NaturalNoise, GaussianNoise, UniformNoise, MotionBlur, GaussianBlur, GradientBlur, Contrast,\ + GradientLuminance @pytest.mark.level0