Fixes and improves logging for inference module

tingiskhan · Jun 2, 2021 · 3a32086 · 3a32086
1 parent 0c55901
commit 3a32086
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/pyfilter/__init__.py b/pyfilter/__init__.py
@@ -1 +1 @@
-__version__ = "0.17.7"
+__version__ = "0.17.8"
diff --git a/pyfilter/inference/batch/base.py b/pyfilter/inference/batch/base.py
@@ -98,10 +98,9 @@ def fit(self, y: torch.Tensor, logging=None, **kwargs) -> AlgorithmState:
                 state.converged = self.is_converged(old_loss, state.loss)
                 state.optimizer.zero_grad()
 
+            return state
+
         except Exception as e:
-            logging.close()
             raise e
-
-        logging.close()
-
-        return state
+        finally:
+            logging.close()
diff --git a/pyfilter/inference/batch/mcmc/pmmh.py b/pyfilter/inference/batch/mcmc/pmmh.py
@@ -45,8 +45,10 @@ def fit(self, y: torch.Tensor, logging=None, **kwargs):
 
                 state.update(params_to_tensor(self._filter.ssm, constrained=True))
                 logging.do_log(i, state)
+
+            return state
+
         except Exception as e:
-            logging.close()
             raise e
-
-        return state
+        finally:
+            logging.close()
diff --git a/pyfilter/inference/sequential/base.py b/pyfilter/inference/sequential/base.py
@@ -30,13 +30,12 @@ def fit(self, y, logging=None, **kwargs) -> FilteringAlgorithmState:
                 state = self.update(yt, state)
                 logging.do_log(i, state)
 
+            return state
+
         except Exception as e:
-            logging.close()
             raise e
-
-        logging.close()
-
-        return state
+        finally:
+            logging.close()
 
 
 class SequentialParticleAlgorithm(SequentialFilteringAlgorithm, ABC):