Merge branch 'deepmodeling:master' into master

Author: zhaiwenxi

deepmd/pt_expt/descriptor/dpa2.py

@@ -69,6 +69,8 @@ def share_params(
                 "g1_shape_tranform"
             ]
             self._modules["repformers"] = base_class._modules["repformers"]
+            if "tebd_transform" in base_class._modules:
+                self._modules["tebd_transform"] = base_class._modules["tebd_transform"]
         elif shared_level == 1:
             self._modules["type_embedding"] = base_class._modules["type_embedding"]
         else:

deepmd/pt_expt/descriptor/dpa3.py

@@ -40,6 +40,10 @@ def share_params(
             if not resume:
                 merge_env_stat(base_class.repflows, self.repflows, model_prob)
             self._modules["repflows"] = base_class._modules["repflows"]
+            if self.add_chg_spin_ebd:
+                for key in ("chg_embedding", "spin_embedding", "mix_cs_mlp"):
+                    if key in base_class._modules:
+                        self._modules[key] = base_class._modules[key]
         elif shared_level == 1:
             self._modules["type_embedding"] = base_class._modules["type_embedding"]
         else:

deepmd/pt_expt/infer/deep_eval.py

@@ -368,10 +368,15 @@ def _load_pt(self, model_file: str, head: str | None = None) -> None:
         # eager inference).  Drop the latter and unwrap the former.
         cleaned: dict[str, Any] = {}
         compiled_marker = ".compiled_forward_lower."
+        # Per-task buffer copies registered on _CompiledModel (bias_atom_e,
+        # case_embd) — real values live on the original model's fitting net.
+        task_buf_marker = "._task_"
         wrapper_infix = ".original_model."
         for key, value in state_dict.items():
             if compiled_marker in key:
                 continue
+            if task_buf_marker in key:
+                continue
             if wrapper_infix in key:
                 key = key.replace(wrapper_infix, ".", 1)
             cleaned[key] = value