Upgraded sympy to v1.8. (#591)

* Upgraded sympy to v1.8.

* format.

Author: MichaelBroughton

release/setup.py

@@ -51,7 +51,7 @@ def finalize_options(self):
 
 
 REQUIRED_PACKAGES = [
-    'cirq == 0.11.0', 'sympy == 1.5', 'googleapis-common-protos==1.52.0',
+    'cirq == 0.11.0', 'sympy == 1.8', 'googleapis-common-protos==1.52.0',
     'google-api-core==1.21.0', 'google-auth==1.18.0', 'protobuf==3.13.0'
 ]
 

requirements.txt

@@ -1,5 +1,5 @@
 cirq==0.11.0
-sympy==1.5
+sympy==1.8
 nbconvert==5.6.1
 nbformat==4.4.0
 pylint==2.4.4

tensorflow_quantum/core/serialize/serializer.py

@@ -60,16 +60,18 @@ def _scalar_extractor(x):
         return 1.0
 
     expr = x.evalf()
-    if isinstance(expr, sympy.mul.Mul):
+    if isinstance(expr, sympy.core.Mul):
         lhs_eval, rhs_eval = _parse_mul(expr)
 
         if isinstance(lhs_eval, sympy.Symbol) and isinstance(
-                rhs_eval, (sympy.numbers.Float, sympy.numbers.Integer)):
+                rhs_eval,
+            (sympy.core.numbers.Float, sympy.core.numbers.Integer)):
             # lhs contains symbol rhs contains number.
             return _round(float(rhs_eval))
 
         if isinstance(rhs_eval, sympy.Symbol) and isinstance(
-                lhs_eval, (sympy.numbers.Float, sympy.numbers.Integer)):
+                lhs_eval,
+            (sympy.core.numbers.Float, sympy.core.numbers.Integer)):
             # lhs contains number.
             return _round(float(lhs_eval))
 
@@ -90,16 +92,18 @@ def _symbol_extractor(x):
         return x
 
     expr = x.evalf()
-    if isinstance(expr, sympy.mul.Mul):
+    if isinstance(expr, sympy.core.Mul):
         lhs_eval, rhs_eval = _parse_mul(expr)
 
         if isinstance(lhs_eval, sympy.Symbol) and isinstance(
-                rhs_eval, (sympy.numbers.Float, sympy.numbers.Integer)):
+                rhs_eval,
+            (sympy.core.numbers.Float, sympy.core.numbers.Integer)):
             # lhs contains symbol rhs contains number.
             return lhs_eval
 
         if isinstance(rhs_eval, sympy.Symbol) and isinstance(
-                lhs_eval, (sympy.numbers.Float, sympy.numbers.Integer)):
+                lhs_eval,
+            (sympy.core.numbers.Float, sympy.core.numbers.Integer)):
             # lhs contains number.
             return rhs_eval