internal merge of PR tensorflow#1324

PiperOrigin-RevId: 227888281

Author: lgeiger

tensor2tensor/utils/devices.py

@@ -18,9 +18,9 @@
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 from tensor2tensor.utils import expert_utils as eu
 import tensorflow as tf
+from tensorflow.python.util import tf_inspect as inspect
 
 
 def data_parallelism_from_flags(daisy_chain_variables=True, all_workers=False):

tensor2tensor/utils/metrics.py

@@ -18,7 +18,6 @@
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import numpy as np
 import six
 
@@ -29,6 +28,7 @@
 import tensorflow as tf
 
 from tensorflow.contrib.eager.python import tfe
+from tensorflow.python.util import tf_inspect as inspect
 
 
 class Metrics(object):

tensor2tensor/utils/registry.py

@@ -44,9 +44,9 @@ class MyModel(T2TModel):
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 from tensor2tensor.utils import misc_utils
 import tensorflow as tf
+from tensorflow.python.util import tf_inspect as inspect
 
 _ATTACKS = {}
 _ATTACK_PARAMS = {}

tensor2tensor/utils/t2t_model.py

@@ -22,7 +22,6 @@
 import contextlib
 import copy
 import functools
-import inspect
 import math
 import os
 import time
@@ -48,6 +47,7 @@
 from tensorflow.python.layers import base
 from tensorflow.python.ops import inplace_ops
 from tensorflow.python.ops import variable_scope
+from tensorflow.python.util import tf_inspect as inspect
 
 _no_problem_err_str = (
     "The default implementation of %s requires that the "