merge paddlefleet to paddleformers#4670
Conversation
|
root seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
PaddleFormers Log Analysis
日志分析报告
失败的测试case: 根本原因分析: 修复建议:
🔄 每次 Re-run 后自动更新 |
0a77ccd to
25ab366
Compare
a6aa38f to
253e26f
Compare
67e3673 to
3ee3fc5
Compare
3ee3fc5 to
ac7b330
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #4670 +/- ##
=========================================
Coverage ? 0
=========================================
Files ? 0
Lines ? 0
Branches ? 0
=========================================
Hits ? 0
Misses ? 0
Partials ? 0 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
… into merge_paddlefleet_to_paddleformers
928b5f9 to
a165d9f
Compare
| -e PP="rel" \ | ||
| -w /workspace --network host ${docker_image} | ||
| - name: Install PaddleFormers | ||
| run: | |
83f615f to
a243335
Compare
…ging field
- fleet-release-test.yml: fetch-depth 100→0, replace HEAD~1..HEAD with
origin/${BRANCH}...HEAD to cover full PR range (matches PaddleFleet Test.yml)
- model_args.py: add moe_logging: bool | None field to ModelArguments
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
3fdbd10 to
37887d5
Compare
risemeup1111
left a comment
There was a problem hiding this comment.
已复查最新提交,默认依赖中的 Paddle GPU nightly 固定版本会让只从 PyPI/镜像安装依赖的环境直接失败;具体证据和建议已放在行级评论中。该问题会阻断当前 XPU/回归安装流程,建议修复后再继续合入。
| @@ -1,4 +1,6 @@ | |||
| colorlog | |||
| colorlog>=6.10.1 | |||
| paddlepaddle-gpu==3.4.0.post20260623+7bd6c765854 | |||
There was a problem hiding this comment.
这里把 GPU nightly 版 paddlepaddle-gpu==3.4.0.post20260623+7bd6c765854 放进默认依赖后,任何只从 PyPI/镜像安装 requirements.txt 或 wheel 默认依赖的环境都会在安装阶段失败。当前 XPU job 已在 python -m pip install -r requirements.txt 处报 No matching distribution found for paddlepaddle-gpu==3.4.0.post20260623+7bd6c765854,本地查询 PyPI 也只列到 2.6.2;后续脚本中按 CUDA/XPU 分支安装专用 Paddle wheel 的逻辑还没执行就会退出。
请不要把硬件/索引相关的 GPU nightly wheel 固定在默认依赖里;改为在各 CI/部署脚本按目标硬件显式安装对应 Paddle 包,或移到明确的 GPU extra/constraint,并同步移除 requirements.txt 和 pyproject.toml 默认依赖中的这项。建议形态如下:
# pyproject.toml
# dependencies 中不放 paddlepaddle-gpu;GPU CI 脚本用对应 index/wheel 单独安装。
dependencies = [
"colorlog>=6.10.1",
"tilelang-paddle",
# ...
]…elease Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Use "packages/" instead of _pkg_rel_path so the last commit hash and date reflect any change under packages/, matching PaddleFleet Test.yml behavior. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- version.txt: base version 1.2.0 - build_backend.py: generates paddleformers/_version.py at build time, format: 1.2.0.dev<YYYYMMDD>+<11-char-commit> (matches PaddleFleet pattern) - pyproject.toml: switch to custom build backend, dynamic version via paddleformers._version.__version__ - .gitignore: unblock build_backend.py, ignore generated paddleformers/_version.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
risemeup1111
left a comment
There was a problem hiding this comment.
已复查最新提交。此前默认依赖中的 Paddle GPU nightly 固定版本仍未移除,继续沿用已有行级讨论;这次新增的构建后端还会让无 .git 的源码归档构建失败,具体证据和建议已放在新的行级评论中。
| version_file = _pkg_root / "version.txt" | ||
| base_version = version_file.read_text().strip() | ||
|
|
||
| git_commit_hash = get_git_commit_hash(_pkg_root) |
There was a problem hiding this comment.
这里在检查 version_py.exists() and not is_git_repo() 之前就执行 git rev-parse HEAD,导致没有 .git 的源码归档/发布包无法进入兜底分支,PEP 517 后端导入时直接失败。我用当前 head 的 git archive 解包后执行 /usr/local/bin/python -m pip wheel . --no-deps,在 get_requires_for_build_wheel 阶段复现了 CalledProcessError: git rev-parse HEAD;这会影响从 GitHub tarball、sdist 或其他无 Git 元数据目录构建 PaddleFormers。
请先处理非 Git 场景,再调用任何 git 命令;若已有生成的 _version.py 就直接复用,否则至少用环境变量/unknown commit 生成可构建的版本信息。示例修复形态:
version_py = _pkg_root / "paddleformers" / "_version.py"
if not is_git_repo():
if version_py.exists():
logger.info("_version.py already exists (not in git repo), keeping it")
return base_version
final_version = os.environ.get("PADDLEFORMERS_VERSION", base_version)
git_commit_hash = os.environ.get("PADDLEFORMERS_COMMIT", "unknown")
else:
git_commit_hash = get_git_commit_hash(_pkg_root)
# existing git-based version/date/branch logicBoth packages live in the same repo; always use HEAD so both whl names carry the same commit hash and date. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
paddlefleet_ops version reflects the last commit touching packages/, not HEAD. Multiple paddleformers versions may share the same ops version until packages/ changes — matching the original PaddleFleet design. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Before submitting
testsfolder. If there are codecov issues, please add tests cases first.PR types
PR changes
Description