Merge branch 'devel' of https://github.com/SumGuo-88/deepmd-kit into …

…devel
deepmodeling · Jan 6, 2025 · 234e461 · 234e461
2 parents 817d2ec + 83b7f1d
commit 234e461
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/deepmd/pt/utils/stat.py b/deepmd/pt/utils/stat.py
@@ -8,11 +8,18 @@
     Optional,
     Union,
 )
+<<<<<<< HEAD
 import numpy as np
 import torch
 from deepmd.dpmodel.output_def import (
     FittingOutputDef,
 )
+=======
+
+import numpy as np
+import torch
+
+>>>>>>> 83b7f1d894ade4452454f51e67ffee86160a71f0
 from deepmd.pt.utils import (
     AtomExcludeMask,
 )