【Fluid Clean】 Rename paddle.fluid to paddle.base by Difers · Pull Request #56576 · PaddlePaddle/Paddle

Difers · 2023-08-23T09:42:29Z

PR types

Breaking changes

PR changes

APIs

Description

飞桨2.0版本发布时，将fluid API标记为废弃状态并计划将fluid代码退场。经过近一年的清理工作，python/paddle/fluid目录下由近3000文件数，72W行代码，清理到39个文件，2.9W行代码，原fluid API及相关辅助函数已移除或迁移完毕，仅剩余框架基础组件内容。经过飞桨内部讨论，这部分内容将更名为paddle.base，作为基础组件继续提供功能支持。
在本PR中，python/paddle/fluid目录将更名为python/paddle/base，c++目录paddle/fluid不受影响。这意味着fluid API的彻底退场，用户将不再能调用任何形式的fluid API，如对相关功能仍有需求，可以参考Paddle 1.8 与 Paddle 2.0 API 映射表，使用推荐的飞桨2.0API。

zoooo0820 · 2023-08-25T02:59:44Z

+              ${py_src}
+      COMMENT
+        "Replacing 'paddle.fluid' with 'paddle.base' generated by protobuf"
+      COMMENT "Replace ${py_src}")


此处是由于当前proto文件存放在paddle/fluid/目录下，在通过protoc工具自动转换成py文件时，文件内容中的import关系仍保持为包含fluid的路径；由于paddle/fluid目录并不在本次改动范围内，不适合调整proto文件本身的位置。因此这里对生成的文件内的import路径做修改。

zoooo0820 · 2023-08-25T03:05:26Z

-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.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'))


PipelineOptimizer的当前路径是paddle.incubate.optimizer.PipelineOptimizer

zoooo0820 · 2023-08-25T03:17:06Z

+        # 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


该PR编译后的产物和环境，由于会产出两份用于develop版本代码编译会造成问题；这段代码仅用于帮助通过build流水线检查，后续将移除

zoooo0820 · 2023-08-25T03:24:16Z

+def base_model():
    parameter_tar = paddle.dataset.common.download(
-        FLUID_URL_MODEL, 'uci_housing', FLUID_MD5_MODEL, 'fit_a_line.fluid.tar'
+        FLUID_URL_MODEL, 'uci_housing', FLUID_MD5_MODEL, 'fit_a_line.base.tar'


这个文件中是url和文件名以及函数名，不应该改动

zoooo0820 · 2023-08-25T03:28:01Z

                #  If not marked non_differentiable, all output tensors' attr `stop gradient`
                #  will be reset to `False` in c++ backend.
-                #  See https://github.com/PaddlePaddle/Paddle/blob/9d62efb0e6e5373823039d9eda96cd5905426c0a/paddle/fluid/pybind/eager_py_layer.cc#L388
+                #  See https://github.com/PaddlePaddle/Paddle/blob/9d62efb0e6e5373823039d9eda96cd5905426c0a/paddle/base/pybind/eager_py_layer.cc#L388


请不要改动url

zoooo0820 · 2023-08-29T13:04:21Z



-def fluid_model():
+def base_model():


这个文件中的两处均不应该改动：URL和函数名

jeff41404 · 2023-08-30T06:59:10Z

            .. code-block:: python

-                import paddle.fluid as fluid
+                import paddle.base as fluid


is it better to use import paddle.base as base, and replace fluid.Tensor() with base.Tensor() ?

Can other example code in this file be processed in the same way

done, thanks for pointing out the mistake.

Yes, works of Document Standardization will be done in open-source task: #55629

risemeup1

LGTM

sunzhongkai588

LGTM for docs

jeff41404

LGTM

raindrops2sea

LGTM

* rename fluid to base * fix setup and rename paddle.fluid * fix protobuf generated paddle.fluid * fix some errors * fix cmake depends * fix some error * try to fix cache error * fix codestyle && some doc error * remove build change * fix some error --------- Co-authored-by: XiangGao <jeff41404@gmail.com>

paddle-bot Bot added the contributor External developers label Aug 23, 2023

Difers force-pushed the rename_fluid branch 7 times, most recently from 1bd9c3d to b38d97a Compare August 24, 2023 15:09

zoooo0820 reviewed Aug 25, 2023

View reviewed changes

sunzhongkai588 mentioned this pull request Aug 25, 2023

[xdoctest] 分批次修改已有代码的示例 #55629

Closed

Difers force-pushed the rename_fluid branch 3 times, most recently from 2151375 to 383d8d2 Compare August 29, 2023 11:52

zoooo0820 reviewed Aug 29, 2023

View reviewed changes

Difers force-pushed the rename_fluid branch 2 times, most recently from 3866b90 to a4b6de9 Compare August 30, 2023 04:56

jeff41404 reviewed Aug 30, 2023

View reviewed changes

Difers force-pushed the rename_fluid branch 11 times, most recently from 94be2eb to bda9596 Compare September 5, 2023 03:14

Difers changed the title ~~Rename fluid~~ 【Fluid Clean】 Rename paddle.fluid to paddle.base Sep 5, 2023

Difers force-pushed the rename_fluid branch from bda9596 to 14c0656 Compare September 6, 2023 03:19

Difers added 10 commits September 6, 2023 14:47

rename fluid to base

f8f4d23

fix setup and rename paddle.fluid

6e36399

fix protobuf generated paddle.fluid

6779c4b

fix some errors

2527ae8

fix cmake depends

dd79a4a

fix some error

87e1a3c

try to fix cache error

0c402d7

fix codestyle && some doc error

b7db312

remove build change

6fa4c80

fix some error

6dbbf91

Difers force-pushed the rename_fluid branch from 14c0656 to 6dbbf91 Compare September 6, 2023 06:51

Merge branch 'develop' into rename_fluid

5c03556

risemeup1 approved these changes Sep 7, 2023

View reviewed changes

sunzhongkai588 approved these changes Sep 7, 2023

View reviewed changes

chenwhql approved these changes Sep 7, 2023

View reviewed changes

cyber-pioneer approved these changes Sep 7, 2023

View reviewed changes

jeff41404 approved these changes Sep 7, 2023

View reviewed changes

luotao1 approved these changes Sep 7, 2023

View reviewed changes

raindrops2sea approved these changes Sep 7, 2023

View reviewed changes

raindrops2sea merged commit e53afe5 into PaddlePaddle:develop Sep 7, 2023

SigureMo added a commit to PaddlePaddle/PaddleSOT that referenced this pull request Sep 7, 2023

rename fluid to base (sync with PaddlePaddle/Paddle#56576)

3b97989

SigureMo mentioned this pull request Sep 7, 2023

rename fluid to base (sync with PaddlePaddle/Paddle#56576) PaddlePaddle/PaddleSOT#384

Merged

SigureMo added a commit to PaddlePaddle/PaddleSOT that referenced this pull request Sep 8, 2023

rename fluid to base (sync with PaddlePaddle/Paddle#56576) (#384)

67bf709

gouzil mentioned this pull request Sep 15, 2023

[CodeStyle] Ruff upgrade and addition of paddle.base check #57367

Closed

ooooo-create mentioned this pull request Nov 24, 2023

动转静单测时间统计和优化专项 #59339

Closed

Difers mentioned this pull request Dec 8, 2023

WAVE SUMMIT+2023下半年飞桨开源之星评选-信息征集 PaddlePaddle/community#765

Closed

timmoon10 mentioned this pull request Jan 26, 2024

[Paddle] Replace paddle.fluid imports with paddle.base NVIDIA/TransformerEngine#633

Merged



		def fluid_model():
		def base_model():

Conversation

Difers commented Aug 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR types

PR changes

Description

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

risemeup1 left a comment

Choose a reason for hiding this comment

Uh oh!

sunzhongkai588 left a comment

Choose a reason for hiding this comment

Uh oh!

jeff41404 left a comment

Choose a reason for hiding this comment

Uh oh!

raindrops2sea left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Difers commented Aug 23, 2023 •

edited

Loading