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

add universal Python inference interface DeepPot #3164

Merged
merged 4 commits into from
Jan 24, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Jan 22, 2024

Need discussion for other classes.

@njzjz njzjz added this to the v3.0.0 milestone Jan 22, 2024
deepmd_utils/infer/deep_pot.py Fixed Show fixed Hide fixed
@@ -26,6 +26,7 @@
from deepmd.utils.sess import (
run_sess,
)
from deepmd_utils.infer.deep_pot import DeepPot as DeepPotBase

Check notice

Code scanning / CodeQL

Cyclic import Note

Import of module
deepmd_utils.infer.deep_pot
begins an import cycle.
deepmd_utils/infer/deep_pot.py Fixed Show fixed Hide fixed
AI is not always reliable..

Signed-off-by: Jinzhe Zeng <[email protected]>
if cls is DeepPot:
backend = detect_backend(model_file)
if backend == DPBackend.TensorFlow:
from deepmd.infer.deep_pot import DeepPot as DeepPotTF

Check notice

Code scanning / CodeQL

Cyclic import Note

Import of module
deepmd.infer.deep_pot
begins an import cycle.
Copy link

codecov bot commented Jan 22, 2024

Codecov Report

Attention: 10 lines in your changes are missing coverage. Please review.

Comparison is base (e5f9117) 76.06% compared to head (3aa25be) 76.06%.
Report is 1 commits behind head on devel.

Files Patch % Lines
deepmd_utils/infer/backend.py 66.66% 5 Missing ⚠️
deepmd_utils/infer/deep_pot.py 78.26% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3164      +/-   ##
==========================================
- Coverage   76.06%   76.06%   -0.01%     
==========================================
  Files         277      280       +3     
  Lines       25603    25644      +41     
  Branches     1591     1591              
==========================================
+ Hits        19476    19507      +31     
- Misses       5203     5213      +10     
  Partials      924      924              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

njzjz added 2 commits January 22, 2024 16:43
Signed-off-by: Jinzhe Zeng <[email protected]>
Signed-off-by: Jinzhe Zeng <[email protected]>
@wanghan-iapcm wanghan-iapcm merged commit 04c414a into deepmodeling:devel Jan 24, 2024
46 checks passed
iProzd added a commit to iProzd/deepmd-kit that referenced this pull request Jan 24, 2024
* Fix max nbor size related issues (deepmodeling#3157)

* Merge master into devel (deepmodeling#3167)

* [pre-commit.ci] pre-commit autoupdate (deepmodeling#3163)

<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.13 →
v0.1.14](astral-sh/ruff-pre-commit@v0.1.13...v0.1.14)
<!--pre-commit.ci end-->

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

* setup PyTorch C++ interface build environement (deepmodeling#3169)

See deepmodeling#3120.

- CMake: add `ENABLE_TENSORFLOW` and `ENABLE_PYTORCH`.
`BUILD_TENSORFLOW` will be enabled when `TENSORFLOW_ROOT` is not empty
or `USE_TF_PYTHON_LIBS` is on.
- api_cc: add `BUILD_TENSORFLOW` and `BUILD_PYTORCH` defination. Move
several functions from `common.h` to `commonTF.h` to prevent exposing
them to header files.
- CI: download libtorch in the build/test CC actions.

---------

Signed-off-by: Jinzhe Zeng <[email protected]>

* docs: add TF icons to platform-specific features (deepmodeling#3171)

Fix deepmodeling#3121.

The PyTorch icon can be added when a feature implemented by PyTorch is
added.

However, I can't find a way to add an icon to TOC.


![image](https://github.com/deepmodeling/deepmd-kit/assets/9496702/7f29da27-af81-4850-9da0-79310d216b2d)

Signed-off-by: Jinzhe Zeng <[email protected]>

* add universal Python inference interface DeepPot (deepmodeling#3164)

Need discussion for other classes.

---------

Signed-off-by: Jinzhe Zeng <[email protected]>

* detect version in advance before building deepmd-kit-cu11 (deepmodeling#3172)

Fix deepmodeling#3168.

See:
pypa/setuptools-scm#1006 (comment)

---------

Signed-off-by: Jinzhe Zeng <[email protected]>

---------

Signed-off-by: Jinzhe Zeng <[email protected]>
Co-authored-by: Denghui Lu <[email protected]>
Co-authored-by: Jinzhe Zeng <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@njzjz njzjz mentioned this pull request Apr 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants