Updates for newer TensorFlow and etuples

Author: brandonwillard

setup.py

@@ -34,15 +34,13 @@ def get_long_description():
     install_requires=[
         "scipy>=1.2.0",
         "Theano>=1.0.4",
-        "tf-nightly-2.0-preview==2.0.0.dev20191002",
-        "tf-nightly==2.1.0.dev20191003",
-        "tf-estimator-nightly==2.0.0.dev2019100301",
-        "tensorflow-estimator-2.0-preview==1.14.0.dev2019090801",
-        "tfp-nightly==0.9.0.dev20191003",
+        "tf-estimator-nightly==2.1.0.dev2020012309",
+        "tf-nightly==2.2.0.dev20200201",
+        "tfp-nightly==0.10.0.dev20200201",
         "multipledispatch>=0.6.0",
         "logical-unification>=0.4.3",
         "miniKanren>=1.0.1",
-        "etuples>=0.3.1",
+        "etuples>=0.3.2",
         "cons>=0.4.0",
         "toolz>=0.9.0",
         "cachetools",

symbolic_pymc/tensorflow/meta.py

@@ -434,7 +434,7 @@ class TFlowMetaOp(TFlowMetaSymbol):
     @classmethod
     def _metatize(cls, obj):
         """Reformat inputs to match the OpDef."""
-        new_input = obj._reconstruct_sequence_inputs(obj.op_def, obj.inputs, obj.node_def.attr)
+        new_input = ops._reconstruct_sequence_inputs(obj.op_def, obj.inputs, obj.node_def.attr)
         new_args = [
             getattr(obj, s) if s != "inputs" else new_input for s in getattr(cls, "__props__", [])
         ]

tests/tensorflow/utils.py

@@ -1,6 +1,7 @@
 from collections.abc import Mapping
 
 import tensorflow as tf
+from tensorflow.python.framework import ops
 
 
 def assert_ops_equal(a, b, compare_fn=lambda a, b: a.op.type == b.op.type):
@@ -10,7 +11,7 @@ def assert_ops_equal(a, b, compare_fn=lambda a, b: a.op.type == b.op.type):
         assert compare_fn(a, b)
 
         if isinstance(a.op, tf.Operation):
-            a_inputs = a.op._reconstruct_sequence_inputs(
+            a_inputs = ops._reconstruct_sequence_inputs(
                 a.op.op_def, a.op.inputs, a.op.node_def.attr
             )
         elif isinstance(a.op, Mapping):
@@ -19,7 +20,7 @@ def assert_ops_equal(a, b, compare_fn=lambda a, b: a.op.type == b.op.type):
             a_inputs = list(a.op.inputs)
 
         if isinstance(b.op, tf.Operation):
-            b_inputs = b.op._reconstruct_sequence_inputs(
+            b_inputs = ops._reconstruct_sequence_inputs(
                 b.op.op_def, b.op.inputs, b.op.node_def.attr
             )
         elif isinstance(b.op, Mapping):