Solve conflict

Author: Chengqian-Zhang

deepmd/pd/model/atomic_model/dp_atomic_model.py

@@ -397,13 +397,14 @@ def wrapped_sampler():
             return sampled
 
         self.descriptor.compute_input_stats(wrapped_sampler, stat_file_path)
-        self.compute_fitting_input_stat(wrapped_sampler)
+        self.compute_fitting_input_stat(wrapped_sampler, stat_file_path)
         if compute_or_load_out_stat:
             self.compute_or_load_out_stat(wrapped_sampler, stat_file_path)
 
     def compute_fitting_input_stat(
         self,
         sample_merged: Union[Callable[[], list[dict]], list[dict]],
+        stat_file_path: Optional[DPPath] = None,
     ) -> None:
         """Compute the input statistics (e.g. mean and stddev) for the fittings from packed data.
 
@@ -416,9 +417,11 @@ def compute_fitting_input_stat(
             - Callable[[], list[dict]]: A lazy function that returns data samples in the above format
                 only when needed. Since the sampling process can be slow and memory-intensive,
                 the lazy function helps by only sampling once.
+        stat_file_path : Optional[DPPath]
+            The dictionary of paths to the statistics files.
         """
         self.fitting_net.compute_input_stats(
-            sample_merged, protection=self.data_stat_protect
+            sample_merged, protection=self.data_stat_protect, stat_file_path=stat_file_path,
         )
 
     def get_dim_fparam(self) -> int:

deepmd/pt/model/atomic_model/dp_atomic_model.py

@@ -338,13 +338,14 @@ def wrapped_sampler() -> list[dict]:
             return sampled
 
         self.descriptor.compute_input_stats(wrapped_sampler, stat_file_path)
-        self.compute_fitting_input_stat(wrapped_sampler)
+        self.compute_fitting_input_stat(wrapped_sampler, stat_file_path)
         if compute_or_load_out_stat:
             self.compute_or_load_out_stat(wrapped_sampler, stat_file_path)
 
     def compute_fitting_input_stat(
         self,
         sample_merged: Union[Callable[[], list[dict]], list[dict]],
+        stat_file_path: Optional[DPPath] = None,
     ) -> None:
         """Compute the input statistics (e.g. mean and stddev) for the fittings from packed data.
 
@@ -357,9 +358,11 @@ def compute_fitting_input_stat(
             - Callable[[], list[dict]]: A lazy function that returns data samples in the above format
                 only when needed. Since the sampling process can be slow and memory-intensive,
                 the lazy function helps by only sampling once.
+        stat_file_path : Optional[DPPath]
+            The dictionary of paths to the statistics files.
         """
         self.fitting_net.compute_input_stats(
-            sample_merged, protection=self.data_stat_protect
+            sample_merged, protection=self.data_stat_protect, stat_file_path=stat_file_path,
         )
 
     def get_dim_fparam(self) -> int: