Merge pull request #78 from brandonwillard/fix-tf-lvar-op-name

Return lvar instead of str when TF meta Operator name is an lvar

Author: brandonwillard

symbolic_pymc/tensorflow/meta.py

@@ -499,7 +499,7 @@ def name(self):
         if isvar(self.node_def):
             self._name = var()
         else:
-            self._name = str(self.node_def.name)
+            self._name = self.node_def.name
 
         return self._name
 
@@ -606,6 +606,8 @@ class TFlowMetaTensor(TFlowMetaSymbol, MetaVariable):
 
     def __init__(self, op, value_index, dtype, obj=None):
         self.op = metatize(op)
+        # TODO: Sync this value with `op.node_def.attr['dtype']` and/or
+        # `op.node_def.attr['T']`?
         self.dtype = dtype
         self.value_index = value_index
         super().__init__(obj=obj)

tests/tensorflow/test_meta.py

@@ -187,6 +187,9 @@ def test_meta_basic():
         assert log_mt.dtype == tf.float32
         assert log_mt.name == 'Log:0'
 
+        log_mt = mt.log(var(), name=var())
+        assert isvar(log_mt.name)
+
 
 @pytest.mark.usefixtures("run_with_tensorflow")
 @run_in_graph_mode
@@ -201,6 +204,8 @@ def test_meta_Op():
     # reasonable.  Likewise, the `0` gets converted, but it probably shouldn't be.
     test_op = TFlowMetaOp(mt.Concat, var(), [[t1_tf, t2_tf], 0])
 
+    assert isvar(test_op.name)
+
     # Make sure we converted lists to tuples
     assert isinstance(test_op.inputs, tuple)
     assert isinstance(test_op.inputs[0], tuple)