diff options
author | 2016-11-09 13:14:03 -0800 | |
---|---|---|
committer | 2016-11-09 13:48:22 -0800 | |
commit | a771598ad83ca33eb42594d7e804859371ba4ca9 (patch) | |
tree | 753237f3b4d22e1760084df1ea37975076d387ea /tensorflow/contrib/losses | |
parent | f0e9bd3c55868eb0a1f61f8cfb2b94ce011e47b4 (diff) |
Merge changes from github.
Change: 138675832
Diffstat (limited to 'tensorflow/contrib/losses')
-rw-r--r-- | tensorflow/contrib/losses/__init__.py | 1 | ||||
-rw-r--r-- | tensorflow/contrib/losses/python/losses/__init__.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tensorflow/contrib/losses/__init__.py b/tensorflow/contrib/losses/__init__.py index 6fd241f2f4..14a4d53152 100644 --- a/tensorflow/contrib/losses/__init__.py +++ b/tensorflow/contrib/losses/__init__.py @@ -23,3 +23,4 @@ import sys # pylint: disable=unused-import,wildcard-import from tensorflow.contrib.losses.python.losses import * +# pylint: enable=unused-import,wildcard-import diff --git a/tensorflow/contrib/losses/python/losses/__init__.py b/tensorflow/contrib/losses/python/losses/__init__.py index 54c21684bd..f53d4a000d 100644 --- a/tensorflow/contrib/losses/python/losses/__init__.py +++ b/tensorflow/contrib/losses/python/losses/__init__.py @@ -133,5 +133,6 @@ from __future__ import print_function # pylint: disable=unused-import,wildcard-import from tensorflow.contrib.losses.python.losses.loss_ops import * from tensorflow.python.util.all_util import make_all +# pylint: enable=unused-import,wildcard-import __all__ = make_all(__name__) |