Skip to content

Conversation

@njzjz
Copy link
Member

@njzjz njzjz commented Jan 27, 2024

Just merge in form. Several options or subcommands are only supported by TensorFlow or PyTorch.

Also, avoid import from deepmd.tf in deepmd.utils.argcheck.

Use --tf or --pt to choose the backend:
    dp --tf train input.json
    dp --pt train input.json

njzjz added 2 commits January 27, 2024 02:20
Also, avoid import from deepmd.tf in deepmd.utils.argcheck.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
return super().__new__(DeepPotTF)
elif backend == DPBackend.PyTorch:
from deepmd_pt.infer.deep_eval import DeepPot as DeepPotPT
from deepmd.pt.infer.deep_eval import DeepPot as DeepPotPT

Check notice

Code scanning / CodeQL

Cyclic import

Import of module [deepmd.pt.infer.deep_eval](1) begins an import cycle.
Comment on lines +33 to +35
from deepmd.main import (
parse_args,
)

Check notice

Code scanning / CodeQL

Cyclic import

Import of module [deepmd.main](1) begins an import cycle.
elif args.pt:
args.backend = "pytorch"
if args.backend == "tensorflow":
from deepmd.tf.entrypoints.main import main as deepmd_main

Check notice

Code scanning / CodeQL

Cyclic import

Import of module [deepmd.tf.entrypoints.main](1) begins an import cycle.
if args.backend == "tensorflow":
from deepmd.tf.entrypoints.main import main as deepmd_main
elif args.backend == "pytorch":
from deepmd.pt.entrypoints.main import main as deepmd_main

Check notice

Code scanning / CodeQL

Cyclic import

Import of module [deepmd.pt.entrypoints.main](1) begins an import cycle.
@codecov
Copy link

codecov bot commented Jan 27, 2024

Codecov Report

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

Comparison is base (f4d7c7e) 74.29% compared to head (a575312) 74.25%.
Report is 3 commits behind head on devel.

Files Patch % Lines
deepmd/pt/entrypoints/main.py 41.66% 14 Missing ⚠️
deepmd/main.py 77.27% 5 Missing ⚠️
deepmd/tf/entrypoints/main.py 33.33% 2 Missing ⚠️
deepmd/infer/deep_pot.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3187      +/-   ##
==========================================
- Coverage   74.29%   74.25%   -0.05%     
==========================================
  Files         343      343              
  Lines       31638    31653      +15     
  Branches     1592     1592              
==========================================
- Hits        23506    23504       -2     
- Misses       7207     7224      +17     
  Partials      925      925              

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

njzjz added 2 commits January 27, 2024 02:45
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
njzjz added 3 commits January 27, 2024 05:41
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz requested a review from wanghan-iapcm January 27, 2024 11:18
@wanghan-iapcm wanghan-iapcm merged commit 484bdc3 into deepmodeling:devel Jan 27, 2024
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants