Merge pull request #1769 from devitocodes/sympyver

sympy: proper version check

Author: mloubout

devito/finite_differences/elementary.py

@@ -1,5 +1,7 @@
 import sympy
 
+from distutils import version
+
 from devito.finite_differences.differentiable import DifferentiableFunction, diffify
 
 
@@ -646,7 +648,7 @@ class mathieucprime(DifferentiableFunction, sympy.mathieucprime):
 
 
 # New elementary functions in sympy 1.8
-if float(sympy.__version__) >= 1.8:
+if version.LooseVersion(sympy.__version__) >= version.LooseVersion('1.8'):
 
     class motzkin(DifferentiableFunction, sympy.motzkin):
         __sympy_class__ = sympy.motzkin

examples/seismic/acoustic/wavesolver.py

@@ -157,7 +157,7 @@ def adjoint(self, rec, srca=None, v=None, model=None, **kwargs):
                                       dt=kwargs.pop('dt', self.dt), **kwargs)
         return srca, v, summary
 
-    def jacobian_adjoint(self, rec, u, v=None, grad=None, model=None,
+    def jacobian_adjoint(self, rec, u, src=None, v=None, grad=None, model=None,
                          checkpointing=False, **kwargs):
         """
         Gradient modelling function for computing the adjoint of the
@@ -200,7 +200,8 @@ def jacobian_adjoint(self, rec, u, v=None, grad=None, model=None,
                              time_order=2, space_order=self.space_order)
             cp = DevitoCheckpoint([u])
             n_checkpoints = None
-            wrap_fw = CheckpointOperator(self.op_fwd(save=False), src=self.geometry.src,
+            wrap_fw = CheckpointOperator(self.op_fwd(save=False),
+                                         src=src or self.geometry.src,
                                          u=u, dt=dt, **kwargs)
             wrap_rev = CheckpointOperator(self.op_grad(save=False), u=u, v=v,
                                           rec=rec, dt=dt, grad=grad, **kwargs)