diff --git a/examples/model_security/model_defenses/mnist_defense_nad.py b/examples/model_security/model_defenses/mnist_defense_nad.py index fa49569..b662dcb 100644 --- a/examples/model_security/model_defenses/mnist_defense_nad.py +++ b/examples/model_security/model_defenses/mnist_defense_nad.py @@ -17,14 +17,13 @@ import os import numpy as np from mindspore import Tensor from mindspore import context -from mindspore import nn +from mindspore import nn, Model from mindspore.nn import SoftmaxCrossEntropyWithLogits -from mindspore.train import Model from mindspore.train.callback import LossMonitor from mindarmour.adv_robustness.attacks import FastGradientSignMethod from mindarmour.adv_robustness.defenses import NaturalAdversarialDefense -from mindarmour.utils.logger import LogUtil +from mindarmour.utils import LogUtil from examples.common.networks.lenet5.lenet5_net import LeNet5 from examples.common.dataset.data_processing import generate_mnist_dataset diff --git a/examples/privacy/diff_privacy/lenet5_dp.py b/examples/privacy/diff_privacy/lenet5_dp.py index d6f74e0..c112699 100644 --- a/examples/privacy/diff_privacy/lenet5_dp.py +++ b/examples/privacy/diff_privacy/lenet5_dp.py @@ -16,24 +16,23 @@ Training example of adaClip-mechanism differential privacy. """ import os -import mindspore.nn as nn +from mindspore import nn from mindspore import context +from mindspore import load_checkpoint, load_param_into_net +from mindspore import dtype as mstype from mindspore.train.callback import ModelCheckpoint from mindspore.train.callback import CheckpointConfig from mindspore.train.callback import LossMonitor -from mindspore.nn.metrics import Accuracy -from mindspore.train.serialization import load_checkpoint, load_param_into_net +from mindspore.nn import Accuracy import mindspore.dataset as ds import mindspore.dataset.vision.c_transforms as CV import mindspore.dataset.transforms.c_transforms as C from mindspore.dataset.vision import Inter -import mindspore.common.dtype as mstype - from mindarmour.privacy.diff_privacy import DPModel from mindarmour.privacy.diff_privacy import PrivacyMonitorFactory from mindarmour.privacy.diff_privacy import NoiseMechanismsFactory from mindarmour.privacy.diff_privacy import ClipMechanismsFactory -from mindarmour.utils.logger import LogUtil +from mindarmour.utils import LogUtil from examples.common.networks.lenet5.lenet5_net import LeNet5 from lenet5_config import mnist_cfg as cfg diff --git a/examples/privacy/sup_privacy/sup_privacy.py b/examples/privacy/sup_privacy/sup_privacy.py index 0fb28b7..41587bd 100644 --- a/examples/privacy/sup_privacy/sup_privacy.py +++ b/examples/privacy/sup_privacy/sup_privacy.py @@ -15,27 +15,28 @@ Training example of suppress-based privacy. """ import os + import mindspore.nn as nn from mindspore import context from mindspore.train.callback import ModelCheckpoint from mindspore.train.callback import CheckpointConfig from mindspore.train.callback import LossMonitor -from mindspore.nn.metrics import Accuracy +from mindspore.nn import Accuracy import mindspore.dataset as ds import mindspore.dataset.vision.c_transforms as CV import mindspore.dataset.transforms.c_transforms as C -from mindspore.dataset.vision.utils import Inter -import mindspore.common.dtype as mstype - -from examples.common.networks.lenet5.lenet5_net import LeNet5 +from mindspore.dataset.vision import Inter +from mindspore import dtype as mstype -from sup_privacy_config import mnist_cfg as cfg from mindarmour.privacy.sup_privacy import SuppressModel from mindarmour.privacy.sup_privacy import SuppressMasker from mindarmour.privacy.sup_privacy import SuppressPrivacyFactory from mindarmour.privacy.sup_privacy import MaskLayerDes +from mindarmour.utils import LogUtil + +from examples.common.networks.lenet5.lenet5_net import LeNet5 +from sup_privacy_config import mnist_cfg as cfg -from mindarmour.utils.logger import LogUtil LOGGER = LogUtil.get_instance() LOGGER.set_level('INFO')