Repository navigation
Input: reject DSP runs where kpar*bndpar != NPROC at input time #8238
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
mohanchen
merged 3 commits into
deepmodeling:develop
from
DanielZhao0432:fix-dsp-kpar-guard
Oct 30, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
e3a21bd
Input: reject DSP runs where kpar*bndpar != NPROC at input time
DanielZhao0432 0d985ea
Merge branch 'deepmodeling:develop' into fix-dsp-kpar-guard
DanielZhao0432 034caac
Address review: testable dsp_kpar_layout_valid helper, bndpar<=0 guard
DanielZhao0432 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #include "gtest/gtest.h" | ||
|
|
||
| #include "source_io/module_parameter/read_input_tool.h" | ||
|
|
||
| /************************************************ | ||
| * unit tests of dsp_kpar_layout_valid | ||
| * | ||
| * The helper encodes the DSP vendor library (mtblas/C_PACK) constraint | ||
| * checked by the kpar input validation under __DSP: the effective k-point | ||
| * pool count (kpar for PW, kpar_lcao for LCAO, the other being 1) times | ||
| * bndpar must equal the number of MPI processes. See issue #8228. | ||
| ***********************************************/ | ||
|
|
||
| TEST(DspKparLayoutValidTest, PWKparPools) | ||
| { | ||
| // PW: kpar keeps the user value, kpar_lcao stays 1 | ||
| EXPECT_TRUE(ModuleIO::dsp_kpar_layout_valid(4, 4, 1, 1)); | ||
| // default kpar=1 on 4 processes: the silently diverging case of #8228 | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 1, 1, 1)); | ||
| // serial run is always fine | ||
| EXPECT_TRUE(ModuleIO::dsp_kpar_layout_valid(1, 1, 1, 1)); | ||
| // more processes than pools | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(8, 4, 1, 1)); | ||
| } | ||
|
|
||
| TEST(DspKparLayoutValidTest, LCAOKparReset) | ||
| { | ||
| // LCAO moves the user kpar into kpar_lcao and forces kpar to 1 | ||
| EXPECT_TRUE(ModuleIO::dsp_kpar_layout_valid(4, 1, 4, 1)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 1, 2, 1)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 1, 1, 1)); | ||
| } | ||
|
|
||
| TEST(DspKparLayoutValidTest, BndparExemption) | ||
| { | ||
| // the bndpar+kpar layout that #7420 intended to allow | ||
| EXPECT_TRUE(ModuleIO::dsp_kpar_layout_valid(4, 2, 1, 2)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 1, 1, 2)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(8, 2, 1, 2)); | ||
| } | ||
|
|
||
| TEST(DspKparLayoutValidTest, DegenerateValues) | ||
| { | ||
| // non-positive factors are invalid layouts, and must be rejected by plain | ||
| // arithmetic without any division so no undefined behavior can occur | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 0, 0, 1)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, 1, 1, 0)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(4, -1, -1, 1)); | ||
| EXPECT_FALSE(ModuleIO::dsp_kpar_layout_valid(0, 1, 1, 1)); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.