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

Chore: refactor InvarFitting #3266

Merged
merged 46 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b54e109
feat: redo pt dipole
anyangml Feb 13, 2024
ca75551
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 13, 2024
9bc9900
Merge branch 'devel' into devel
anyangml Feb 13, 2024
4ca7a30
Merge branch 'devel' into devel
anyangml Feb 14, 2024
156c17f
Merge branch 'devel' into devel
anyangml Feb 14, 2024
dbd68ae
Merge branch 'devel' into devel
anyangml Feb 14, 2024
fba6eb4
Merge branch 'devel' into devel
anyangml Feb 14, 2024
bdd2b5c
fix: numpy warning
anyangml Feb 14, 2024
3797ac0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2024
86a6713
chore: refactor InvarFitting
anyangml Feb 14, 2024
9585203
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2024
31d84fc
chore: refactor InvarFitting
anyangml Feb 14, 2024
5459248
chore: refactor InvarFitting
anyangml Feb 14, 2024
be5be25
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2024
ad810df
chore: refactor InvarFitting
anyangml Feb 14, 2024
6932c24
Merge branch 'devel' into devel
anyangml Feb 15, 2024
6ade44f
chore: refactor InvarFitting
anyangml Feb 15, 2024
ca957b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
404f31f
fix: internal dipole fit output shape
anyangml Feb 15, 2024
d1fedf8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
514271b
fix: mask shape
anyangml Feb 15, 2024
40e8a7e
Merge branch 'devel' into devel
anyangml Feb 15, 2024
06fb5bf
chore: restore dipole, split PR
anyangml Feb 15, 2024
41d94b5
chore: restore LinearAtomicModel
anyangml Feb 15, 2024
593b517
Merge branch 'devel' into devel
anyangml Feb 15, 2024
e122700
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
0e1182e
fix: ignore numpy warning
anyangml Feb 15, 2024
7e06282
Merge branch 'devel' into devel
anyangml Feb 15, 2024
c8d97e8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
39a5c34
fix: merge conflict
anyangml Feb 15, 2024
1c30126
fix: merge conflict
anyangml Feb 15, 2024
1ae6ce5
fix: merge conflict
anyangml Feb 15, 2024
0e98ddc
chore: refactor
anyangml Feb 15, 2024
22e6d82
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
ecf242b
chore: refactor
anyangml Feb 15, 2024
042201a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
7698483
chore: refactor
anyangml Feb 15, 2024
c3be87c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
367e0ad
fix: revert device
anyangml Feb 15, 2024
709b010
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2024
b8bdbbc
fix: add device
anyangml Feb 16, 2024
4bb7737
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 16, 2024
7f9292a
fix: cuda
anyangml Feb 16, 2024
4ff3019
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 16, 2024
1fd58a4
fix: cuda
anyangml Feb 16, 2024
e125be1
fix: cuda
anyangml Feb 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions deepmd/dpmodel/atomic_model/linear_atomic_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,16 @@ def _compute_weight(
),
axis=-1,
) # handle masked nnei.
sigma = numerator / denominator
with np.errstate(divide="ignore", invalid="ignore"):
sigma = numerator / denominator
u = (sigma - self.sw_rmin) / (self.sw_rmax - self.sw_rmin)
coef = np.zeros_like(u)
left_mask = sigma < self.sw_rmin
mid_mask = (self.sw_rmin <= sigma) & (sigma < self.sw_rmax)
right_mask = sigma >= self.sw_rmax
coef[left_mask] = 1
smooth = -6 * u**5 + 15 * u**4 - 10 * u**3 + 1
with np.errstate(invalid="ignore"):
smooth = -6 * u**5 + 15 * u**4 - 10 * u**3 + 1
coef[mid_mask] = smooth[mid_mask]
coef[right_mask] = 0
self.zbl_weight = coef
Expand Down
4 changes: 2 additions & 2 deletions deepmd/pt/model/task/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
DenoiseNet,
)
from .dipole import (
DipoleFittingNetType,
DipoleFittingNet,
)
from .ener import (
EnergyFittingNet,
Expand All @@ -25,7 +25,7 @@
__all__ = [
"FittingNetAttenLcc",
"DenoiseNet",
"DipoleFittingNetType",
"DipoleFittingNet",
"EnergyFittingNet",
"EnergyFittingNetDirect",
"Fitting",
Expand Down
2 changes: 1 addition & 1 deletion deepmd/pt/model/task/dipole.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
log = logging.getLogger(__name__)


class DipoleFittingNetType(Fitting):
class DipoleFittingNet(Fitting):
def __init__(
self, ntypes, embedding_width, neuron, out_dim, resnet_dt=True, **kwargs
):
Expand Down
Loading