FEniCS backend: Import ufl_legacy, if available

tlm-adjoint · Oct 16, 2023 · a5f11ff · a5f11ff
1 parent 1061c50
commit a5f11ff
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 13 deletions.
diff --git a/tests/fenics/test_block_system.py b/tests/fenics/test_block_system.py
@@ -6,7 +6,10 @@
 import mpi4py.MPI as MPI  # noqa: N817
 import numpy as np
 import pytest
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 pytestmark = pytest.mark.skipif(
     MPI.COMM_WORLD.size not in {1, 4},

diff --git a/tests/fenics/test_caches.py b/tests/fenics/test_caches.py
@@ -10,7 +10,10 @@
 
 import numpy as np
 import pytest
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 pytestmark = pytest.mark.skipif(
     DEFAULT_COMM.size not in {1, 4},

diff --git a/tests/fenics/test_equations.py b/tests/fenics/test_equations.py
@@ -11,7 +11,10 @@
 import numpy as np
 import os
 import pytest
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 pytestmark = pytest.mark.skipif(
     DEFAULT_COMM.size not in {1, 4},

diff --git a/tests/fenics/test_gauss_newton.py b/tests/fenics/test_gauss_newton.py
@@ -8,7 +8,10 @@
 
 import numpy as np
 import pytest
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 pytestmark = pytest.mark.skipif(
     DEFAULT_COMM.size not in {1, 4},

diff --git a/tests/fenics/test_hessian_system.py b/tests/fenics/test_hessian_system.py
@@ -10,7 +10,10 @@
 
 import numpy as np
 import pytest
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 pytestmark = pytest.mark.skipif(
     DEFAULT_COMM.size not in {1, 4},

diff --git a/tlm_adjoint/fenics/backend_code_generator_interface.py b/tlm_adjoint/fenics/backend_code_generator_interface.py
@@ -20,7 +20,10 @@
 from collections.abc import Sequence
 import ffc
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 __all__ = \
     [

diff --git a/tlm_adjoint/fenics/backend_interface.py b/tlm_adjoint/fenics/backend_interface.py
@@ -27,7 +27,10 @@
 
 import functools
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 __all__ = \
     [

diff --git a/tlm_adjoint/fenics/backend_overrides.py b/tlm_adjoint/fenics/backend_overrides.py
@@ -24,7 +24,10 @@
 from .functions import Constant, define_var_alias
 
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 import warnings
 import weakref
 

diff --git a/tlm_adjoint/fenics/block_system.py b/tlm_adjoint/fenics/block_system.py
@@ -88,7 +88,10 @@
 
 
 import petsc4py.PETSc as PETSc
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 from abc import ABC, abstractmethod
 from collections import deque

diff --git a/tlm_adjoint/fenics/caches.py b/tlm_adjoint/fenics/caches.py
@@ -18,7 +18,10 @@
     replaced_form)
 
 from collections import defaultdict
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 __all__ = \
     [

diff --git a/tlm_adjoint/fenics/equations.py b/tlm_adjoint/fenics/equations.py
@@ -30,7 +30,10 @@
     derivative, eliminate_zeros, extract_coefficients)
 
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 __all__ = \
     [

diff --git a/tlm_adjoint/fenics/fenics_equations.py b/tlm_adjoint/fenics/fenics_equations.py
@@ -26,7 +26,10 @@
 import functools
 import mpi4py.MPI as MPI
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 
 __all__ = \
     [

diff --git a/tlm_adjoint/fenics/functions.py b/tlm_adjoint/fenics/functions.py
@@ -20,7 +20,10 @@
 from ..overloaded_float import SymbolicFloat
 
 import numpy as np
-import ufl
+try:
+    import ufl_legacy as ufl
+except ImportError:
+    import ufl
 import weakref
 
 __all__ = \