Move compat module to python/paddle

velconia · velconia · commit e0d5f8a8207b · 2018-08-14T18:16:59.000+08:00
diff --git 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_<pd::VarDesc> 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
@@ -24,4 +24,5 @@
 import paddle.reader
 import paddle.dataset
 import paddle.batch
+import paddle.compat
 batch = batch.batch
diff --git a/python/paddle/compat.py b/python/paddle/compat.py
diff --git a/python/paddle/dataset/conll05.py b/python/paddle/dataset/conll05.py
@@ -24,7 +24,7 @@
 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
@@ -28,7 +28,7 @@
 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
@@ -24,7 +24,7 @@
 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
@@ -35,7 +35,7 @@
 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
@@ -17,7 +17,7 @@
 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
@@ -19,7 +19,7 @@
 
 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
@@ -20,7 +20,7 @@
 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
@@ -17,7 +17,7 @@
 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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,7 @@
 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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
 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
@@ -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
@@ -27,7 +27,7 @@
 import itertools
 import random
 import zlib
-import paddle.fluid.compat as cpt
+import paddle.compat as cpt
 
 
 def map_readers(func, *readers):
