diff --git a/paddle/fluid/pybind/protobuf.cc b/paddle/fluid/pybind/protobuf.cc index 2372db9715ec7ef0462d9204ceb929994a055946..7f06f7a9d72de909da1507d62054da4905084354 100644 --- a/paddle/fluid/pybind/protobuf.cc +++ b/paddle/fluid/pybind/protobuf.cc @@ -205,8 +205,7 @@ void BindBlockDesc(pybind11::module *m) { void BindVarDsec(pybind11::module *m) { pybind11::class_ var_desc(*m, "VarDesc", ""); var_desc - .def("name", [](pd::VarDesc &self) { return self.Name(); }, - pybind11::return_value_policy::reference) + .def("name", &pd::VarDesc::Name, pybind11::return_value_policy::reference) .def("set_name", &pd::VarDesc::SetName) .def("set_shape", &pd::VarDesc::SetShape) .def("set_shapes", &pd::VarDesc::SetShapes) diff --git a/python/paddle/__init__.py b/python/paddle/__init__.py index 241a07a35297e85763781a42696fd727733459a3..53746afdb25b34b69f89fe0927c877ace62d7d55 100644 --- a/python/paddle/__init__.py +++ b/python/paddle/__init__.py @@ -24,4 +24,5 @@ except ImportError: import paddle.reader import paddle.dataset import paddle.batch +import paddle.compat batch = batch.batch diff --git a/python/paddle/fluid/compat.py b/python/paddle/compat.py similarity index 100% rename from python/paddle/fluid/compat.py rename to python/paddle/compat.py diff --git a/python/paddle/dataset/conll05.py b/python/paddle/dataset/conll05.py index c716b5af67cac88b35ae5621b24048f35c993051..b23d127eeb3fd9e08e99e48e90d7ae21f8ad6af7 100644 --- a/python/paddle/dataset/conll05.py +++ b/python/paddle/dataset/conll05.py @@ -24,7 +24,7 @@ import tarfile import gzip import itertools import paddle.dataset.common -import paddle.fluid.compat as cpt +import paddle.compat as cpt from six.moves import zip, range __all__ = ['test, get_dict', 'get_embedding', 'convert'] diff --git a/python/paddle/dataset/movielens.py b/python/paddle/dataset/movielens.py index 15bbd00c0bcde46e80c72f382adeeff160953a02..fe07daf5c33e9d8d6e8d94b5c821ca07e65a21eb 100644 --- a/python/paddle/dataset/movielens.py +++ b/python/paddle/dataset/movielens.py @@ -28,7 +28,7 @@ import re import random import functools import six -import paddle.fluid.compat as cpt +import paddle.compat as cpt __all__ = [ 'train', 'test', 'get_movie_title_dict', 'max_movie_id', 'max_user_id', diff --git a/python/paddle/dataset/wmt14.py b/python/paddle/dataset/wmt14.py index d35e7061315e1aad4269ec573bfe59c7cee2ef7f..cf366309c0d6fa6e6aa117f27a23b5a6c91c5528 100644 --- a/python/paddle/dataset/wmt14.py +++ b/python/paddle/dataset/wmt14.py @@ -24,7 +24,7 @@ import tarfile import gzip import paddle.dataset.common -import paddle.fluid.compat as cpt +import paddle.compat as cpt __all__ = [ 'train', diff --git a/python/paddle/dataset/wmt16.py b/python/paddle/dataset/wmt16.py index f0051c773665981f17a62dbb602ac2356687275e..d68a6e8be7af0dbda771d8bfb7bdc55926b442f6 100644 --- a/python/paddle/dataset/wmt16.py +++ b/python/paddle/dataset/wmt16.py @@ -35,7 +35,7 @@ import gzip from collections import defaultdict import paddle.dataset.common -import paddle.fluid.compat as cpt +import paddle.compat as cpt __all__ = [ "train", diff --git a/python/paddle/fluid/backward.py b/python/paddle/fluid/backward.py index e552b79219805d20b8db24ba6a567affaf12f3aa..aa62d344911cfdee82bf9b868ebed3e38eef80fb 100644 --- a/python/paddle/fluid/backward.py +++ b/python/paddle/fluid/backward.py @@ -17,7 +17,7 @@ from . import core import collections import copy import six -from . import compat as cpt +from .. import compat as cpt from . import unique_name __all__ = ['append_backward'] diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index 5203aa160cca67ad16962ddadd5df7f8005ab0f6..fbeb0e5940ee1f87935a4e4815c907efdf68a1ae 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -19,7 +19,7 @@ import six import numpy as np -from . import compat as cpt +from .. import compat as cpt from .proto import framework_pb2 try: from . import core diff --git a/python/paddle/fluid/layers/detection.py b/python/paddle/fluid/layers/detection.py index 4f317a40309a4267330a3e89727bc22088fec6e5..9f8cb6ef0bb7f8dfc05e5647330d0644979a053f 100644 --- a/python/paddle/fluid/layers/detection.py +++ b/python/paddle/fluid/layers/detection.py @@ -20,7 +20,7 @@ from .layer_function_generator import autodoc, templatedoc from ..layer_helper import LayerHelper from . import tensor from . import nn -from .. import compat as cpt +from ... import compat as cpt import math import six from functools import reduce diff --git a/python/paddle/fluid/parallel_executor.py b/python/paddle/fluid/parallel_executor.py index 35c3ab59c222b4050288f78ef5e488eb2ba8d2a7..ac87b12a1ce7fce274c79aa492c2acb8410798dd 100644 --- a/python/paddle/fluid/parallel_executor.py +++ b/python/paddle/fluid/parallel_executor.py @@ -17,7 +17,7 @@ import multiprocessing from . import core from . import framework from . import executor -from . import compat as cpt +from .. import compat as cpt import warnings import sys import six diff --git a/python/paddle/fluid/tests/unittests/test_compat.py b/python/paddle/fluid/tests/unittests/test_compat.py index 7f45ee705237ed1f2b6f1bd8bc2bcca6058906f6..eabcced5d125a4dac8e9a6b8b2342735ed5e92fe 100644 --- a/python/paddle/fluid/tests/unittests/test_compat.py +++ b/python/paddle/fluid/tests/unittests/test_compat.py @@ -13,7 +13,7 @@ # limitations under the License. import unittest -import paddle.fluid.compat as cpt +import paddle.compat as cpt import six diff --git a/python/paddle/fluid/tests/unittests/test_dist_base.py b/python/paddle/fluid/tests/unittests/test_dist_base.py index e0b545183ccc35ba1aab172e984a45dddbc7cb1e..e059f2cd2ab994d580b3a494f6f5556938be1fa1 100644 --- a/python/paddle/fluid/tests/unittests/test_dist_base.py +++ b/python/paddle/fluid/tests/unittests/test_dist_base.py @@ -124,7 +124,7 @@ def runtime_main(test_class): model.run_trainer(p, endpoints, trainer_id, trainers, is_dist) -import paddle.fluid.compat as cpt +import paddle.compat as cpt class TestDistBase(unittest.TestCase): diff --git a/python/paddle/fluid/tests/unittests/test_exception.py b/python/paddle/fluid/tests/unittests/test_exception.py index 6e4ea273a9ac41e6060cb24de4aa4c0e8b1b269c..a43df91342a566bb36ab07ecf618de805237adce 100644 --- a/python/paddle/fluid/tests/unittests/test_exception.py +++ b/python/paddle/fluid/tests/unittests/test_exception.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle.fluid.compat as cpt +import paddle.compat as cpt import paddle.fluid.core as core import unittest diff --git a/python/paddle/fluid/tests/unittests/test_lookup_table_op.py b/python/paddle/fluid/tests/unittests/test_lookup_table_op.py index a325422c316a55f4aa57bd0770b8ed50f4803f71..77fb8154f04a2dc5c50022d07e3650f0616ce176 100644 --- a/python/paddle/fluid/tests/unittests/test_lookup_table_op.py +++ b/python/paddle/fluid/tests/unittests/test_lookup_table_op.py @@ -17,7 +17,7 @@ import numpy as np from op_test import OpTest import paddle.fluid.core as core from paddle.fluid.op import Operator -import paddle.fluid.compat as cpt +import paddle.compat as cpt class TestLookupTableOp(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_operator_desc.py b/python/paddle/fluid/tests/unittests/test_operator_desc.py index 5634e29d01f25182e134b2240a5ac78d48d41cf7..21a113f509b5b21e44d194a4744de2c9edbb441a 100644 --- a/python/paddle/fluid/tests/unittests/test_operator_desc.py +++ b/python/paddle/fluid/tests/unittests/test_operator_desc.py @@ -15,7 +15,7 @@ import unittest import paddle.fluid.core as core -import paddle.fluid.compat as cpt +import paddle.compat as cpt from paddle.fluid.framework import Program, default_startup_program diff --git a/python/paddle/fluid/tests/unittests/test_protobuf_descs.py b/python/paddle/fluid/tests/unittests/test_protobuf_descs.py index 2176db71b955503489cfc0fb307114fa2a7c097c..37de79211413b757dccdd3ed68dfc3c38a02becb 100644 --- a/python/paddle/fluid/tests/unittests/test_protobuf_descs.py +++ b/python/paddle/fluid/tests/unittests/test_protobuf_descs.py @@ -14,7 +14,7 @@ import unittest import paddle.fluid.core as core -import paddle.fluid.compat as cpt +import paddle.compat as cpt from paddle.fluid.framework import Program diff --git a/python/paddle/fluid/tests/unittests/test_roi_pool_op.py b/python/paddle/fluid/tests/unittests/test_roi_pool_op.py index 0f38b742d91b6cea81fa3d262c4dc9d707afcc9b..9b0a3f26b7949d906682247a7f8fc3f07946e6f5 100644 --- a/python/paddle/fluid/tests/unittests/test_roi_pool_op.py +++ b/python/paddle/fluid/tests/unittests/test_roi_pool_op.py @@ -16,7 +16,7 @@ import unittest import numpy as np import math import sys -import paddle.fluid.compat as cpt +import paddle.compat as cpt from op_test import OpTest diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index 293c7841eca7f7873744b87e5f739221045e9f23..0de994dda3ed565346df0f3018f429531021f107 100644 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -14,7 +14,7 @@ from collections import defaultdict from .. import core -from .. import compat as cpt +from ... import compat as cpt from ..framework import Program, default_main_program, Parameter from ..backward import _rename_arg_ from functools import reduce diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py index 6ec36b2bb9cb9c5674f3be087fcf289268b20c1c..6d7ac876fdf65fe0e85cceb94c311a93d9ea39c2 100644 --- a/python/paddle/reader/decorator.py +++ b/python/paddle/reader/decorator.py @@ -27,7 +27,7 @@ from six.moves import zip import itertools import random import zlib -import paddle.fluid.compat as cpt +import paddle.compat as cpt def map_readers(func, *readers):