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

support multiple frames DeepPot in C/hpp API #2309

Merged
merged 2 commits into from
Feb 13, 2023

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Feb 10, 2023

  • Add DeepPot C API v2 to support multiple frames. Also, preserve the arguments for fparam and aparam for future use (planned in [Feature Request] support C library for LAMMPS #2236). V1 is kept for API and ABI compatibility.
  • Support multiple frames for DeepPot hpp API. The API compatibility is kept. Add tests for new situation.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@github-actions github-actions bot added the C label Feb 10, 2023
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@codecov-commenter
Copy link

codecov-commenter commented Feb 13, 2023

Codecov Report

Base: 74.89% // Head: 74.77% // Decreases project coverage by -0.12% ⚠️

Coverage data is based on head (9097088) compared to base (1ce820c).
Patch coverage: 93.22% of modified lines in pull request are covered.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #2309      +/-   ##
==========================================
- Coverage   74.89%   74.77%   -0.12%     
==========================================
  Files         217      217              
  Lines       21606    21663      +57     
  Branches     1586     1586              
==========================================
+ Hits        16181    16198      +17     
- Misses       4400     4444      +44     
+ Partials     1025     1021       -4     
Impacted Files Coverage Δ
source/api_c/src/c_api.cc 80.00% <80.00%> (-0.84%) ⬇️
source/api_c/include/deepmd.hpp 92.71% <100.00%> (+0.18%) ⬆️
source/op/matmul_flt2fix_nvnmd.cc 84.12% <0.00%> (-1.59%) ⬇️
deepmd/utils/weight_avg.py 19.04% <0.00%> (-0.96%) ⬇️
source/lmp/pair_deepmd.cpp 47.21% <0.00%> (-0.91%) ⬇️
deepmd/entrypoints/test.py 10.20% <0.00%> (-0.71%) ⬇️
deepmd/train/trainer.py 83.19% <0.00%> (+0.02%) ⬆️
source/lib/include/ComputeDescriptor.h 79.32% <0.00%> (+0.37%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

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

@njzjz njzjz requested a review from wanghan-iapcm February 13, 2023 01:35
@wanghan-iapcm wanghan-iapcm merged commit a98b368 into deepmodeling:devel Feb 13, 2023
dingye18 added a commit to dingye18/deepmd-kit that referenced this pull request Feb 17, 2023
* print MAE for `dp test` (deepmodeling#2310)

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 bug deepmodeling#2311 when using FP32 in se_atten (deepmodeling#2312)

Fix bug deepmodeling#2311 when using FP32 in se_atten

* support multiple frames DeepPot in C/hpp API (deepmodeling#2309)

* Add DeepPot C API v2 to support multiple frames. Also, preserve the
arguments for fparam and aparam for future use (planned in deepmodeling#2236). V1 is
kept for API and ABI compatibility.
* Support multiple frames for DeepPot hpp API. The API compatibility is
kept. Add tests for new situation.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* Implementation of se_a_mask op (deepmodeling#2313)

* Implement se_a_mask op. Training and inference (c++ interface) are
tested. Unit test files are required.

* Fix bug in atom pref setting for forces.

* Add the unit test for descrpt se_a_mask

* Remove the unit test for dp mask model

* Update dp mask system path for unit test

---------

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

* support exclude_types for se_atten (deepmodeling#2315)

Fix deepmodeling#2232.

Also, clean old useless codes for `exclude_types`.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* fix restarting from the original model (deepmodeling#2317)

deepmodeling#2253 supports restarting from the compressed model but breaks the
original model. This PR fixes the error by detecting the model type
first.

```
FAILED_PRECONDITION: Attempting to use uninitialized value
```

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* package dp_ipi in the PyPI wheels (deepmodeling#2320)

Fix deepmodeling#2282.

In addition, change the return code of `dp_ipi` (without any arguments)
from 1 to 0.

---------

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>

* build Docker images for each push (deepmodeling#2324)

and push the image to the GitHub container.

Also, provide the pypi CUDA support for pypi LAMMPS.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* Fix typo in install docs (deepmodeling#2325)

Signed-off-by: Chun Cai <amoycaic@gmail.com>

* Add a script to detect model version (deepmodeling#2318)

This PR adds a script in deepmd/utils to detect the version of a Deep
Potential model.

---------

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>
Signed-off-by: Chun Cai <amoycaic@gmail.com>
Co-authored-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: Duo <50307526+iProzd@users.noreply.github.com>
Co-authored-by: Chun Cai <amoycaic@gmail.com>
Co-authored-by: Yifan Li李一帆 <yifanl0716@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants