From 6a2d4e419dcc98d70d7e695c6973200e52bef915 Mon Sep 17 00:00:00 2001 From: Olivier Sprangers Date: Wed, 26 Feb 2025 16:56:02 +0100 Subject: [PATCH 1/4] fix_error --- nbs/common.base_model.ipynb | 2 +- neuralforecast/common/_base_model.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nbs/common.base_model.ipynb b/nbs/common.base_model.ipynb index 458136169..b910caebd 100644 --- a/nbs/common.base_model.ipynb +++ b/nbs/common.base_model.ipynb @@ -341,7 +341,7 @@ " else:\n", " self.batch_size = batch_size\n", " if valid_batch_size is None:\n", - " self.valid_batch_size = batch_size\n", + " self.valid_batch_size = self.batch_size\n", " else:\n", " self.valid_batch_size = valid_batch_size\n", " if inference_windows_batch_size is None:\n", diff --git a/neuralforecast/common/_base_model.py b/neuralforecast/common/_base_model.py index aec754e15..a18f79d13 100644 --- a/neuralforecast/common/_base_model.py +++ b/neuralforecast/common/_base_model.py @@ -323,7 +323,7 @@ def __init__( else: self.batch_size = batch_size if valid_batch_size is None: - self.valid_batch_size = batch_size + self.valid_batch_size = self.batch_size else: self.valid_batch_size = valid_batch_size if inference_windows_batch_size is None: From b7f90b2b6b2d02b06f7f5a56f58bcb412ecdb30f Mon Sep 17 00:00:00 2001 From: Olivier Sprangers Date: Wed, 26 Feb 2025 17:29:30 +0100 Subject: [PATCH 2/4] fix_error --- nbs/common.base_model.ipynb | 4 ++++ neuralforecast/common/_base_model.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/nbs/common.base_model.ipynb b/nbs/common.base_model.ipynb index b910caebd..d8dde7817 100644 --- a/nbs/common.base_model.ipynb +++ b/nbs/common.base_model.ipynb @@ -338,12 +338,16 @@ " # Batch sizes\n", " if self.MULTIVARIATE and n_series is not None:\n", " self.batch_size = max(batch_size, n_series)\n", + " if valid_batch_size is not None:\n", + " valid_batch_size = max(valid_batch_size, n_series)\n", " else:\n", " self.batch_size = batch_size\n", + " \n", " if valid_batch_size is None:\n", " self.valid_batch_size = self.batch_size\n", " else:\n", " self.valid_batch_size = valid_batch_size\n", + "\n", " if inference_windows_batch_size is None:\n", " self.inference_windows_batch_size = windows_batch_size\n", " else:\n", diff --git a/neuralforecast/common/_base_model.py b/neuralforecast/common/_base_model.py index a18f79d13..907dae444 100644 --- a/neuralforecast/common/_base_model.py +++ b/neuralforecast/common/_base_model.py @@ -320,12 +320,16 @@ def __init__( # Batch sizes if self.MULTIVARIATE and n_series is not None: self.batch_size = max(batch_size, n_series) + if valid_batch_size is not None: + valid_batch_size = max(valid_batch_size, n_series) else: self.batch_size = batch_size + if valid_batch_size is None: self.valid_batch_size = self.batch_size else: self.valid_batch_size = valid_batch_size + if inference_windows_batch_size is None: self.inference_windows_batch_size = windows_batch_size else: From 62c9c0a75e65572849e9d33ae82380da0667fe8d Mon Sep 17 00:00:00 2001 From: Olivier Sprangers Date: Fri, 28 Feb 2025 17:14:48 +0100 Subject: [PATCH 3/4] fix_ipython_version --- environment-cpu.yml | 1 + environment-cuda.yml | 1 + settings.ini | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/environment-cpu.yml b/environment-cpu.yml index bb43c6e45..2d4f4c3ec 100644 --- a/environment-cpu.yml +++ b/environment-cpu.yml @@ -22,6 +22,7 @@ dependencies: - snappy<1.2.0 - pip: - nbdev + - ipython<=8.32.0 - black - polars - ray[tune]>=2.2.0 diff --git a/environment-cuda.yml b/environment-cuda.yml index 1fd311870..1e5891931 100644 --- a/environment-cuda.yml +++ b/environment-cuda.yml @@ -22,6 +22,7 @@ dependencies: - s3fs - pip: - nbdev + - ipython<=8.32.0 - black - polars - "ray[tune]>=2.2.0" diff --git a/settings.ini b/settings.ini index a708d6cfa..071286fcb 100644 --- a/settings.ini +++ b/settings.ini @@ -18,7 +18,7 @@ status = 2 requirements = coreforecast>=0.0.6 fsspec numpy>=1.21.6 pandas>=1.3.5 torch>=2.0.0 pytorch-lightning>=2.0.0 ray[tune]>=2.2.0 optuna utilsforecast>=0.2.3 spark_requirements = fugue pyspark>=3.5 aws_requirements = fsspec[s3] -dev_requirements = black gitpython hyperopt matplotlib mypy nbdev==2.3.25 polars pre-commit pyarrow ruff s3fs transformers +dev_requirements = black gitpython hyperopt matplotlib mypy nbdev==2.3.25 ipython<=8.32.0 polars pre-commit pyarrow ruff s3fs transformers nbs_path = nbs doc_path = _docs recursive = True From 69b85cfd3f246cec07c7fda28abfb3f1d8d993bc Mon Sep 17 00:00:00 2001 From: marcopeix Date: Mon, 3 Mar 2025 10:05:34 -0500 Subject: [PATCH 4/4] Alphabetical order of dev_requirements --- settings.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.ini b/settings.ini index 220960c17..a2c955028 100644 --- a/settings.ini +++ b/settings.ini @@ -18,7 +18,7 @@ status = 2 requirements = coreforecast>=0.0.6 fsspec numpy>=1.21.6 pandas>=1.3.5 torch>=2.0.0 pytorch-lightning>=2.0.0 ray[tune]>=2.2.0 optuna utilsforecast>=0.2.3 spark_requirements = fugue pyspark>=3.5 aws_requirements = fsspec[s3] -dev_requirements = black gitpython hyperopt matplotlib mypy nbdev==2.3.25 ipython<=8.32.0 polars pre-commit pyarrow ruff s3fs transformers +dev_requirements = black gitpython hyperopt ipython<=8.32.0 matplotlib mypy nbdev==2.3.25 polars pre-commit pyarrow ruff s3fs transformers nbs_path = nbs doc_path = _docs recursive = True