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

refactor simplify #730

Merged
merged 7 commits into from
Jun 9, 2022
Merged

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented May 12, 2022

  1. Used dp model-devi to calculate model deviation, instead of local calculation. Supported by add system names to model devi header deepmd-kit#1618, released in v2.1.1. So the version earlier than 2.1.1 is not supported any more.
  2. Assumed all systems are MultiSystems.
  3. Removed energy model deviation support

1. Used `dp model-devi` to calculate model deviation, instead of local calculation. Supported by deepmodeling/deepmd-kit#1618, released in v2.1.1. So the version earlier than 2.1.1 is not supported any more.
2. Assumed all systems are MultiSystems.
3. Removed energy model deviation support
@codecov-commenter
Copy link

codecov-commenter commented May 12, 2022

Codecov Report

Merging #730 (301821c) into devel (b784351) will increase coverage by 0.42%.
The diff coverage is 19.62%.

@@            Coverage Diff             @@
##            devel     #730      +/-   ##
==========================================
+ Coverage   33.91%   34.34%   +0.42%     
==========================================
  Files          93       93              
  Lines       16562    16390     -172     
==========================================
+ Hits         5617     5629      +12     
+ Misses      10945    10761     -184     
Impacted Files Coverage Δ
dpgen/simplify/simplify.py 0.00% <0.00%> (ø)
dpgen/generator/run.py 62.86% <52.00%> (+0.57%) ⬆️
dpgen/util.py 88.23% <100.00%> (+10.45%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b784351...301821c. Read the comment docs.

@njzjz
Copy link
Member Author

njzjz commented May 13, 2022

Paths are expanded in the get_multi_system, make_train, run_train method, whatever the parameter.

Copy link
Collaborator

@AnguseZhang AnguseZhang left a comment

Choose a reason for hiding this comment

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

Did we delete support for use_clusters? If true, we should also change the readme https://github.com/deepmodeling/dpgen/blob/05d1ac5354c888bff9cba73439fe129c7f25b10c/README.md .

@njzjz
Copy link
Member Author

njzjz commented May 30, 2022

Did we delete support for use_clusters? If true, we should also change the readme https://github.com/deepmodeling/dpgen/blob/05d1ac5354c888bff9cba73439fe129c7f25b10c/README.md .

It has been updated accordingly.

@wanghan-iapcm wanghan-iapcm merged commit 6023899 into deepmodeling:devel Jun 9, 2022
njzjz added a commit to njzjz/dpgen that referenced this pull request Jun 10, 2022
ZLI-afk pushed a commit to ZLI-afk/dpgen that referenced this pull request Jul 4, 2022
* refactor simplify

1. Used `dp model-devi` to calculate model deviation, instead of local calculation. Supported by deepmodeling/deepmd-kit#1618, released in v2.1.1. So the version earlier than 2.1.1 is not supported any more.
2. Assumed all systems are MultiSystems.
3. Removed energy model deviation support

* expand path when getting multisystems

* let `make_train` and `run_train` expand paths

* load numpy array instead

* use dpdata to get nframes

* fix tests

* update README
AnguseZhang pushed a commit that referenced this pull request Jul 5, 2022
* generate run arg doc from scripts

This commit generates run argument documentations from scripts at runtime, so we can work on the script to improve the docs.

* remove `init_multi_systems`

see #730

* set repeat=True for model_devi_jobs

* switch to dargs directive

* switch for mdata

* add extension

* the current model_devi_args is indeed lammps arguments

* fix error

* fix error
@njzjz njzjz mentioned this pull request Aug 19, 2022
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.

4 participants