From 4dbde415ed214fb984fd3989775ee40c9f7b6bf9 Mon Sep 17 00:00:00 2001 From: shashank10456 Date: Thu, 8 Feb 2024 10:06:47 -0800 Subject: [PATCH] Fix: Get metrics from _conf.metrics on Trainer to avoid issue with Flattening the matrix (#346) --------- Signed-off-by: ssrigiri1 Co-authored-by: Avik Basu --- numalogic/udfs/trainer/_base.py | 2 +- pyproject.toml | 2 +- tests/udfs/test_trainer.py | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/numalogic/udfs/trainer/_base.py b/numalogic/udfs/trainer/_base.py index a12640d7..9ff27eff 100644 --- a/numalogic/udfs/trainer/_base.py +++ b/numalogic/udfs/trainer/_base.py @@ -219,7 +219,7 @@ def exec(self, keys: list[str], datum: Datum) -> Messages: # Construct feature array x_train, nan_counter, inf_counter = self.get_feature_arr( - df, payload.metrics, max_value_map=_conf.numalogic_conf.trainer.max_value_map + df, _conf.metrics, max_value_map=_conf.numalogic_conf.trainer.max_value_map ) _add_summary( summary=NAN_SUMMARY, diff --git a/pyproject.toml b/pyproject.toml index 32bd3346..ae575101 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "numalogic" -version = "0.6.2" +version = "0.6.3" description = "Collection of operational Machine Learning models and tools." authors = ["Numalogic Developers"] packages = [{ include = "numalogic" }] diff --git a/tests/udfs/test_trainer.py b/tests/udfs/test_trainer.py index 195ab042..6d9dd2ee 100644 --- a/tests/udfs/test_trainer.py +++ b/tests/udfs/test_trainer.py @@ -87,7 +87,9 @@ def test_trainer_01(self): conf={"seq_len": 12, "n_features": 2}, ), preprocess=[ModelInfo(name="LogTransformer", stateful=True, conf={})], - trainer=TrainerConf(pltrainer_conf=LightningTrainerConf(max_epochs=1)), + trainer=TrainerConf( + pltrainer_conf=LightningTrainerConf(accelerator="cpu", max_epochs=1) + ), ), ) } @@ -122,6 +124,7 @@ def test_trainer_03(self): ml_pipelines={ "pipeline1": MLPipelineConf( pipeline_id="pipeline1", + metrics=["failed", "degraded"], numalogic_conf=NumalogicConf( model=ModelInfo( name="VanillaAE", conf={"seq_len": 12, "n_features": 2} @@ -154,6 +157,7 @@ def test_trainer_do_train(self): ml_pipelines={ "pipeline1": MLPipelineConf( pipeline_id="pipeline1", + metrics=["failed", "degraded"], numalogic_conf=NumalogicConf( model=ModelInfo( name="VanillaAE", conf={"seq_len": 12, "n_features": 2} @@ -197,6 +201,7 @@ def test_trainer_do_not_train_1(self): ml_pipelines={ "pipeline1": MLPipelineConf( pipeline_id="pipeline1", + metrics=["failed", "degraded"], numalogic_conf=NumalogicConf( model=ModelInfo( name="VanillaAE", conf={"seq_len": 12, "n_features": 2} @@ -238,6 +243,7 @@ def test_trainer_do_not_train_2(self): ml_pipelines={ "pipeline1": MLPipelineConf( pipeline_id="pipeline1", + metrics=["failed", "degraded"], numalogic_conf=NumalogicConf( model=ModelInfo( name="VanillaAE", conf={"seq_len": 12, "n_features": 2} @@ -402,6 +408,7 @@ def test_trainer_datafetcher_err_and_train(self): ml_pipelines={ "pipeline1": MLPipelineConf( pipeline_id="pipeline1", + metrics=["failed", "degraded"], numalogic_conf=NumalogicConf( model=ModelInfo( name="VanillaAE", conf={"seq_len": 12, "n_features": 2}