patchfm 2.2.2__tar.gz → 3.0.0__tar.gz

{patchfm-2.2.2/src/patchfm.egg-info → patchfm-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchfm
-Version: 2.2.2
+Version: 3.0.0
 Summary: a Foundation Model for Univariate Time Series Forecasting
 Author-email: Samy-Melwan Vilhes <samy-melwan.vilhes@insa-rouen.fr>
 License: MIT License

{patchfm-2.2.2 → patchfm-3.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "patchfm"
-version = "2.2.2"
+version = "3.0.0"
 authors = [
   { name="Samy-Melwan Vilhes", email="samy-melwan.vilhes@insa-rouen.fr" },
 ]

{patchfm-2.2.2 → patchfm-3.0.0}/src/patchfm/inference/forecaster.py

@@ -24,6 +24,7 @@ class Forecaster(nn.Module):
 
         print("Loading base model from HuggingFace Hub...")
         base_model = PatchFM.from_pretrained("vilhess/PatchFM")
+
         self._init_from_base(base_model)
 
         self.eval()
@@ -46,7 +47,7 @@ class Forecaster(nn.Module):
         self.transformer_encoder = TransformerEncoder(
             d_model=self.d_model, 
             n_heads=self.n_heads, 
-            n_layers=self.n_layers_encoder
+            n_layers=self.n_layers_encoder,
         )
         self.proj_output = ResidualBlock(
             in_dim=self.d_model, 
@@ -69,15 +70,7 @@ class Forecaster(nn.Module):
         # Default horizon = patch_len
         forecast_horizon = forecast_horizon or self.patch_len
 
-        x = self.converter.convert(x)
-        assert x.ndim in (1, 2), f"Input dimension must be 1D (time) or 2D (batch, time), got {x.ndim}D."
-
-        batch_dim=True
-        if x.ndim != 2:
-            x = x.unsqueeze(0)
-            batch_dim=False
         bs, ws = x.size()
-
         x = x.to(self.device)
 
         if ws > self.max_seq_len:
@@ -153,26 +146,39 @@ class Forecaster(nn.Module):
             pred_median = torch.zeros_like(pred_median)
             pred_quantiles = torch.zeros_like(pred_quantiles)
         
-        if not batch_dim:
-            pred_median = pred_median.squeeze(0)
-            pred_quantiles = pred_quantiles.squeeze(0)   
-
-        pred_median, pred_quantiles = self.converter.deconvert(pred_median, pred_quantiles)
         return pred_median, pred_quantiles
 
     def __call__(self, context: torch.Tensor, forecast_horizon: int | None = None, quantiles: list[float] | None = None, flip_equivariance: bool = False) -> torch.Tensor:
+
+        x = self.converter.convert(context)
+        assert x.ndim in (1, 2), f"Input dimension must be 1D (time) or 2D (batch, time), got {x.ndim}D."
+
+        batch_dim=True
+        if x.ndim != 2:
+            x = x.unsqueeze(0)
+            batch_dim=False
+
+        bs, ws = x.size()
+
         if flip_equivariance:
-            print("Flip equivariance enabled: forecast = (f(x) - f(-x)) / 2. This requires multiplying by 2 the batch size (Reverso: Efficient Time Series Foundation Models for Zero-shot Forecasting).")
+
             bs = context.size(0)
-            context_flipped = -context
-            concat_context = torch.cat([context, context_flipped], dim=0)
-            pred_median_full, pred_quantiles_full = self.auto_regressive_quantile_decoding(concat_context, forecast_horizon, quantiles)
+            x_flipped = -x
+            concat_x = torch.cat([x, x_flipped], dim=0)
+            pred_median_full, pred_quantiles_full = self.auto_regressive_quantile_decoding(concat_x, forecast_horizon, quantiles)
             pred_median, pred_quantiles = pred_median_full[:bs], pred_quantiles_full[:bs]
             pred_median2, pred_quantiles2 = pred_median_full[bs:], pred_quantiles_full[bs:]
             pred_median = (pred_median - pred_median2) / 2
             pred_quantiles = (pred_quantiles - flip_last_dim(pred_quantiles2)) / 2
         else:
-            pred_median, pred_quantiles = self.auto_regressive_quantile_decoding(context, forecast_horizon, quantiles)
+            pred_median, pred_quantiles = self.auto_regressive_quantile_decoding(x, forecast_horizon, quantiles)
+
+        if not batch_dim:
+            pred_median = pred_median.squeeze(0)
+            pred_quantiles = pred_quantiles.squeeze(0)   
+
+        pred_median, pred_quantiles = self.converter.deconvert(pred_median, pred_quantiles)
+
         return pred_median, pred_quantiles
     
     def clear_cache(self):

{patchfm-2.2.2 → patchfm-3.0.0}/src/patchfm/inference/modules.py

@@ -204,7 +204,7 @@ class MultiHeadAttention(nn.Module):
         self.v_cache = None
 
         self.last = last
-    
+
     def forward(self, q):
         bs, context, dim = q.size()
         offset = 0
@@ -319,7 +319,7 @@ class PatchFM(nn.Module, PyTorchModelHubMixin):
         self.transformer_encoder = TransformerEncoder(
             d_model=self.d_model, 
             n_heads=self.n_heads, 
-            n_layers=self.n_layers_encoder
+            n_layers=self.n_layers_encoder, 
         )
         self.proj_output = ResidualBlock(
             in_dim=self.d_model, 

{patchfm-2.2.2 → patchfm-3.0.0/src/patchfm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchfm
-Version: 2.2.2
+Version: 3.0.0
 Summary: a Foundation Model for Univariate Time Series Forecasting
 Author-email: Samy-Melwan Vilhes <samy-melwan.vilhes@insa-rouen.fr>
 License: MIT License