diff --git a/python/paddle/optimizer/__init__.py b/python/paddle/optimizer/__init__.py index edebfdfcf3710049f851945632c1c09d443a7709..07d2935bc764664c88e42494962af46ad4831191 100644 --- a/python/paddle/optimizer/__init__.py +++ b/python/paddle/optimizer/__init__.py @@ -12,19 +12,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -__all__ = [ - 'Optimizer', 'Adagrad', 'Adam', 'AdamW', 'Adamax', 'RMSProp', 'Adadelta', - 'SGD', 'Momentum', 'Lamb', 'lr' -] +from .optimizer import Optimizer # noqa: F401 +from .adagrad import Adagrad # noqa: F401 +from .adam import Adam # noqa: F401 +from .adamw import AdamW # noqa: F401 +from .adamax import Adamax # noqa: F401 +from .rmsprop import RMSProp # noqa: F401 +from .adadelta import Adadelta # noqa: F401 +from .sgd import SGD # noqa: F401 +from .momentum import Momentum # noqa: F401 +from .lamb import Lamb # noqa: F401 +from . import lr # noqa: F401 -from .optimizer import Optimizer -from .adagrad import Adagrad -from .adam import Adam -from .adamw import AdamW -from .adamax import Adamax -from .rmsprop import RMSProp -from .adadelta import Adadelta -from .sgd import SGD -from .momentum import Momentum -from .lamb import Lamb -from . import lr +__all__ = [ #noqa + 'Optimizer', + 'Adagrad', + 'Adam', + 'AdamW', + 'Adamax', + 'RMSProp', + 'Adadelta', + 'SGD', + 'Momentum', + 'Lamb' +] diff --git a/python/paddle/optimizer/adadelta.py b/python/paddle/optimizer/adadelta.py index e921eda41cfb6a003994a36e8da16892c8150c77..42e2a5851c21bd3218ef319e40db6d446971c6b3 100644 --- a/python/paddle/optimizer/adadelta.py +++ b/python/paddle/optimizer/adadelta.py @@ -17,8 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable, name_scope -__all__ = ["Adadelta"] - class Adadelta(Optimizer): r""" diff --git a/python/paddle/optimizer/adagrad.py b/python/paddle/optimizer/adagrad.py index ec14828e693ee67c03a748622bc1034f1303d80f..d3077949ff0aed02e22c889a15c613d572f0871d 100644 --- a/python/paddle/optimizer/adagrad.py +++ b/python/paddle/optimizer/adagrad.py @@ -17,8 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable -__all__ = ["Adagrad"] - class Adagrad(Optimizer): r""" diff --git a/python/paddle/optimizer/adam.py b/python/paddle/optimizer/adam.py index 0cafbda893dd2f638886e55e4a1e1d55a5252c31..dcedf4fc5020aa1fdb79ea6b48e095f598dc27e8 100644 --- a/python/paddle/optimizer/adam.py +++ b/python/paddle/optimizer/adam.py @@ -24,8 +24,6 @@ from ..fluid.dygraph import base as imperative_base import paddle -__all__ = ["Adam"] - class Adam(Optimizer): r""" diff --git a/python/paddle/optimizer/adamax.py b/python/paddle/optimizer/adamax.py index 4a6c2278a46f40774afb83a5222bfeac2c776305..9d5adf0bba508a4c213e9fc9b18bec1e737cc9ac 100644 --- a/python/paddle/optimizer/adamax.py +++ b/python/paddle/optimizer/adamax.py @@ -17,8 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable, name_scope -__all__ = ["Adamax"] - class Adamax(Optimizer): r""" diff --git a/python/paddle/optimizer/adamw.py b/python/paddle/optimizer/adamw.py index 32645720c4f73e7be669fb70bfd2c988b96f616e..eb88a48f30320a5d0f632ddfdb2df504b604d31f 100644 --- a/python/paddle/optimizer/adamw.py +++ b/python/paddle/optimizer/adamw.py @@ -19,8 +19,6 @@ from ..fluid import framework from ..fluid.dygraph import base as imperative_base import paddle -__all__ = ['AdamW'] - class AdamW(Adam): r""" diff --git a/python/paddle/optimizer/lamb.py b/python/paddle/optimizer/lamb.py index a692f59de5b5fe0865af995c834ec2e39b5db457..bab130ec5909895cbf470ee76a2ef34f76dfa53c 100644 --- a/python/paddle/optimizer/lamb.py +++ b/python/paddle/optimizer/lamb.py @@ -17,8 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable -__all__ = ["Lamb"] - class Lamb(Optimizer): r""" diff --git a/python/paddle/optimizer/lr.py b/python/paddle/optimizer/lr.py index 484b4fb7246a766ea4ee984980b0fc0ffecabf4e..f269bffc75ed9c07992b9a572da56b309281405c 100644 --- a/python/paddle/optimizer/lr.py +++ b/python/paddle/optimizer/lr.py @@ -17,10 +17,19 @@ import numpy import warnings from paddle import Tensor -__all__ = [ - 'LRScheduler', 'NoamDecay', 'PiecewiseDecay', 'NaturalExpDecay', - 'InverseTimeDecay', 'PolynomialDecay', 'LinearWarmup', 'ExponentialDecay', - 'MultiStepDecay', 'StepDecay', 'LambdaDecay', 'ReduceOnPlateau', +__all__ = [ #noqa + 'LRScheduler', + 'NoamDecay', + 'PiecewiseDecay', + 'NaturalExpDecay', + 'InverseTimeDecay', + 'PolynomialDecay', + 'LinearWarmup', + 'ExponentialDecay', + 'MultiStepDecay', + 'StepDecay', + 'LambdaDecay', + 'ReduceOnPlateau', 'CosineAnnealingDecay' ] diff --git a/python/paddle/optimizer/momentum.py b/python/paddle/optimizer/momentum.py index 111b2720c86687f141169c963ec69f48cfe01df2..932a4ad100ec4aea2ded1fa242acc1c280ac0dae 100644 --- a/python/paddle/optimizer/momentum.py +++ b/python/paddle/optimizer/momentum.py @@ -21,7 +21,6 @@ from ..fluid import unique_name from ..fluid import layers import paddle.fluid as fluid from paddle.fluid.regularizer import L2DecayRegularizer -__all__ = ["Momentum"] class Momentum(Optimizer): diff --git a/python/paddle/optimizer/optimizer.py b/python/paddle/optimizer/optimizer.py index 0d44df59012c031cf34735ff10f1a9ec32389399..a050852728da96479b76f38cd1c74a3f4c4e6a6f 100644 --- a/python/paddle/optimizer/optimizer.py +++ b/python/paddle/optimizer/optimizer.py @@ -42,8 +42,6 @@ from ..fluid.wrapped_decorator import signature_safe_contextmanager from .. import compat as cpt from .lr import LRScheduler -__all__ = ['Optimizer'] - class Optimizer(object): r"""Optimizer Base class. diff --git a/python/paddle/optimizer/rmsprop.py b/python/paddle/optimizer/rmsprop.py index 12825bb781381253186bad500c6009b8b8d1db43..7146b7d89935c9b45fbcf12726c2225ab4df5814 100644 --- a/python/paddle/optimizer/rmsprop.py +++ b/python/paddle/optimizer/rmsprop.py @@ -17,8 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable -__all__ = ["RMSProp"] - class RMSProp(Optimizer): r""" diff --git a/python/paddle/optimizer/sgd.py b/python/paddle/optimizer/sgd.py index b2937ff1620643d9cd2ca9a92d45f2dabdb161d4..fc208519a2e61397717f354776ad1951041ad472 100644 --- a/python/paddle/optimizer/sgd.py +++ b/python/paddle/optimizer/sgd.py @@ -17,7 +17,6 @@ from ..fluid import core from ..fluid import framework from ..fluid.framework import Variable, name_scope from ..fluid.dygraph import no_grad -__all__ = ["SGD"] class SGD(Optimizer):