temporary fix for py37 (combinedloader) (#215)

* temporary fix for py37 (combinedloader)

.gitignore

@@ -137,3 +137,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+# Lightning logs dir
+*/lightning_logs/*
+lightning_logs/*

pina/dataset.py

@@ -237,4 +237,4 @@ def __iter__(self):
                     'output': self.batch_output_pts[idx_],
                     'condition': self.batch_data_conditions[idx_],
                 }
-            yield d
+            yield d

pina/solvers/garom.py

@@ -1,6 +1,7 @@
 """ Module for GAROM """
 
 import torch
+import sys
 try:
     from torch.optim.lr_scheduler import LRScheduler  # torch >= 2.0
 except ImportError:
@@ -251,7 +252,11 @@ def training_step(self, batch, batch_idx):
 
         for condition_id in range(condition_idx.min(), condition_idx.max()+1):
 
-            condition_name = dataloader.condition_names[condition_id]
+            if sys.version_info >= (3, 8):
+                condition_name = dataloader.condition_names[condition_id]
+            else:
+                condition_name = dataloader.loaders.condition_names[condition_id]
+
             condition = self.problem.conditions[condition_name]
             pts = batch['pts'].detach()
             out = batch['output']

pina/solvers/pinn.py

@@ -5,6 +5,7 @@
 except ImportError:
     from torch.optim.lr_scheduler import _LRScheduler as LRScheduler  # torch < 2.0
 
+import sys
 from torch.optim.lr_scheduler import ConstantLR
 
 from .solver import SolverInterface
@@ -143,7 +144,10 @@ def training_step(self, batch, batch_idx):
 
         for condition_id in range(condition_idx.min(), condition_idx.max()+1):
 
-            condition_name = dataloader.condition_names[condition_id]
+            if sys.version_info >= (3, 8):
+                condition_name = dataloader.condition_names[condition_id]
+            else:
+                condition_name = dataloader.loaders.condition_names[condition_id]
             condition = self.problem.conditions[condition_name]
             pts = batch['pts']
 

pina/solvers/supervised.py

@@ -1,5 +1,6 @@
 """ Module for SupervisedSolver """
 import torch
+import sys
 try:
     from torch.optim.lr_scheduler import LRScheduler  # torch >= 2.0
 except ImportError:
@@ -98,7 +99,10 @@ def training_step(self, batch, batch_idx):
 
         for condition_id in range(condition_idx.min(), condition_idx.max()+1):
 
-            condition_name = dataloader.condition_names[condition_id]
+            if sys.version_info >= (3, 8):
+                condition_name = dataloader.condition_names[condition_id]
+            else:
+                condition_name = dataloader.loaders.condition_names[condition_id]
             condition = self.problem.conditions[condition_name]
             pts = batch['pts']
             out = batch['output']