Skip to content

Conversation

gouzil
Copy link
Member

@gouzil gouzil commented Oct 22, 2023

@paddle-bot
Copy link

paddle-bot bot commented Oct 22, 2023

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@paddle-bot paddle-bot bot added the contributor External developers label Oct 22, 2023
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2023-10-22 23:28:58     from paddle.distributed.parallel import (
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/distributed/parallel.py", line 28, in <module>
2023-10-22 23:28:58     from paddle.distributed.collective import (
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/distributed/collective.py", line 25, in <module>
2023-10-22 23:28:58     from .fleet.layers.mpu.mp_ops import (  # noqa: F401
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/distributed/fleet/layers/mpu/__init__.py", line 15, in <module>
2023-10-22 23:28:58     from .mp_layers import VocabParallelEmbedding
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/distributed/fleet/layers/mpu/mp_layers.py", line 21, in <module>
2023-10-22 23:28:58     from paddle.nn import functional as F
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/nn/__init__.py", line 18, in <module>
2023-10-22 23:28:58     from . import functional, initializer, quant, utils  # noqa: F401
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/nn/quant/__init__.py", line 15, in <module>
2023-10-22 23:28:58     from . import qat  # noqa: F401
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/nn/quant/qat/__init__.py", line 14, in <module>
2023-10-22 23:28:58     from .conv import QuantedConv2D
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/nn/quant/qat/conv.py", line 20, in <module>
2023-10-22 23:28:58     from ..format import ConvertibleQuantedLayer
2023-10-22 23:28:58   File "/usr/local/lib/python3.10/dist-packages/paddle/nn/quant/format.py", line 21, in <module>
2023-10-22 23:28:58     from paddle.nn import Layer
2023-10-22 23:28:58 ImportError: cannot import name 'Layer' from partially initialized module 'paddle.nn' (most likely due to a circular import) (/usr/local/lib/python3.10/dist-packages/paddle/nn/__init__.py)

circular import 了 [doge]

@@ -13,71 +13,59 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import os
import os # noqa: F401
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个 os……应该没用吧?

Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

冲突需要解决下

from .convert_operators import unpack_by_structure as Unpack # noqa: F401

# isort: off
# NOTE(gouzil): isort will delete the import
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO:之后添加 combine-as-imports 配置,然后删除这个 isort 的 off 部分

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

SigureMo
SigureMo previously approved these changes Oct 23, 2023
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMeow 🐾

@paddle-ci-bot
Copy link

paddle-ci-bot bot commented Oct 31, 2023

Sorry to inform you that ebca56a's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

@luotao1 luotao1 self-assigned this Nov 3, 2023
@luotao1 luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Nov 3, 2023
@luotao1
Copy link
Contributor

luotao1 commented Nov 3, 2023

请再解决下冲突

# Conflicts:
#	python/paddle/static/nn/__init__.py
@gouzil
Copy link
Member Author

gouzil commented Nov 3, 2023

请再解决下冲突

Done

@luotao1
Copy link
Contributor

luotao1 commented Nov 6, 2023

又冲突了😢

@gouzil
Copy link
Member Author

gouzil commented Nov 6, 2023

又冲突了😢

Done

Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMeow

@luotao1 luotao1 merged commit a6b922d into PaddlePaddle:develop Nov 7, 2023
jiahy0825 pushed a commit to jiahy0825/Paddle that referenced this pull request Nov 7, 2023
zeroRains pushed a commit to zeroRains/Paddle that referenced this pull request Nov 8, 2023
danleifeng pushed a commit to danleifeng/Paddle that referenced this pull request Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor External developers HappyOpenSource 快乐开源活动issue与PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants