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

Devel update #29

Merged
merged 9 commits into from
Jan 24, 2024
Merged

Devel update #29

merged 9 commits into from
Jan 24, 2024

Conversation

iProzd
Copy link
Owner

@iProzd iProzd commented Jan 24, 2024

No description provided.

denghuilu and others added 9 commits January 22, 2024 22:01
<!--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>
See #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]>
Fix #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]>
Need discussion for other classes.

---------

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.
@@ -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.
@iProzd iProzd merged commit 836b9ee into iProzd:devel-0122 Jan 24, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants