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

Remove merge markers #52869

Merged
merged 1 commit into from Oct 30, 2021
Merged

Remove merge markers #52869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 3 deletions tensorflow/python/kernel_tests/stack_op_test.py
View file
Open in desktop
Expand Up @@ -79,9 +79,7 @@ def testSimpleParallelCPU(self):
c = array_ops.parallel_stack(xs)
self.assertAllEqual(c, data)

<<<<<<< HEAD:tensorflow/python/kernel_tests/stack_op_test.py
@test_util.run_deprecated_v1
=======
def testParallelConcatShapeZero(self):
if not tf2.enabled():
self.skipTest("only fails in TF2")
Expand All @@ -95,7 +93,6 @@ def f():
r"0th dimension of value .* is less than"):
f()

>>>>>>> e67caccea81 (Adding more validation checks to _ParallelConcatUpdate to avoid NPE.):tensorflow/python/kernel_tests/array_ops/stack_op_test.py
def testSimpleParallelGPU(self):
np.random.seed(7)
with self.session(use_gpu=True):
Expand Down