Fix NLinear normalization to support past covariates

darts/models/forecasting/nlinear.py

@@ -142,17 +142,15 @@ def forward(
             x = x.permute(0, 2, 1, 3)
         else:
             if self.normalize:
-                seq_last = x[:, -1:, :].detach()  # (batch, 1, in_dim)
+                # get last values only for target features
+                seq_last = x[:, -1:, : self.output_dim].detach()
                 x = x - seq_last
 
             x = self.layer(x.view(batch, -1))  # (batch, out_len * out_dim * nr_params)
             x = x.view(
                 batch, self.output_chunk_length, self.output_dim * self.nr_params
             )
 
-            if self.normalize:
-                x = x + seq_last  # Note: works only when nr_params == 1
-
             if self.future_cov_dim != 0:
                 # x_future might be shorter than output_chunk_length when n < output_chunk_length
                 # so we need to pad it with zeros at the end to match the output_chunk_length
@@ -175,7 +173,8 @@ def forward(
                 )
 
             x = x.view(batch, self.output_chunk_length, self.output_dim, self.nr_params)
-
+            if self.normalize:
+                x = x + seq_last.view(seq_last.shape + (1,))
         return x
 
 

darts/tests/models/forecasting/test_dlinear_nlinear.py

@@ -174,8 +174,13 @@ def _eval_model(
                 val2,
                 fut_cov1,
                 fut_cov2,
+                past_cov1=None,
+                past_cov2=None,
+                val_past_cov1=None,
+                val_past_cov2=None,
                 cls=DLinearModel,
                 lkl=None,
+                **kwargs
             ):
                 model = cls(
                     input_chunk_length=50,
@@ -189,6 +194,12 @@ def _eval_model(
 
                 model.fit(
                     [train1, train2],
+                    past_covariates=[past_cov1, past_cov2]
+                    if past_cov1 is not None
+                    else None,
+                    val_past_covariates=[val_past_cov1, val_past_cov2]
+                    if val_past_cov1 is not None
+                    else None,
                     future_covariates=[fut_cov1, fut_cov2]
                     if fut_cov1 is not None
                     else None,
@@ -200,6 +211,9 @@ def _eval_model(
                     future_covariates=[fut_cov1, fut_cov2]
                     if fut_cov1 is not None
                     else None,
+                    past_covariates=[fut_cov1, fut_cov2]
+                    if past_cov1 is not None
+                    else None,
                     n=len(val1),
                     num_samples=500 if lkl is not None else 1,
                 )
@@ -211,6 +225,10 @@ def _eval_model(
 
             train1, val1 = series1.split_after(0.7)
             train2, val2 = series2.split_after(0.7)
+            past_cov1 = train1.copy()
+            past_cov2 = train2.copy()
+            val_past_cov1 = val1.copy()
+            val_past_cov2 = val2.copy()
 
             for model, lkl in product(
                 [DLinearModel, NLinearModel], [None, GaussianLikelihood()]
@@ -254,6 +272,21 @@ def _eval_model(
                 assert e1 <= 0.40
                 assert e2 <= 0.34
 
+            e1, e2 = _eval_model(
+                train1,
+                train2,
+                val1,
+                val2,
+                fut_cov1,
+                fut_cov2,
+                past_cov1=past_cov1,
+                past_cov2=past_cov2,
+                val_past_cov1=val_past_cov1,
+                val_past_cov2=val_past_cov2,
+                cls=NLinearModel,
+                lkl=None,
+                normalize=True,
+            )
             # can only fit models with past/future covariates when shared_weights=False
             for model in [DLinearModel, NLinearModel]:
                 for shared_weights in [True, False]: