diff --git a/tensorflow/python/kernel_tests/reduce_join_op_test.py b/tensorflow/python/kernel_tests/reduce_join_op_test.py index 49b6620779e..751e3e3648b 100644 --- a/tensorflow/python/kernel_tests/reduce_join_op_test.py +++ b/tensorflow/python/kernel_tests/reduce_join_op_test.py @@ -351,6 +351,16 @@ class ReduceJoinTest(UnicodeTestCase): with self.assertRaisesOpError("reduction dimension 2"): reduced.eval(feed_dict={placeholder.name: 2}) + def testDeprecatedArgs(self): + foobar = constant_op.constant(["foobar"]) + # Old names: keep_dims and reduction_indices + output = string_ops.reduce_join( + ["foo", "bar"], reduction_indices=0, keep_dims=True) + self.assertAllEqual(foobar, output) + # New names keepdims and axis. + output = string_ops.reduce_join(["foo", "bar"], axis=0, keepdims=True) + self.assertAllEqual(foobar, output) + if __name__ == "__main__": test.main() diff --git a/tensorflow/python/ops/string_ops.py b/tensorflow/python/ops/string_ops.py index c27d845db4d..507339b55bb 100644 --- a/tensorflow/python/ops/string_ops.py +++ b/tensorflow/python/ops/string_ops.py @@ -326,13 +326,15 @@ def _reduce_join_reduction_dims(x, axis, reduction_indices): @tf_export(v1=["strings.reduce_join", "reduce_join"]) @deprecation.deprecated_endpoints("reduce_join") def reduce_join(inputs, axis=None, # pylint: disable=missing-docstring - keep_dims=False, + keep_dims=None, separator="", name=None, reduction_indices=None, keepdims=None): keep_dims = deprecation.deprecated_argument_lookup( "keepdims", keepdims, "keep_dims", keep_dims) + if keep_dims is None: + keep_dims = False inputs_t = ops.convert_to_tensor(inputs) reduction_indices = _reduce_join_reduction_dims( inputs_t, axis, reduction_indices) diff --git a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt index 90dcb1c4934..32f85a0a66b 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt @@ -1874,7 +1874,7 @@ tf_module { } member_method { name: "reduce_join" - argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\', \'keepdims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\', \'None\'], " + argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\', \'keepdims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'None\'], " } member_method { name: "reduce_logsumexp" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.strings.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.strings.pbtxt index 54e7ce6b5e3..1a73ab6a7e5 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.strings.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.strings.pbtxt @@ -26,7 +26,7 @@ tf_module { } member_method { name: "reduce_join" - argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\', \'keepdims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\', \'None\'], " + argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\', \'keepdims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'None\'], " } member_method { name: "regex_full_match"