diff options
author | Derek Murray <mrry@google.com> | 2018-10-02 20:00:36 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-02 20:04:04 -0700 |
commit | 2597b883a14749c77fffd7e5f9677107021ff40a (patch) | |
tree | b4a8ea07c72bd3f509edd2bb7d1c90dc3f81ba2d /tensorflow/python/eager | |
parent | 4b2d0180ba8c903f098f52eb9a12d26a7626dd34 (diff) |
Automated rollback of commit b7e9cbab27c893283acc4a6154d7a59dffb23758
PiperOrigin-RevId: 215503549
Diffstat (limited to 'tensorflow/python/eager')
-rw-r--r-- | tensorflow/python/eager/function.py | 14 | ||||
-rw-r--r-- | tensorflow/python/eager/function_test.py | 9 |
2 files changed, 5 insertions, 18 deletions
diff --git a/tensorflow/python/eager/function.py b/tensorflow/python/eager/function.py index aeb1cac3e9..f261d92d64 100644 --- a/tensorflow/python/eager/function.py +++ b/tensorflow/python/eager/function.py @@ -663,11 +663,6 @@ class Function(object): return self._build_call_outputs(outputs) @property - def name(self): - """Function name.""" - return self._inference_function.name - - @property def graph(self): """Returns the graph from which this function was constructed.""" return self._func_graph @@ -724,10 +719,6 @@ class Function(object): return nest.map_structure(lambda x: x.dtype if x is not None else None, self._func_graph.structured_outputs) - def add_to_graph(self, g): - """Adds this function into the graph g.""" - return self._inference_function.add_to_graph(g) - def _construct_backprop_function(self): """Constructs the backprop function object for this function.""" backwards_graph = FuncGraph(_backward_name(self._func_graph.name)) @@ -1131,8 +1122,6 @@ class PolymorphicFunction(object): *args: inputs to specialize on. **kwargs: inputs to specialize on. """ - if self._input_signature: - args, kwargs = None, None graph_function, _ = self._maybe_define_function(args, kwargs) return graph_function @@ -1315,9 +1304,6 @@ def register(func, *args, **kwargs): function definition into graph. Register function with different input param will result into multiple version of functions registered in graph. - Also, `args` and `kwargs` are ignored if this `PolymorphicFunction` was - created with an `input_signature`. - Args: func: the PolymorphicFunction instance that generated by a @defun *args: input arguments for the Python function. diff --git a/tensorflow/python/eager/function_test.py b/tensorflow/python/eager/function_test.py index ac45606eb0..9ce367a837 100644 --- a/tensorflow/python/eager/function_test.py +++ b/tensorflow/python/eager/function_test.py @@ -1750,10 +1750,11 @@ class FunctionTest(test.TestCase): # pylint: disable=protected-access self.assertEqual(len(graph._functions), 3) - # Test register function with cache, note inputs are ignored. - function.register(defun_matmul) - graph = ops.get_default_graph() - self.assertEqual(len(graph._functions), 3) + # Test input param shape mismatch + t2 = constant_op.constant([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]) + with self.assertRaisesRegexp( + ValueError, 'Python inputs incompatible with input_signature'): + function.register(defun_matmul, t2, t2) def testRegisterFunctionWithCache(self): def matmul(x, y): |