Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issue #27985 #27986

Merged
merged 7 commits into from Apr 22, 2019
Merged

fix issue #27985 #27986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85ba88c
fix issue #27985
pminervini Apr 19, 2019
124f159
this is probably nicer
pminervini Apr 19, 2019
04f4037
unit test for fix to issue #27985
pminervini Apr 19, 2019
3612c5b
with context.eager_mode() in new unit test
pminervini Apr 19, 2019
87f3a1f
making the unit test comply with tensorflow's other tests
pminervini Apr 19, 2019
4168577
lint, @test_util.run_gpu_only decorator
pminervini Apr 22, 2019
8459d85
making the linter happy
pminervini Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion tensorflow/python/framework/ops.py
View file
Open in desktop
Expand Up @@ -880,7 +880,8 @@ def _copy(self, ctx=None, device_name=None):
self_device = self.device

def grad_fun(dresult):
return [dresult._copy(device_name=self_device)]
return [dresult._copy(device_name=self_device)
if hasattr(dresult, '_copy') else dresult]

tape.record_operation("_copy", [new_tensor], [self], grad_fun)
return new_tensor
Expand Down
14 changes: 14 additions & 0 deletions tensorflow/python/framework/ops_test.py
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
from tensorflow.core.framework import attr_value_pb2
from tensorflow.core.protobuf import config_pb2
from tensorflow.python.client import session
from tensorflow.python.eager import backprop
from tensorflow.python.eager import context
from tensorflow.python.eager import function as eager_function
from tensorflow.python.framework import common_shapes
Expand All @@ -47,6 +48,7 @@
from tensorflow.python.ops import math_ops
from tensorflow.python.ops import resource_variable_ops
from tensorflow.python.ops import resources
from tensorflow.python.ops import special_math_ops
from tensorflow.python.ops import variable_scope
from tensorflow.python.ops import variables
import tensorflow.python.ops.gradients # pylint: disable=unused-import
Expand Down Expand Up @@ -156,6 +158,18 @@ def testToTensor(self):
tensor = ops.convert_to_tensor(x, name="tensor")
self.assertAllEqual(self.evaluate(tensor), [[2, 3], [0, 0], [5, 7]])

@test_util.run_gpu_only
def testEagerCopy(self):
with context.eager_mode():
var = variables.Variable([[0.0], [0.0], [0.0], [0.0]], name='tensor')
with backprop.GradientTape() as tape:
a = array_ops.gather(array_ops.gather(var, [0, 1]), [0, 1])
b = array_ops.gather(array_ops.gather(var, [2, 3]), [0, 1])
r = special_math_ops.einsum('ij,ij->i', a, b)
g = tape.gradient(r, [var])[0]
values = g.values if isinstance(g, ops.IndexedSlices) else g
self.assertAllEqual(values.get_shape(), [4, 1])

@test_util.run_deprecated_v1
def testNegation(self):
with self.cached_session():
Expand Down