Apply suggestions from code review

Co-authored-by: A bot of @njzjz <48687836+njzjz-bot@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <njzjz@qq.com>

Author: njzjz

deepmd/pd/infer/deep_eval.py

@@ -839,6 +839,7 @@ def eval_descriptor(
                 aparam=aparam,
                 **kwargs,
             )
+            descriptor = model.eval_descriptor()
         except RetrySignal:
             return self.eval_descriptor(
                 coords,
@@ -849,7 +850,6 @@ def eval_descriptor(
                 **kwargs,
             )
         finally:
-            descriptor = model.eval_descriptor()
             model.set_eval_descriptor_hook(False)
             if self.auto_batch_size is not None:
                 self.auto_batch_size.set_oom_retry_mode(False)
@@ -909,8 +909,9 @@ def eval_fitting_last_layer(
                 aparam=aparam,
                 **kwargs,
             )
+            fitting_net = model.eval_fitting_last_layer()
         except RetrySignal:
-            return self.eval_descriptor(
+            return self.eval_fitting_last_layer(
                 coords,
                 cells,
                 atom_types,
@@ -919,7 +920,6 @@ def eval_fitting_last_layer(
                 **kwargs,
             )
         finally:
-            fitting_net = model.eval_fitting_last_layer()
             model.set_eval_fitting_last_layer_hook(False)
             if self.auto_batch_size is not None:
                 self.auto_batch_size.set_oom_retry_mode(False)

deepmd/pt/infer/deep_eval.py

@@ -809,6 +809,7 @@ def eval_descriptor(
                 aparam=aparam,
                 **kwargs,
             )
+            descriptor = model.eval_descriptor()
         except RetrySignal:
             return self.eval_descriptor(
                 coords,
@@ -819,7 +820,6 @@ def eval_descriptor(
                 **kwargs,
             )
         finally:
-            descriptor = model.eval_descriptor()
             model.set_eval_descriptor_hook(False)
             if self.auto_batch_size is not None:
                 self.auto_batch_size.set_oom_retry_mode(False)
@@ -879,8 +879,9 @@ def eval_fitting_last_layer(
                 aparam=aparam,
                 **kwargs,
             )
+            fitting_net = model.eval_fitting_last_layer()
         except RetrySignal:
-            return self.eval_descriptor(
+            return self.eval_fitting_last_layer(
                 coords,
                 cells,
                 atom_types,
@@ -889,7 +890,6 @@ def eval_fitting_last_layer(
                 **kwargs,
             )
         finally:
-            fitting_net = model.eval_fitting_last_layer()
             model.set_eval_fitting_last_layer_hook(False)
             if self.auto_batch_size is not None:
                 self.auto_batch_size.set_oom_retry_mode(False)