- set tensorflow<=2.15 compatibility, higher versions do not work pro…

…perly, do not train

- fixed bug with deleted samplers in utils

NES/NeuralEikonalSolver.py

@@ -59,7 +59,7 @@ def __init__(self, xs, velocity, eikonal=None, name=None):
         else:
             assert isinstance(eikonal, L.Layer), "Eikonal should be an instance of keras Layer"
             self.equation = eikonal
-            self.equation.name = f'{self.name}_{self.equation.name}'
+            self.equation._name = f'{self.name}_{self.equation.name}'
 
         self.sing_eps = 1e-5  # tolerance for source singularity (to remove from training)
         self.x_train = None  # input training data
@@ -540,7 +540,7 @@ def __init__(self, velocity, eikonal=None, name=None):
         else:
             assert isinstance(eikonal, L.Layer), "Eikonal should be an instance of keras Layer"
             self.equation = eikonal
-            self.equation.name = f'{self.name}_{self.equation.name}'
+            self.equation._name = f'{self.name}_{self.equation.name}'
 
         self.sing_eps = 1e-5  # tolerance for source singularity (to remove from training)
         self.x_train = None  # input training data

NES/utils.py

@@ -370,8 +370,7 @@ def data_handler(x, y, **kwargs):
     callbacks = kwargs.get('callbacks', [])
     generator_required = False
     for c in callbacks:
-        if isinstance(c, (experimental.ImportanceSampling, experimental.ImportanceWeighting, 
-                          experimental.RARsampling, experimental.FromCoarseToFineResampling)):
+        if isinstance(c, (experimental.RARsampling, experimental.FromCoarseToFineResampling)):
             generator_required = True
             break
 

requirements.txt

@@ -1,4 +1,4 @@
 numpy<2.0.0
 scipy>=1.13.0
-tensorflow<=2.17.0
+tensorflow<=2.15.0
 setuptools>=70.0.0