fix some error & change build

PaddlePaddle · Sep 5, 2023 · bda9596 · bda9596
1 parent b8779eb
commit bda9596
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 54 deletions.
diff --git a/paddle/fluid/API.spec b/paddle/fluid/API.spec
@@ -1,6 +1,6 @@
-paddle.base.optimizer.PipelineOptimizer (paddle.base.optimizer.PipelineOptimizer, ('document', '2e55a29dbeb874934f7a1a1af3a22b8c'))
-paddle.base.optimizer.PipelineOptimizer.__init__ (ArgSpec(args=['self', 'optimizer', 'num_microbatches', 'start_cpu_core_id'], varargs=None, keywords=None, defaults=(1, 0)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
-paddle.base.optimizer.PipelineOptimizer.minimize (ArgSpec(args=['self', 'loss', 'startup_program', 'parameter_list', 'no_grad_set'], varargs=None, keywords=None, defaults=(None, None, None)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
+paddle.incubate.optimizer.PipelineOptimizer (paddle.incubate.optimizer.PipelineOptimizer, ('document', '2e55a29dbeb874934f7a1a1af3a22b8c'))
+paddle.incubate.optimizer.PipelineOptimizer.__init__ (ArgSpec(args=['self', 'optimizer', 'num_microbatches', 'start_cpu_core_id'], varargs=None, keywords=None, defaults=(1, 0)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
+paddle.incubate.optimizer.PipelineOptimizer.minimize (ArgSpec(args=['self', 'loss', 'startup_program', 'parameter_list', 'no_grad_set'], varargs=None, keywords=None, defaults=(None, None, None)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
 paddle.audio.features (ArgSpec(), ('document', 'd41d8cd98f00b204e9800998ecf8427e'))
 paddle.audio.features.layers.LogMelSpectrogram (ArgSpec(), ('document', 'c38b53606aa89215c4f00d3833e158b8'))
 paddle.audio.features.layers.LogMelSpectrogram.forward (ArgSpec(args=['self', 'x'], varargs=None, varkw=None, defaults=None, kwonlyargs=[], kwonlydefaults=None, annotations={'return': <class 'paddle.Tensor'>, 'x': <class 'paddle.Tensor'>}), ('document', '6c14f6f78dc697a6981cf90412e2f1ea'))

diff --git a/paddle/fluid/pybind/place.cc b/paddle/fluid/pybind/place.cc
@@ -394,8 +394,8 @@ void BindPlace(pybind11::module &m) {  // NOLINT
     **Note**:
     Examples:
         .. code-block:: python
-          import paddle.base as fluid
-          xpu_place = fluid.XPUPlace(0)
+          import paddle.base as base
+          xpu_place = base.XPUPlace(0)
         )DOC");
   g_xpuplace_pytype = reinterpret_cast<PyTypeObject *>(xpuplace.ptr());
   xpuplace

diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc
@@ -1103,7 +1103,7 @@ PYBIND11_MODULE(libpaddle, m) {
   });
 
   // NOTE(zjl): ctest would load environment variables at the beginning even
-  // though we have not `import paddle.base as fluid`. So we add this API
+  // though we have not `import paddle.base as base`. So we add this API
   // to enable eager deletion mode in unittest.
   m.def("_set_eager_deletion_mode", &paddle::framework::SetEagerDeletionMode);
 
@@ -1239,7 +1239,6 @@ All parameter, weight, gradient are variables in Paddle.
     Examples:
         .. code-block:: python
 
-          import paddle.base as fluid
           # create tensor from a scope and set value to it.
           param = scope.var('Param').get_tensor()
           param_array = np.full((height, row_numel), 5.0).astype("float32")
@@ -2149,9 +2148,9 @@ All parameter, weight, gradient are variables in Paddle.
     Examples:
         .. code-block:: python
 
-          import paddle.base as fluid
+          import paddle.base as base
 
-          arr = fluid.LoDTensorArray()
+          arr = base.LoDTensorArray()
 )DOC");
   g_framework_lodtensorarray_pytype =
       reinterpret_cast<PyTypeObject *>(pylodtensorarray.ptr());
@@ -2193,12 +2192,12 @@ All parameter, weight, gradient are variables in Paddle.
              Examples:
                  .. code-block:: python
 
-                   import paddle.base as fluid
+                   import paddle.base as base
                    import numpy as np
 
-                   arr = fluid.LoDTensorArray()
-                   t = fluid.LoDTensor()
-                   t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                   arr = base.LoDTensorArray()
+                   t = base.LoDTensor()
+                   t.set(np.ndarray([5, 30]), base.CPUPlace())
                    arr.append(t)
            )DOC")
       .def(

diff --git a/paddle/fluid/pybind/tensor.cc b/paddle/fluid/pybind/tensor.cc
@@ -393,11 +393,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
         Examples:
             .. code-block:: python
 
-                import paddle.base as fluid
+                import paddle.base as base
                 import numpy as np
 
-                t = fluid.Tensor()
-                t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                t = base.Tensor()
+                t.set(np.ndarray([5, 30]), base.CPUPlace())
           )DOC")
 
       .def(
@@ -413,11 +413,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                  import paddle.base as fluid
+                  import paddle.base as base
                   import numpy as np
 
-                  t = fluid.Tensor()
-                  t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                  t = base.Tensor()
+                  t.set(np.ndarray([5, 30]), base.CPUPlace())
                   print(t.shape())  # [5, 30]
            )DOC")
       .def("_to_dlpack",
@@ -517,11 +517,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                 import paddle.base as fluid
+                 import paddle.base as base
                  import numpy as np
 
-                 t = fluid.Tensor()
-                 t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                 t = base.Tensor()
+                 t.set(np.ndarray([5, 30]), base.CPUPlace())
                  t.set_lod([[0, 2, 5]])
                  print(t.lod()) # [[0, 2, 5]]
            )DOC")
@@ -566,11 +566,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                 import paddle.base as fluid
+                 import paddle.base as base
                  import numpy as np
 
-                 t = fluid.Tensor()
-                 t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                 t = base.Tensor()
+                 t.set(np.ndarray([5, 30]), base.CPUPlace())
                  t.set_recursive_sequence_lengths([[2, 3]])
                  print(t.recursive_sequence_lengths())  # [[2, 3]]
                  print(t.lod())  # [[0, 2, 5]]
@@ -594,11 +594,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                 import paddle.base as fluid
+                 import paddle.base as base
                  import numpy as np
 
-                 t = fluid.Tensor()
-                 t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                 t = base.Tensor()
+                 t.set(np.ndarray([5, 30]), base.CPUPlace())
                  t.set_lod([[0, 2, 5]])
                  print(t.lod()) # [[0, 2, 5]]
            )DOC")
@@ -623,11 +623,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                 import paddle.base as fluid
+                 import paddle.base as base
                  import numpy as np
 
-                 t = fluid.Tensor()
-                 t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                 t = base.Tensor()
+                 t.set(np.ndarray([5, 30]), base.CPUPlace())
                  t.set_recursive_sequence_lengths([[2, 3]])
                  print(t.recursive_sequence_lengths()) # [[2, 3]]
            )DOC")
@@ -647,11 +647,11 @@ void BindTensor(pybind11::module &m) {  // NOLINT
            Examples:
                .. code-block:: python
 
-                 import paddle.base as fluid
+                 import paddle.base as base
                  import numpy as np
 
-                 t = fluid.Tensor()
-                 t.set(np.ndarray([5, 30]), fluid.CPUPlace())
+                 t = base.Tensor()
+                 t.set(np.ndarray([5, 30]), base.CPUPlace())
                  t.set_recursive_sequence_lengths([[2, 3]])
                  print(t.has_valid_recursive_sequence_lengths()) # True
            )DOC")

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
@@ -3275,6 +3275,11 @@ function build_pr_and_develop() {
             rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt ${PADDLE_ROOT}/build/build.ninja
             rm -rf ${PADDLE_ROOT}/build/third_party
         fi
+        # may be remove it later
+        mkdir -p ${PADDLE_ROOT}/pr && cp -r ${PADDLE_ROOT}/build/pr_whl ${PADDLE_ROOT}/pr
+        rm -rf ${PADDLE_ROOT}/build && mkdir -p ${PADDLE_ROOT}/build 
+        mv ${PADDLE_ROOT}/pr/pr_whl ${PADDLE_ROOT}/build
+        cd ${PADDLE_ROOT}/build
 
         git checkout -b develop_base_pr upstream/$BRANCH
         git submodule update --init

diff --git a/python/paddle/dataset/uci_housing.py b/python/paddle/dataset/uci_housing.py
@@ -51,7 +51,7 @@
 UCI_TRAIN_DATA = None
 UCI_TEST_DATA = None
 
-FLUID_URL_MODEL = 'https://github.com/PaddlePaddle/book/raw/develop/01.fit_a_line/base/fit_a_line.fluid.tar'
+FLUID_URL_MODEL = 'https://github.com/PaddlePaddle/book/raw/develop/01.fit_a_line/fluid/fit_a_line.fluid.tar'
 FLUID_MD5_MODEL = '6e6dd637ccd5993961f68bfbde46090b'
 
 
@@ -150,7 +150,7 @@ def reader():
     return reader
 
 
-def base_model():
+def fluid_model():
     parameter_tar = paddle.dataset.common.download(
         FLUID_URL_MODEL, 'uci_housing', FLUID_MD5_MODEL, 'fit_a_line.fluid.tar'
     )

diff --git a/python/paddle/distributed/auto_parallel/static/cost/base_cost.py b/python/paddle/distributed/auto_parallel/static/cost/base_cost.py
@@ -928,9 +928,9 @@ def calc_time_by_modeling(op=None, desc=None, cluster=None):
 
 def calc_time_by_cost_model(op, cluster=None):
     """Calc op time by cost model and the unit is microsecond."""
-    if not isinstance(op, paddle.fluid.framework.Operator):
+    if not isinstance(op, paddle.base.framework.Operator):
         raise TypeError(
-            "OP must be paddle.fluid.framework.Operator, but got {}.".format(
+            "OP must be paddle.base.framework.Operator, but got {}.".format(
                 type(op)
             )
         )

diff --git a/python/paddle/jit/dy2static/partial_program.py b/python/paddle/jit/dy2static/partial_program.py
@@ -190,9 +190,7 @@ def __init__(
         assert isinstance(self._build_strategy, BuildStrategy)
 
         self._origin_main_program = self._verify_program(main_program)
-        with paddle.fluid.framework._dygraph_guard(
-            paddle.fluid.dygraph.Tracer()
-        ):
+        with paddle.base.framework._dygraph_guard(paddle.base.dygraph.Tracer()):
             self._cuda_graph_vec = self._create_cuda_graph_vec()
         self._cuda_graph_capture_mode = ""
         self._cuda_graph_pool_id = 0

diff --git a/test/ir/new_ir/test_pd_inplace_pass.py b/test/ir/new_ir/test_pd_inplace_pass.py
@@ -17,7 +17,7 @@
 import numpy as np
 
 import paddle
-from paddle.fluid import core
+from paddle.base import core
 
 paddle.enable_static()
 

diff --git a/test/legacy_test/test_fused_scale_bias_relu_conv_bnstats_op.py b/test/legacy_test/test_fused_scale_bias_relu_conv_bnstats_op.py
@@ -20,7 +20,7 @@
 
 import paddle
 from paddle import nn
-from paddle.fluid import core
+from paddle.base import core
 
 
 def skip_unit_test():

diff --git a/test/legacy_test/test_inplace.py b/test/legacy_test/test_inplace.py
@@ -861,7 +861,7 @@ def set_np_compare_func(self):
         self.np_compare = np_array_equal_with_nan
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)
 
@@ -877,7 +877,7 @@ def test_forward_version(self):
     def test_backward_error(self):
         # It raises an error because the inplace operator will result
         # in incorrect gradient computation.
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var_a = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             var_a.stop_gradient = False
 
@@ -920,7 +920,7 @@ def non_inplace_api_processing(self, var):
         return paddle.lcm(var, self.y)
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)
 
@@ -961,7 +961,7 @@ def test_leaf_inplace_var_error(self):
         pass
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)
 
@@ -977,7 +977,7 @@ def test_forward_version(self):
     def test_backward_error(self):
         # It raises an error because the inplace operator will result
         # in incorrect gradient computation.
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var_a = paddle.to_tensor(self.input_var_numpy).astype("float64")
             var_a.stop_gradient = False
 
@@ -1039,7 +1039,7 @@ def non_inplace_api_processing(self, var):
         return paddle.where(var > self.y, var, self.y)
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)
 
@@ -1055,7 +1055,7 @@ def test_forward_version(self):
     def test_backward_error(self):
         # It raises an error because the inplace operator will result
         # in incorrect gradient computation.
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var_a = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             var_a.stop_gradient = False
 
@@ -1344,7 +1344,7 @@ def non_inplace_api_processing(self, var):
     def test_backward_error(self):
         # It raises an error because the inplace operator will result
         # in incorrect gradient computation.
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var_a = paddle.to_tensor(self.input_var_numpy).astype("float64")
             var_a.stop_gradient = False
 
@@ -1364,7 +1364,7 @@ def test_backward_error(self):
                 loss.backward()
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)
 
@@ -1388,7 +1388,7 @@ def non_inplace_api_processing(self, var):
     def test_backward_error(self):
         # It raises an error because the inplace operator will result
         # in incorrect gradient computation.
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var_a = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             var_a.stop_gradient = False
 
@@ -1408,7 +1408,7 @@ def test_backward_error(self):
                 loss.backward()
 
     def test_forward_version(self):
-        with paddle.fluid.dygraph.guard():
+        with paddle.base.dygraph.guard():
             var = paddle.to_tensor(self.input_var_numpy).astype(self.dtype)
             self.assertEqual(var.inplace_version, 0)