dsipts 1.1.21__tar.gz → 1.1.23__tar.gz

{dsipts-1.1.21 → dsipts-1.1.23}/LONG_DESCRIPTION.md

@@ -398,6 +398,11 @@ and then open the url (http://127.0.0.1:43800)[http://127.0.0.1:43800]. It will
 
 
 
+## 1.1.21-22-23 (2026-02-02)
+- fixing lightening version support (not yet solved for version >2.6)
+- removed aim (compatibility)
+- logger
+
 ## 1.1.20 (2026-02-01)
 - automation of tags, version etc using only the makefile
 - update newer version of python

{dsipts-1.1.21 → dsipts-1.1.23}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: dsipts
-Version: 1.1.21
+Version: 1.1.23
 Summary: Unified library for timeseries modelling
 Author-email: Andrea Gobbi <agobbi@fbk.eu>
 Project-URL: Homepage, https://github.com/DSIP-FBK/DSIPTS
 Project-URL: Docs, https://dsip-fbk.github.io/DSIPTS/
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: aim
 Requires-Dist: beautifulsoup4==4.12.0
 Requires-Dist: bumpver>=2025.1131
 Requires-Dist: einops>=0.8.1
@@ -18,7 +17,7 @@ Requires-Dist: hydra-joblib-launcher>=1.2.0
 Requires-Dist: hydra-optuna-sweeper>=1.2.0
 Requires-Dist: hydra-submitit-launcher>=1.2.0
 Requires-Dist: ipykernel>=6.30.1
-Requires-Dist: lightning>=2.5.4
+Requires-Dist: lightning==2.5.5
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: nbformat>=5.10.4
 Requires-Dist: numba>=0.61.2
@@ -431,6 +430,11 @@ and then open the url (http://127.0.0.1:43800)[http://127.0.0.1:43800]. It will
 
 
 
+## 1.1.21-22-23 (2026-02-02)
+- fixing lightening version support (not yet solved for version >2.6)
+- removed aim (compatibility)
+- logger
+
 ## 1.1.20 (2026-02-01)
 - automation of tags, version etc using only the makefile
 - update newer version of python

{dsipts-1.1.21 → dsipts-1.1.23}/pyproject.toml

@@ -1,12 +1,12 @@
 
 [project]
 name = "dsipts"
-version = "1.1.21"
+version = "1.1.23"
 description = "Unified library for timeseries modelling"
 readme = { file = "LONG_DESCRIPTION.md", content-type = "text/markdown" }
 requires-python = ">=3.12"
 dependencies = [
-    "aim",
+    #"aim",
     "beautifulsoup4==4.12.0",
     "bumpver>=2025.1131",
     "einops>=0.8.1",
@@ -17,7 +17,7 @@ dependencies = [
     "hydra-optuna-sweeper>=1.2.0",
     "hydra-submitit-launcher>=1.2.0",
     "ipykernel>=6.30.1",
-    "lightning>=2.5.4",
+    "lightning==2.5.5",
     "matplotlib>=3.10.6",
     "nbformat>=5.10.4",
     "numba>=0.61.2",
@@ -40,7 +40,7 @@ Homepage = "https://github.com/DSIP-FBK/DSIPTS"
 Docs = "https://dsip-fbk.github.io/DSIPTS/"
 
 [tool.bumpver]
-current_version = "1.1.21"
+current_version = "1.1.23"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit = false
 tag = false

{dsipts-1.1.21 → dsipts-1.1.23}/src/dsipts/data_structure/data_structure.py

@@ -32,7 +32,10 @@ from datetime import datetime
 from ..models.utils import weight_init_zeros,weight_init
 import logging 
 from .modifiers import *
-from aim.pytorch_lightning import AimLogger
+disable_aim = True
+
+if disable_aim is False:
+    from aim.pytorch_lightning import AimLogger
 import time
 debug_prediction = False
 class DummyScaler():
@@ -804,11 +807,6 @@ class TimeSeries():
         #logger = CSVLogger("logs", name=dirpath)
         beauty_string(f'Init aim','section',self.verbose)
 
-        aim_logger = AimLogger(
-            experiment=self.name,
-            train_metric_prefix='train_',
-            val_metric_prefix='val_',
-        )
 
         #https://stackoverflow.com/questions/49201236/check-the-total-number-of-parameters-in-a-pytorch-model
         n_params = sum(dict((p.data_ptr(), p.numel()) for p in self.model.parameters()).values())
@@ -822,17 +820,25 @@ class TimeSeries():
             buffer_size += buffer.nelement() * buffer.element_size()
 
         size_all_mb = (param_size + buffer_size) / 1024**2
-        #aim_logger.experiment.track(self.model.name,name='model_name')
-
-        aim_logger.experiment.track(n_params,name='N-parameters')
-        aim_logger.experiment.track(size_all_mb,name='dim-model-MB')
-        aim_logger.experiment.track(len(train_dl.dataset),name='len-train')
-        aim_logger.experiment.track(len(valid_dl.dataset),name='len-valid')
-        #aim_logger.experiment.track(self.config,name=None)
         tmp = self.config.copy()
         tmp['model_name'] = self.model.name
-        aim_logger._run['hyperparameters'] = tmp
 
+        #aim_logger.experiment.track(self.model.name,name='model_name')
+        if disable_aim is False:
+            aim_logger = AimLogger(
+                experiment=self.name,
+                train_metric_prefix='train_',
+                val_metric_prefix='val_',
+            )
+            aim_logger.experiment.track(n_params,name='N-parameters')
+            aim_logger.experiment.track(size_all_mb,name='dim-model-MB')
+            aim_logger.experiment.track(len(train_dl.dataset),name='len-train')
+            aim_logger.experiment.track(len(valid_dl.dataset),name='len-valid')
+            #aim_logger.experiment.track(self.config,name=None)
+            
+            aim_logger._run['hyperparameters'] = tmp
+        else:
+            aim_logger = None
         mc = MetricsCallback(dirpath)
         ## TODO se ci sono 2 o piu gpu MetricsCallback non funziona (secondo me fa una istanza per ogni dataparallel che lancia e poi non riesce a recuperare info)
         pl.seed_everything(seed, workers=True)
@@ -999,8 +1005,10 @@ class TimeSeries():
         
         beauty_string('END of the training process','block',self.verbose)
 
-        aim_logger.experiment.track((time.time()-tot_seconds),name='seconds-training')
-        aim_logger.experiment.track(val_loss,name='val-loss-end-train')
+
+        if disable_aim is False:
+            aim_logger.experiment.track((time.time()-tot_seconds),name='seconds-training')
+            aim_logger.experiment.track(val_loss,name='val-loss-end-train')
 
         
         

{dsipts-1.1.21 → dsipts-1.1.23}/src/dsipts/data_structure/utils.py

@@ -12,28 +12,62 @@ import torch
 import os
 import logging
 from typing import Union
-def beauty_string(message:str,type:str,verbose:bool):
+def get_logger(name: str = __name__):
+    # Crea la cartella logs se non esiste
+    logger = logging.getLogger(name)
+    logger.setLevel(logging.DEBUG)
+
+    # Evita duplicazione degli handler se il logger viene importato più volte
+    if logger.handlers:
+        return logger
     
+    logger.propagate = False
+
+    # === Formatter===
+    formatter = logging.Formatter(
+        "[%(asctime)s] [%(levelname)s] [%(name)s] %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
+
+    # === Handler per il terminale ===
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(formatter)
+    logger.addHandler(console_handler)
+
+    # === Handler per i file log ===
+    #os.makedirs("logs", exist_ok=True)
+
+    # file_handler = logging.FileHandler("logs/app.log")
+    # file_handler.setLevel(logging.DEBUG)
+    # file_handler.setFormatter(formatter)
+    # logger.addHandler(file_handler)
+
+    return logger
+logger = get_logger('main')
+
+def beauty_string(message:str,type:str,verbose:bool):
+    logger=get_logger()
     size = 150
     if verbose is True:
         if type=='block':
             characters = len(message)
             border = max((100-characters)//2-5,0)
-            logging.info('\n')
-            logging.info(f"{'#'*size}")
-            logging.info(f"{'#'*border}{' '*(size-border*2)}{'#'*border}")
-            logging.info(f"{ message:^{size}}")
-            logging.info(f"{'#'*border}{' '*(size-border*2)}{'#'*border}")
-            logging.info(f"{'#'*size}")
+            logger.info('\n')
+            logger.info(f"{'#'*size}")
+            logger.info(f"{'#'*border}{' '*(size-border*2)}{'#'*border}")
+            logger.info(f"{ message:^{size}}")
+            logger.info(f"{'#'*border}{' '*(size-border*2)}{'#'*border}")
+            logger.info(f"{'#'*size}")
         elif type=='section':
-            logging.info('\n')
-            logging.info(f"{'#'*size}")
-            logging.info(f"{ message:^{size}}")
-            logging.info(f"{'#'*size}")
+            logger.info('\n')
+            logger.info(f"{'#'*size}")
+            logger.info(f"{ message:^{size}}")
+            logger.info(f"{'#'*size}")
         elif type=='info':
-            logging.info(f"{ message:^{size}}")
+            logger.info(f"{ message:^{size}}")
         else:
-            logging.info(message)
+            logger.info(message)
     
 
 

{dsipts-1.1.21 → dsipts-1.1.23}/src/dsipts/models/base_v2.py

@@ -360,7 +360,11 @@ class Base(pl.LightningModule):
                 ax.plot(pred,'o-',label='pred')
                 ax.legend()
                 ax.set_title(f'Channel {i} first element first batch validation {int(100*self.count_epoch/self.trainer.max_epochs)}%')
-                self.logger.experiment.track(Image(fig), name='cm_training_end')
+                try:
+                    self.logger.experiment.track(Image(fig), name='cm_training_end')
+                except:
+                    beauty_string('AIM NOT USED','info',self.verbose)
+                    pass ##no aim probably
                 #self.log(f"example_{i}", np.stack([real, pred]).T,sync_dist=True)
                 plt.close(fig) 
             

dsipts-1.1.23/src/dsipts/version.py

@@ -0,0 +1 @@
+__version__ = "1.1.23"

{dsipts-1.1.21 → dsipts-1.1.23}/src/dsipts.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: dsipts
-Version: 1.1.21
+Version: 1.1.23
 Summary: Unified library for timeseries modelling
 Author-email: Andrea Gobbi <agobbi@fbk.eu>
 Project-URL: Homepage, https://github.com/DSIP-FBK/DSIPTS
 Project-URL: Docs, https://dsip-fbk.github.io/DSIPTS/
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: aim
 Requires-Dist: beautifulsoup4==4.12.0
 Requires-Dist: bumpver>=2025.1131
 Requires-Dist: einops>=0.8.1
@@ -18,7 +17,7 @@ Requires-Dist: hydra-joblib-launcher>=1.2.0
 Requires-Dist: hydra-optuna-sweeper>=1.2.0
 Requires-Dist: hydra-submitit-launcher>=1.2.0
 Requires-Dist: ipykernel>=6.30.1
-Requires-Dist: lightning>=2.5.4
+Requires-Dist: lightning==2.5.5
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: nbformat>=5.10.4
 Requires-Dist: numba>=0.61.2
@@ -431,6 +430,11 @@ and then open the url (http://127.0.0.1:43800)[http://127.0.0.1:43800]. It will
 
 
 
+## 1.1.21-22-23 (2026-02-02)
+- fixing lightening version support (not yet solved for version >2.6)
+- removed aim (compatibility)
+- logger
+
 ## 1.1.20 (2026-02-01)
 - automation of tags, version etc using only the makefile
 - update newer version of python

{dsipts-1.1.21 → dsipts-1.1.23}/src/dsipts.egg-info/requires.txt

@@ -1,4 +1,3 @@
-aim
 beautifulsoup4==4.12.0
 bumpver>=2025.1131
 einops>=0.8.1
@@ -9,7 +8,7 @@ hydra-joblib-launcher>=1.2.0
 hydra-optuna-sweeper>=1.2.0
 hydra-submitit-launcher>=1.2.0
 ipykernel>=6.30.1
-lightning>=2.5.4
+lightning==2.5.5
 matplotlib>=3.10.6
 nbformat>=5.10.4
 numba>=0.61.2

dsipts-1.1.21/src/dsipts/version.py

@@ -1 +0,0 @@
-__version__ = "1.1.21"