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

1.12-rc0 cherry-pick request: Do 2 warmup runs in assert_no_new_pyobjects_executing_eagerly. #22776

Merged
merged 2 commits into from
Oct 5, 2018
Merged

1.12-rc0 cherry-pick request: Do 2 warmup runs in assert_no_new_pyobjects_executing_eagerly. #22776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
032e24e
Do 2 warmup runs in assert_no_new_pyobjects_executing_eagerly.
Oct 5, 2018
fcbd617
Merge branch 'r1.12' into cherrypicks_1ZR0A
tatatodd Oct 5, 2018
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
15 changes: 11 additions & 4 deletions tensorflow/python/framework/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,9 @@ def wrapper(func):
def assert_no_new_pyobjects_executing_eagerly(f):
"""Decorator for asserting that no new Python objects persist after a test.

Runs the test multiple times executing eagerly, first as a warmup and then
several times to let objects accumulate. The warmup helps ignore caches which
do not grow as the test is run repeatedly.
Runs the test multiple times executing eagerly, first as a warmup and then to
let objects accumulate. The warmup helps ignore caches which do not grow as
the test is run repeatedly.

Useful for checking that there are no missing Py_DECREFs in the C exercised by
a bit of Python.
Expand All @@ -518,7 +518,14 @@ def decorator(self, **kwargs):
"""Warms up, gets an object count, runs the test, checks for new objects."""
with context.eager_mode():
gc.disable()
f(self, **kwargs)
# Run the test 2 times as warmup, in an attempt to fill up caches, which
# should not grow as the test is run repeatedly below.
#
# TODO(b/117156879): Running warmup twice is black magic; we have seen
# tests that fail with 1 warmup run, and pass with 2, on various versions
# of python2.7.x.
for _ in range(2):
f(self, **kwargs)
gc.collect()
previous_count = len(gc.get_objects())
if ops.has_default_graph():
Expand Down