Merge pull request #2386 from devitocodes/workaround-mystery

mpi: Avoid UnboundLocalVariable error

devito/data/data.py

@@ -186,8 +186,8 @@ def wrapper(data, *args, **kwargs):
                     if isinstance(i, slice) and i.step is not None and i.step < 0:
                         comm_type = index_by_index
                         break
-                    else:
-                        comm_type = serial
+                else:
+                    comm_type = serial
             else:
                 comm_type = serial
             kwargs['comm_type'] = comm_type

requirements.txt

@@ -1,5 +1,5 @@
 pip>=9.0.1
-numpy>1.16
+numpy>1.16,<2.0
 sympy>=1.9,<1.13
 psutil>=5.1.0,<6.0
 py-cpuinfo<10

tests/test_adjoint.py

@@ -79,14 +79,14 @@ class TestAdjoint:
         ('layers-viscoacoustic', (20, 25), 'maxwell', 4, 2, viscoacoustic_setup),
         ('layers-viscoacoustic', (20, 25), 'maxwell', 2, 2, viscoacoustic_setup),
         # 3D Deng Mcmechan Viscoacoustic tests with varying space and equation orders
-        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 4, 1, \
-            viscoacoustic_setup),
-        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 2, 1, \
-            viscoacoustic_setup),
-        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 4, 2, \
-            viscoacoustic_setup),
-        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 2, 2, \
-            viscoacoustic_setup),
+        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 4, 1,
+         viscoacoustic_setup),
+        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 2, 1,
+         viscoacoustic_setup),
+        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 4, 2,
+         viscoacoustic_setup),
+        ('layers-viscoacoustic', (20, 25, 20), 'maxwell', 2, 2,
+         viscoacoustic_setup),
     ])
     def test_adjoint_F(self, mkey, shape, kernel, space_order, time_order, setup_func):
         """