experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More compatibility fixes for typing.Generic:

Browse Source 
* types.new_class is required in some distributions
 * avoid calling `isinstance` on some function objects in python 3.6
 * account for some strange zombie pointer issue on windows
Required for #40132.

PiperOrigin-RevId: 316735720
Change-Id: I1b08ef5f18c77c9343d587562f50632336b684d5
This commit is contained in:
Dan Moldovan 2020-06-16 12:34:27 -07:00 committed by TensorFlower Gardener
parent 1a03ea7e61
commit d97234dc56
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/python/framework/test_util.py
View File

@ -736,7 +736,7 @@ def assert_no_new_tensors(f):
return isinstance(obj, return isinstance(obj,
(ops.Tensor, variables.Variable, (ops.Tensor, variables.Variable,
tensor_shape.Dimension, tensor_shape.TensorShape)) tensor_shape.Dimension, tensor_shape.TensorShape))
except ReferenceError: except (ReferenceError, AttributeError):
# If the object no longer exists, we don't care about it. # If the object no longer exists, we don't care about it.
return False return False

18
tensorflow/python/util/tf_should_use.py
View File

@ -21,15 +21,12 @@ import copy
import sys import sys
import textwrap import textwrap
import traceback import traceback
import types
import six # pylint: disable=unused-import
from tensorflow.python.eager import context from tensorflow.python.eager import context
from tensorflow.python.framework import ops from tensorflow.python.framework import ops
from tensorflow.python.platform import tf_logging from tensorflow.python.platform import tf_logging
from tensorflow.python.util import tf_decorator from tensorflow.python.util import tf_decorator
# pylint: enable=g-bad-import-order,g-import-not-at-top
class _TFShouldUseHelper(object): class _TFShouldUseHelper(object):
@ -154,7 +151,18 @@ def _get_wrapper(x, tf_should_use_helper):
tx = copy.deepcopy(type_x) tx = copy.deepcopy(type_x)
# Prefer using __orig_bases__, which preserve generic type arguments. # Prefer using __orig_bases__, which preserve generic type arguments.
bases = getattr(tx, '__orig_bases__', tx.__bases__) bases = getattr(tx, '__orig_bases__', tx.__bases__)
copy_tx = type(tx.__name__, bases, dict(tx.__dict__))
# Use types.new_class when available, which is preferred over plain type in
# some distributions.
if sys.version_info >= (3, 5):
def set_body(ns):
ns.update(tx.__dict__)
return ns
copy_tx = types.new_class(tx.__name__, bases, exec_body=set_body)
else:
copy_tx = type(tx.__name__, bases, dict(tx.__dict__))
copy_tx.__init__ = _new__init__ copy_tx.__init__ = _new__init__
copy_tx.__getattribute__ = _new__getattribute__ copy_tx.__getattribute__ = _new__getattribute__
copy_tx.mark_used = _new_mark_used copy_tx.mark_used = _new_mark_used