Skip to content

Conversation

@zty-king
Copy link
Contributor

PR Category

Execute Infrastructure

PR Types

Bug fixes

Description

这里存在一个问题,一般箭头左边是来自src的key,而箭头右边是来自dst的key,这里的逻辑是先匹配第一个有$LAYER_ID标记的identifier,然而,在get_num_hidden_layers的时候,取的都是dst的key,那么就会发生,如果箭头左右两边的key并不一样,例如qkv->q,k,v时,就会出现key匹配不上的现象,从而返回了一个空的set,导致整个expanded_expressions被返回了一个空列表。

@paddle-bot paddle-bot bot added the contributor External developers label Sep 26, 2025
@codecov-commenter
Copy link

codecov-commenter commented Sep 26, 2025

Codecov Report

❌ Patch coverage is 94.28571% with 2 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (develop@47699dd). Learn more about missing BASE report.

Files with missing lines Patch % Lines
...ddle/distributed/flex_checkpoint/aoa/aoa_engine.py 84.61% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             develop   #75556   +/-   ##
==========================================
  Coverage           ?   94.28%           
==========================================
  Files              ?        2           
  Lines              ?       35           
  Branches           ?        0           
==========================================
  Hits               ?       33           
  Misses             ?        2           
  Partials           ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@paddle-bot
Copy link

paddle-bot bot commented Sep 26, 2025

你的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.

@zty-king
Copy link
Contributor Author

/re-run all-failed

return "fused_qkv_old_macro"

def source_code(self):
return "layers.1.self_attn.qkv_proj.bias -> layers.1.self_attn.qkv_proj.bias, fused_qkv_old, num_heads = 8, num_key_value_groups = 4, axis = 0"
Copy link
Contributor

Choose a reason for hiding this comment

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

layers.1.self_attn.qkv_proj.bias,bias通常是一维的,这里为了适配这种情况所以传入了参数axis = 0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

已修改

@zty-king
Copy link
Contributor Author

/re-run all-failed

@xingmingyyj
Copy link
Contributor

LGTM

@zty-king zty-king changed the title fix_the_layer_id_macro 【FlexCheckpoint】fix_the_layer_id_macro Oct 11, 2025
@xingmingyyj
Copy link
Contributor

LGTM

@From00 From00 merged commit 4971c3c into PaddlePaddle:develop Oct 15, 2025
52 checks passed
xingmingyyj pushed a commit to xingmingyyj/Paddle that referenced this pull request Nov 5, 2025
* fix_the_layer_id_macro

* fix the ctest

* add expert_id_macro

* fix the assert bug

* fix the code style
xingmingyyj pushed a commit to xingmingyyj/Paddle that referenced this pull request Nov 5, 2025
* fix_the_layer_id_macro

* fix the ctest

* add expert_id_macro

* fix the assert bug

* fix the code style
From00 pushed a commit that referenced this pull request Nov 6, 2025
…#76252)

* 【FlexCheckpoint】fix_the_layer_id_macro (#75556)

* fix_the_layer_id_macro

* fix the ctest

* add expert_id_macro

* fix the assert bug

* fix the code style

* Pr support load hf checkpoint (#75928)

* support hf checkpoint

fix

support cast

add id macro

fix

* add test and fix some bug

* fix full param bug

* add full param cast test

---------

Co-authored-by: xingmingyyj <[email protected]>

* 【Flexcheckpoint】add_get_var_mapping_chain_macro (#76013)

* add_get_var_mapping_chain_macro

* add note

* fix the bug input_vars and resolve_mapping_chain

* fix the code style

* fit the dtype assert bug

* fix the bug

* fix the merge_sharded_state_dict bug

* fix aoa transpose corner case (#76234)

---------

Co-authored-by: Tianyu Zheng <[email protected]>
sneaxiy pushed a commit that referenced this pull request Nov 6, 2025
….2 (#76249)

* 【FlexCP】merge_sharded_state_dict support distribute merge (#75005)

* fix data is nullptr

* add dist merge

* change test

* change test

* 【FlexCP】add Skip param param for merge_shard_state_dict (#75061)

* fix data is nullptr

* add dist merge

* change test

* change test

* add skip optimizer param

* [Flex CP]Fix merge_sharded_state_dict with aoa and offload (#75062)

* fix merge_state_dict with aoa and offload

* add tests

* refine

* fix

* fix

* add log

* fix

* fix

* 【FlexCheckpoint】Upgrade some macros and optimize load_state_dict communication (#75282)

* upgrad macros and load_state_dict comm task

fix

fix

support 0-d tensor

fix

balance save and fix

* fix test

* Add the test about the sharded_state_dict of optimizer  (#75067)

* fix the share_weight_bug

* add note

* add the unit test

* set the timeout

* add more test

* Trigger CI rebuild

* fix the CmakeLists

* handle_missing_edge_cases_in_fc (#75413)

* up_grade fc (#75613)

fix and add test

fix

fix

fix

fix cmakelists

add notion

* 【FlexCheckpoint】fix_the_layer_id_macro (#75556)

* fix_the_layer_id_macro

* fix the ctest

* add expert_id_macro

* fix the assert bug

* fix the code style

* Pr support load hf checkpoint (#75928)

* support hf checkpoint

fix

support cast

add id macro

fix

* add test and fix some bug

* fix full param bug

* add full param cast test

---------

Co-authored-by: xingmingyyj <[email protected]>

* 【Flexcheckpoint】add_get_var_mapping_chain_macro (#76013)

* add_get_var_mapping_chain_macro

* add note

* fix the bug input_vars and resolve_mapping_chain

* fix the code style

* fit the dtype assert bug

* fix the bug

* fix the merge_sharded_state_dict bug

* fix aoa transpose corner case (#76234)

---------

Co-authored-by: xiaoguoguo626807 <[email protected]>
Co-authored-by: Chen Zhiyang <[email protected]>
Co-authored-by: Tianyu Zheng <[email protected]>
@zty-king zty-king deleted the fix_the_layer_id_macro branch November 23, 2025 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contributor External developers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants