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

updata #2

Merged
merged 62 commits into from
Nov 29, 2023
Merged

updata #2

merged 62 commits into from
Nov 29, 2023

Conversation

chouyoudou
Copy link
Owner

No description provided.

amcadmus and others added 30 commits May 4, 2023 09:27
…#466)

Co-authored-by: Jia-Xin Zhu <xmuchiahsin@gmail.com>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.263 →
v0.0.265](astral-sh/ruff-pre-commit@v0.0.263...v0.0.265)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.265 →
v0.0.267](astral-sh/ruff-pre-commit@v0.0.265...v0.0.267)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Before this PR, when using DP models to predict energies and forces, the
atom types were changed in the returned system according to the type map
in the model. This is not an expected behavior. The changed atom types
should only be used for internal inference.
In this commit, the deepmd format reads data types from
`dpdata.system.LabeledSystem.DTYPES` and load or dump the corresponding
data. One can modify `dpdata.system.LabeledSystem.DTYPES` before using
it or in a plugin (see tests), so deepmd format can be extended in this
way.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.267 →
v0.0.269](astral-sh/ruff-pre-commit@v0.0.267...v0.0.269)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
When using system.to() and convert data to write ABACUS `STRU` file,
func `make_unlabeled_stru` won't use `atom_types` in data and miswriting
the atom order.
For example when using data from gaussian/log and other file using
ungrouped atom coordinations,as the `atom_types=[0,1,1,1,2,1]` the func
will write wrong coordinations and regard the atom as
`atom_types=[0,1,1,1,1,2]` which cause serious problem.
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.269 →
v0.0.270](astral-sh/ruff-pre-commit@v0.0.269...v0.0.270)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Follow up #476. `deepmd/npy` and `deepmd/raw` are ok, and only
`deepmd/hdf5` has this bug.
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.270 →
v0.0.272](astral-sh/ruff-pre-commit@v0.0.270...v0.0.272)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
When `sys1.append(sys2)`, we do not hope that `sys2` to be modified in
any way.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
<!--pre-commit.ci start-->
updates:
- [github.com/asottile/blacken-docs: 1.13.0 →
1.14.0](adamchainz/blacken-docs@1.13.0...1.14.0)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.272 →
v0.0.275](astral-sh/ruff-pre-commit@v0.0.272...v0.0.275)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- https://github.com/charliermarsh/ruff-pre-commithttps://github.com/astral-sh/ruff-pre-commit
- [github.com/astral-sh/ruff-pre-commit: v0.0.275 →
v0.0.276](astral-sh/ruff-pre-commit@v0.0.275...v0.0.276)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.3.0 →
23.7.0](psf/black@23.3.0...23.7.0)
- [github.com/astral-sh/ruff-pre-commit: v0.0.276 →
v0.0.277](astral-sh/ruff-pre-commit@v0.0.276...v0.0.277)
- [github.com/asottile/blacken-docs: 1.14.0 →
1.15.0](adamchainz/blacken-docs@1.14.0...1.15.0)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.277 →
v0.0.278](astral-sh/ruff-pre-commit@v0.0.277...v0.0.278)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
Reverts #501

Let's see if the error got fixed.
Move DataType to an independent module, so register it will be eaiser.
No breaking changes are made.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.278 →
v0.0.280](astral-sh/ruff-pre-commit@v0.0.278...v0.0.280)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sometimes, the shape is unknown and can be any integer. This PR supports
this situation. The shape of a dimension can be `-1`.
Note: Only one `-1` can be used.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: liaoruihao <liaoruihao@liaoruihaodeMacBook-Pro.local>
ZhouXY-PKU and others added 29 commits August 15, 2023 21:06
The example is wrong? "driver" should be "Driver"?

Signed-off-by: Levi Zhou  <31941107+ZhouXY-PKU@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.282 →
v0.0.284](astral-sh/ruff-pre-commit@v0.0.282...v0.0.284)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
unclear what this file is used for
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.284 →
v0.0.285](astral-sh/ruff-pre-commit@v0.0.284...v0.0.285)
- [github.com/asottile/blacken-docs: 1.15.0 →
1.16.0](adamchainz/blacken-docs@1.15.0...1.16.0)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.285 →
v0.0.286](astral-sh/ruff-pre-commit@v0.0.285...v0.0.286)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.286 →
v0.0.287](astral-sh/ruff-pre-commit@v0.0.286...v0.0.287)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
fix #508,
#507

---------

Signed-off-by: link89 <xuweihong.cn@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.7.0 →
23.9.1](psf/black@23.7.0...23.9.1)
- [github.com/astral-sh/ruff-pre-commit: v0.0.287 →
v0.0.288](astral-sh/ruff-pre-commit@v0.0.287...v0.0.288)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
When a data type is unexpectedly registered twice, the behavior of some
methods will be strange (for example, `append`).

For this reason, the old one is replaced, and a warning is thrown.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.288 →
v0.0.290](astral-sh/ruff-pre-commit@v0.0.288...v0.0.290)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.290 →
v0.0.291](astral-sh/ruff-pre-commit@v0.0.290...v0.0.291)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.0.291 →
v0.0.292](astral-sh/ruff-pre-commit@v0.0.291...v0.0.292)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 →
v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…ss (#549)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Fix #553.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Copied from DeePMD-kit with minor changes, which I think is good enough.
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.9.1 →
23.10.0](psf/black@23.9.1...23.10.0)
- [github.com/astral-sh/ruff-pre-commit: v0.0.292 →
v0.1.1](astral-sh/ruff-pre-commit@v0.0.292...v0.1.1)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.9.1 →
23.10.0](psf/black@23.9.1...23.10.0)
- [github.com/astral-sh/ruff-pre-commit: v0.0.292 →
v0.1.1](astral-sh/ruff-pre-commit@v0.0.292...v0.1.1)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…#558)

Squashed commit of the following:

commit dfb6191
Merge: 1b55e6c 5028af6
Author: Yongbin Zhuang <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 22:02:15 2023 +0100

    add decrecaption warning when dpdata throws errors while parsing cp2k (#558)

commit 5028af6
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 21:28:21 2023 +0100

    raise PendingDeprecationWarning

commit 3ee373d
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Oct 30 19:51:57 2023 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit cec3fc2
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 20:51:26 2023 +0100

    add exact except for the cp2k plugin.

commit 7a09854
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 20:38:23 2023 +0100

    fixed typo in checking cp2k pattern match.

commit 1a4b985
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 14:34:50 2023 +0100

    update error for cp2k aimdoutput if none pattern is matched

commit a1a171a
Merge: 621d686 1b55e6c
Author: Yongbin Zhuang <38876805+robinzyb@users.noreply.github.com>
Date:   Mon Oct 30 13:59:10 2023 +0100

    Merge branch 'deepmodeling:devel' into devel

commit 621d686
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Fri Oct 20 22:53:54 2023 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit 03cc010
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Sat Oct 21 00:50:51 2023 +0200

    add decrecaption warning when dpdata throws errors while parsing cp2k

commit 0576449
Merge: 4840bbc dbe2bc9
Author: Yongbin Zhuang <38876805+robinzyb@users.noreply.github.com>
Date:   Sat Oct 21 00:30:18 2023 +0200

    Merge branch 'deepmodeling:devel' into devel

commit 4840bbc
Author: robinzyb <38876805+robinzyb@users.noreply.github.com>
Date:   Thu Sep 7 14:12:19 2023 +0200

    Update README.md for recommendation of using cp2kdata
Signed-off-by: Peng Xingliang <91927439+pxlxingliang@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.10.0 →
23.10.1](psf/black@23.10.0...23.10.1)
- [github.com/astral-sh/ruff-pre-commit: v0.1.1 →
v0.1.3](astral-sh/ruff-pre-commit@v0.1.1...v0.1.3)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@chouyoudou chouyoudou merged commit 2bb045d into chouyoudou:master Nov 29, 2023
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.