PaddlePaddle
diff --git a/‎.flake8
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎.flake8
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎.gitignore
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎.gitignore
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎cmake/generic.cmake
Copy file name to clipboard
+15-1Lines changed: 15 additions & 1 deletion b/‎cmake/generic.cmake
Copy file name to clipboard
+15-1Lines changed: 15 additions & 1 deletion
diff --git a/‎cmake/replace_string.py
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎cmake/replace_string.py
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎paddle/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/op/transform.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/op/transform.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/API.spec
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/API.spec
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/framework/ir/auto_mixed_precision_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/ir/auto_mixed_precision_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pybind/imperative.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/pybind/imperative.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
@@ -3,7 +3,7 @@ select = C,E,W
 exclude =
     ./build,
     # Exclude fluid directory
-    ./python/paddle/fluid/**,
+    ./python/paddle/base/**,
     # Exclude third-party libraries
     ./third_party/**,
     ./python/paddle/utils/gast/**,
 
@@ -95,7 +95,7 @@ paddle/fluid/framework/__init__.py
 paddle/phi/api/profiler/__init__.py
 python/paddle/incubate/fleet/parameter_server/pslib/ps_pb2.py
 paddle/phi/kernels/fusion/cutlass/conv2d/generated/*
-python/paddle/fluid/incubate/fleet/parameter_server/pslib/ps_pb2.py
+python/paddle/base/incubate/fleet/parameter_server/pslib/ps_pb2.py
 paddle/fluid/ir_adaptor/translator/op_compat_info.cc
 paddle/fluid/pybind/static_op_function.*
 paddle/fluid/pybind/ops_api.cc
@@ -1088,7 +1088,21 @@ function(py_proto_compile TARGET_NAME)
                         "${multiValueArgs}" ${ARGN})
   set(py_srcs)
   protobuf_generate_python(py_srcs ${py_proto_compile_SRCS})
-  add_custom_target(${TARGET_NAME} ALL DEPENDS ${py_srcs} protobuf)
+
+  add_custom_target(${TARGET_NAME}_replace DEPENDS ${py_srcs})
+
+  foreach(py_src ${py_srcs})
+    add_custom_command(
+      TARGET ${TARGET_NAME}_replace
+      POST_BUILD
+      COMMAND ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/cmake/replace_string.py
+              ${py_src}
+      COMMENT
+        "Replacing 'paddle.fluid' with 'paddle.base' generated by protobuf"
+      COMMENT "Replace ${py_src}")
+  endforeach()
+
+  add_custom_target(${TARGET_NAME} ALL DEPENDS protobuf ${TARGET_NAME}_replace)
 endfunction()
 
 function(py_test TARGET_NAME)
 
@@ -0,0 +1,31 @@
+# Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+
+def main():
+    src = sys.argv[1]
+
+    with open(src, 'r') as file:
+        content = file.read()
+
+    new_content = content.replace('paddle.fluid', 'paddle.base')
+
+    with open(src, 'w') as file:
+        file.write(new_content)
+
+
+if __name__ == "__main__":
+    main()
@@ -1,5 +1,5 @@
 set(PYTHON_TESTS_DIR
-    ${PADDLE_BINARY_DIR}/python/paddle/fluid/tests
+    ${PADDLE_BINARY_DIR}/python/paddle/base/tests
     CACHE INTERNAL "python tests directory")
 
 add_subdirectory(utils)
 
@@ -2044,7 +2044,7 @@ CINN_REGISTER_HELPER(transform_ops) {
       // pointers, the code generated by operator fusion will have out-of-bounds
       // access. It should not fuse with any other injective operators, though
       // scatter_add is injective. turn KNonFusible to kInjective will fail
-      // /Paddle/python/paddle/fluid/tests/unittests/test_index_select_op.py
+      // /Paddle/python/paddle/base/tests/unittests/test_index_select_op.py
       .set_attr<cinn::hlir::framework::OpPatternKind>(
           "OpPattern", cinn::hlir::framework::OpPatternKind::kNonFusible)
       .set_support_level(4);
 
@@ -1,6 +1,6 @@
-paddle.fluid.optimizer.PipelineOptimizer (paddle.fluid.optimizer.PipelineOptimizer, ('document', '2e55a29dbeb874934f7a1a1af3a22b8c'))
-paddle.fluid.optimizer.PipelineOptimizer.__init__ (ArgSpec(args=['self', 'optimizer', 'num_microbatches', 'start_cpu_core_id'], varargs=None, keywords=None, defaults=(1, 0)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
-paddle.fluid.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'))
 
@@ -600,8 +600,8 @@ if(WITH_PYTHON)
       TARGET framework_py_proto
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E make_directory
-              ${PADDLE_BINARY_DIR}/python/paddle/fluid/proto
-      COMMAND cp *.py ${PADDLE_BINARY_DIR}/python/paddle/fluid/proto/
+              ${PADDLE_BINARY_DIR}/python/paddle/base/proto
+      COMMAND cp *.py ${PADDLE_BINARY_DIR}/python/paddle/base/proto/
       COMMAND cp distributed_strategy_*.py
               ${PADDLE_BINARY_DIR}/python/paddle/distributed/fleet/proto
       COMMENT "Copy generated python proto into directory paddle/fluid/proto."
@@ -620,15 +620,15 @@ if(WITH_PYTHON)
     endif()
   else()
     string(REPLACE "/" "\\" proto_dstpath
-                   "${PADDLE_BINARY_DIR}/python/paddle/fluid/proto/")
+                   "${PADDLE_BINARY_DIR}/python/paddle/base/proto/")
     string(
       REPLACE "/" "\\" fleet_proto_dstpath
               "${PADDLE_BINARY_DIR}/python/paddle/distributed/fleet/proto/")
     add_custom_command(
       TARGET framework_py_proto
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E make_directory
-              ${PADDLE_BINARY_DIR}/python/paddle/fluid/proto
+              ${PADDLE_BINARY_DIR}/python/paddle/base/proto
       COMMAND copy /Y *.py ${proto_dstpath}
       COMMAND copy /Y distributed_strategy_*.py ${fleet_proto_dstpath}
       COMMENT "Copy generated python proto into directory paddle/fluid/proto."
 
@@ -175,7 +175,7 @@ bool OpSupportPrecision(const std::string& op_type,
 // The set of ops that support fp16 calculation and are considered
 // numerically-dangerous, slower and whose effects may also be observed in
 // downstream ops.
-// ref to python/paddle/fluid/contrib/mixed_precision/fp16_lists.py
+// ref to python/paddle/base/contrib/mixed_precision/fp16_lists.py
 void AutoMixedPrecisionPass::SetDefaultBlacklist() const {
   black_list_.insert({
       // numerically-dangerous
 
@@ -1034,7 +1034,7 @@ void BindImperative(py::module *m_ptr) {
         import paddle
 
         data = np.random.randint(10, size=(3, 4))
-        tensor = paddle.fluid.core.to_uva_tensor(data)
+        tensor = paddle.base.core.to_uva_tensor(data)
         print(tensor)
 )DOC");
 
@@ -1165,7 +1165,7 @@ void BindImperative(py::module *m_ptr) {
 
           import numpy as np
           import paddle
-          from paddle.fluid import core
+          from paddle.base import core
           from paddle.device import cuda
 
           if core.is_compiled_with_cuda():
@@ -1397,7 +1397,7 @@ void BindImperative(py::module *m_ptr) {
 
           import numpy as np
           import paddle
-          from paddle.fluid import core
+          from paddle.base import core
           from paddle.device import cuda
 
           if core.is_compiled_with_cuda():