Skip to content
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

split make_fp and share make_fp_calculation between run and simplify #1235

Merged
merged 5 commits into from May 30, 2023

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented May 29, 2023

Fix #1222.

Currently, make_fp does two things: (1) select candidates from the model_devi task; (2) make FP input file. They are in the same method. This commit splits the method into two independent methods, make_fp_configs and make_fp_calculation. Run and simplify have their own make_fp_configs, but share the same make_fp_calculation.

The existing problem is that make_fp_configs generates different formats for different model_devi_engine. (e.g., POSCAR for lammps) We should resolve this problem in the future.

Fix deepmodeling#1222.

Currently make_fp does two things: (1) select candidates from the model_devi task; (2) make FP input file. They are in the same method.
This commit splitted the method into two indepedent methods `make_fp_configs` and `make_fp_calculation`. Run and simplify have their own `make_fp_configs`, but share the same `make_fp_calculation`.
A problem is that `make_fp_configs` generates different formats for different model_devi_engine. (e.g. POSCAR for lammps) We should resolve this problem in the future.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz linked an issue May 29, 2023 that may be closed by this pull request
@njzjz njzjz changed the title refactor make_fp and share more methods between run and simplify refactor make_fp and share make_fp_calculation between run and simplify May 29, 2023
njzjz added 2 commits May 29, 2023 16:54
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz marked this pull request as ready for review May 29, 2023 20:59
@njzjz njzjz changed the title refactor make_fp and share make_fp_calculation between run and simplify split make_fp and share make_fp_calculation between run and simplify May 29, 2023
@codecov
Copy link

codecov bot commented May 29, 2023

Codecov Report

Patch coverage: 86.95% and project coverage change: +0.11 🎉

Comparison is base (2d82618) 47.22% compared to head (86b5787) 47.33%.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #1235      +/-   ##
==========================================
+ Coverage   47.22%   47.33%   +0.11%     
==========================================
  Files          82       82              
  Lines       14666    14627      -39     
==========================================
- Hits         6926     6924       -2     
+ Misses       7740     7703      -37     
Impacted Files Coverage Δ
dpgen/simplify/simplify.py 21.81% <0.00%> (+0.99%) ⬆️
dpgen/generator/run.py 66.07% <95.00%> (+0.16%) ⬆️
dpgen/simplify/arginfo.py 100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@wanghan-iapcm wanghan-iapcm merged commit bd9a72e into deepmodeling:devel May 30, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] _dpgen simplify with ABACUS_
2 participants