misc: cleanup deprecated

Author: mloubout

conftest.py

@@ -4,6 +4,7 @@
 
 import pytest
 from sympy import Add
+from sympy.printing import sstr
 
 from devito import Eq, configuration, Revolver  # noqa
 from devito.checkpointing import NoopRevolver
@@ -295,9 +296,8 @@ def pytest_make_parametrize_id(config, val, argname):
     # First see if it has a name
     if hasattr(val, '__name__'):
         return val.__name__
-    # Then try str(val)
     try:
-        return str(val)
+        return sstr(val)
     except Exception:
         return None  # Fall back to default behavior
 

examples/cfd/01_convection.ipynb

@@ -382,7 +382,7 @@
     "# Now combine the BC expressions with the stencil to form operator\n",
     "expressions = [Eq(u.forward, stencil)]\n",
     "expressions += [bc_left, bc_right, bc_top, bc_bottom]\n",
-    "op = Operator(expressions=expressions, opt=None, openmp=False)  # <-- Turn off performance optimisations\n",
+    "op = Operator(expressions=expressions, opt=None, language='C')  # <-- Turn off performance optimisations\n",
     "op(time=nt, dt=dt)\n",
     "\n",
     "plot_field(u.data[0])\n",

examples/cfd/01_convection_revisited.ipynb

@@ -359,7 +359,7 @@
     "# Now combine the BC expressions with the stencil to form operator.\n",
     "expressions = [Eq(u.forward, stencil, subdomain=grid.interior)]\n",
     "expressions += [bc_left, bc_right, bc_top, bc_bottom]\n",
-    "op = Operator(expressions=expressions, opt=None, openmp=False)  # <-- Turn off performance optimisations\n",
+    "op = Operator(expressions=expressions, opt=None, language='C')  # <-- Turn off performance optimisations\n",
     "op(time=nt, dt=dt)\n",
     "\n",
     "plot_field(u.data[0])\n",

examples/userapi/05_conditional_dimension.ipynb

@@ -792,8 +792,8 @@
     "for n, i in enumerate(f.dimensions):\n",
     "    eqs.append(Eq(g[k, n], f.dimensions[n], implicit_dims=(f.dimensions + (ci,))))\n",
     "\n",
-    "# TODO: Must be openmp=False for now due to issue #2061\n",
-    "op0 = Operator(eqs, openmp=False)\n",
+    "# TODO: Must be language='C' for now due to issue #2061\n",
+    "op0 = Operator(eqs, language='C')\n",
     "op0.apply()\n",
     "print(op0.body.body[-1])\n",
     "\n",

tests/test_dimension.py

@@ -1087,7 +1087,7 @@ def test_subsampled_fd(self):
         assert np.all(u2.data[1, 1:4, 1:4] == 0.)
 
     # This test generates an openmp loop form which makes older gccs upset
-    @switchconfig(openmp=False)
+    @switchconfig(language='C')
     def test_nothing_in_negative(self):
         """Test the case where when the condition is false, there is nothing to do."""
         nt = 4

tests/test_dle.py

@@ -627,7 +627,7 @@ class DummyBarrier(sympy.Function, Barrier):
             Eq(Symbol('dummy2'), DummyBarrier(time)),
             Eq(r.forward, r.dy + 1)]
 
-    op = Operator(eqns, openmp=False)
+    op = Operator(eqns, language='C')
 
     unique = 't,x0_blk0,y0_blk0,x,y,z'
     reused = 't,x1_blk0,y1_blk0,x,y,z'

tests/test_iet.py

@@ -52,7 +52,7 @@ def test_conditional(fc, grid):
     (('Eq(v[t,x,y], v[t,x-1,y] + 1)', 'Eq(v[t,x,y], v[t,x+1,y] + u[x,y])'),
      (1, 2), (1, 1), ('xy', 'xy'))
 ])
-@switchconfig(openmp=False)
+@switchconfig(language='C')
 def test_make_efuncs(exprs, nfuncs, ntimeiters, nests):
     """Test construction of ElementalFunctions."""
     exprs = list(as_tuple(exprs))

tests/test_mpi.py

@@ -3236,7 +3236,7 @@ def test_adjoint_F(self, nd, mode):
         self.run_adjoint_F(nd)
 
     @pytest.mark.parallel(mode=[(8, 'diag2'), (8, 'full')])
-    @switchconfig(openmp=False)
+    @switchconfig(language='C')
     def test_adjoint_F_no_omp(self, mode):
         """
         ``run_adjoint_F`` with OpenMP disabled. By disabling OpenMP, we can