dsipts 1.1.20__py3-none-any.whl → 1.1.22__py3-none-any.whl

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():
@@ -774,6 +777,7 @@ class TimeSeries():
             train_dl = DataLoader(train, batch_size = batch_size , shuffle=True,drop_last=True,num_workers=num_workers,persistent_workers=persistent_workers)
         valid_dl = DataLoader(validation, batch_size = batch_size , shuffle=False,drop_last=True,num_workers=num_workers,persistent_workers=persistent_workers)
         
+        beauty_string(f'train:{len(train_dl)}, validation:{len(valid_dl)}','section',self.verbose)
 
         if debug_prediction:
             dl = DataLoader(test, batch_size = batch_size , shuffle=False,drop_last=True,num_workers=num_workers,persistent_workers=persistent_workers)
@@ -801,11 +805,8 @@ class TimeSeries():
         
         
         #logger = CSVLogger("logs", name=dirpath)
-        aim_logger = AimLogger(
-            experiment=self.name,
-            train_metric_prefix='train_',
-            val_metric_prefix='val_',
-        )
+        beauty_string(f'Init aim','section',self.verbose)
+
 
         #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())
@@ -819,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)
@@ -884,7 +893,8 @@ class TimeSeries():
         tot_seconds = time.time()
 
 
-      
+        beauty_string(f'tuning lr','section',self.verbose)
+
      
         if auto_lr_find and (weight_exists is False):
             try:
@@ -902,7 +912,8 @@ class TimeSeries():
                     self.model.optim_config['lr'] = lr_finder.suggestion() ## we are using it as optim key
             except Exception as e:
                 beauty_string(f'There is a problem with the finding LR routine {e}','section',self.verbose)
-        
+        beauty_string(f'Start fitting','section',self.verbose)
+
         if OLD_PL:
             if weight_exists:
                 trainer.fit(self.model, train_dl,valid_dl,ckpt_path=os.path.join(dirpath,'last.ckpt'))
@@ -994,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/models/base_v2.py

@@ -360,7 +360,10 @@ 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:
+                    pass ##no aim probably
                 #self.log(f"example_{i}", np.stack([real, pred]).T,sync_dist=True)
                 plt.close(fig) 
             

dsipts/version.py

@@ -1 +1 @@
-__version__ = "1.1.20"
+__version__ = "1.1.22"

{dsipts-1.1.20.dist-info → dsipts-1.1.22.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: dsipts
-Version: 1.1.20
+Version: 1.1.22
 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,10 @@ and then open the url (http://127.0.0.1:43800)[http://127.0.0.1:43800]. It will
 
 
 
+## 1.1.21-22 (2026-02-02)
+- fixing lightening version support (not yet solved for version >2.6)
+- removed aim (compatibility)
+
 ## 1.1.20 (2026-02-01)
 - automation of tags, version etc using only the makefile
 - update newer version of python

{dsipts-1.1.20.dist-info → dsipts-1.1.22.dist-info}/RECORD

@@ -1,10 +1,10 @@
 dsipts/__init__.py,sha256=2KK6XbUewsjmQQ6-zNMKIcFP01jtcXskcwr3qZwQToE,1822
-dsipts/version.py,sha256=356mX5gt6SA0pAUpV03syJebLSqgcNO5cBqfmKn-49E,22
+dsipts/version.py,sha256=RcEsqYynl4v68pQpy_x3lmbtDimKNPMMlZTOueDpNzM,22
 dsipts/data_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsipts/data_management/monash.py,sha256=aZxq9FbIH6IsU8Lwou1hAokXjgOAK-wdl2VAeFg2k4M,13075
 dsipts/data_management/public_datasets.py,sha256=yXFzOZZ-X0ZG1DoqVU-zFmEGVMc2033YDQhRgYxY8ws,6793
 dsipts/data_structure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsipts/data_structure/data_structure.py,sha256=co4AcBvDGxTQW4ibeURwudpyNjVwDMS8geoFxAgBY_Q,64929
+dsipts/data_structure/data_structure.py,sha256=fwbJDNR0yQUEhT-kvNMm24d3hnQuXcSRfXJvZBQqun8,65419
 dsipts/data_structure/modifiers.py,sha256=qlry9dfw8pEE0GrvgwROZJkJ6oPpUnjEHPIG5qIetss,7948
 dsipts/data_structure/utils.py,sha256=ZL-z_InmFUkge5kQoHSrev1t6nyve9sTYTVeA75Or-I,6689
 dsipts/models/Autoformer.py,sha256=nUQvPC_qtajLT1AHdNJmF_P3ZL01j3spkZ4ubxdGF3g,8497
@@ -32,7 +32,7 @@ dsipts/models/VQVAEA.py,sha256=sNJi8UZh-10qEIKcZK3SzhlOFUUjvqjoglzeZBFaeZM,13789
 dsipts/models/VVA.py,sha256=BnPkJ0Nzue0oShSHZVRNlf5RvT0Iwtf9bx19vLB9Nn0,11939
 dsipts/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsipts/models/base.py,sha256=aWvtDiBnmONsJ96tgaZRewB_yrqI8yvlAlH6PdpWrLA,20099
-dsipts/models/base_v2.py,sha256=BNmBQXMDnGsZABu0nOu8d3f3anNQZbgNBCwlMr-k8lQ,20346
+dsipts/models/base_v2.py,sha256=oZaX1o0MidFTl_fq-MyZJHpw-tdEs9cskyR38cQiKjw,20438
 dsipts/models/utils.py,sha256=kjTwyktNCFMpPUy6zoleBCSKlvMvK_Jkgyh2T1OXg3E,24497
 dsipts/models/autoformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsipts/models/autoformer/layers.py,sha256=xHt8V1lKdD1cIvgxXdDbI_EqOz4zgOQ6LP8l7M1pAxM,13276
@@ -83,7 +83,7 @@ dsipts/models/vva/minigpt.py,sha256=bg0JddqSD322uxSGexen3nPXL_hGTsk3vNLR62d7-w8,
 dsipts/models/vva/vqvae.py,sha256=RzCQ_M9xBprp7_x20dSV3EQqlO0FjPUGWV-qdyKrQsM,19680
 dsipts/models/xlstm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsipts/models/xlstm/xLSTM.py,sha256=ZKZZmffmIq1Vb71CR4GSyM8viqVx-u0FChxhcNgHub8,10081
-dsipts-1.1.20.dist-info/METADATA,sha256=q4EZto89qbSuK1A0SyrIXLAssEIZCKhvq7qaqPGcupY,27614
-dsipts-1.1.20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dsipts-1.1.20.dist-info/top_level.txt,sha256=i6o0rf5ScFwZK21E89dSKjVNjUBkrEQpn0-Vij43748,7
-dsipts-1.1.20.dist-info/RECORD,,
+dsipts-1.1.22.dist-info/METADATA,sha256=gfBeqQPtcXt5Qu-BYNJ7sfCRJbWYttXKb3GAgx6tUUM,27722
+dsipts-1.1.22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dsipts-1.1.22.dist-info/top_level.txt,sha256=i6o0rf5ScFwZK21E89dSKjVNjUBkrEQpn0-Vij43748,7
+dsipts-1.1.22.dist-info/RECORD,,