Prepend instead of appending external package directory to __path__. Resolves
#28027. PiperOrigin-RevId: 244606979
This commit is contained in:
parent
d8fe10aae9
commit
93b440f793
@ -55,20 +55,23 @@ elif _tf_api_dir not in __path__:
|
||||
# Hook external TensorFlow modules.
|
||||
try:
|
||||
from tensorboard.summary._tf import summary
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(summary))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(summary)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
_logging.warning(
|
||||
"Limited tf.summary API due to missing TensorBoard installation.")
|
||||
|
||||
try:
|
||||
from tensorflow_estimator.python.estimator.api._v2 import estimator
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(estimator))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(estimator)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
from tensorflow.python.keras.api._v2 import keras
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(keras))
|
||||
_current_module.__path__ = ([
|
||||
_module_util.get_parent_dir(keras)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
@ -44,13 +44,15 @@ elif _tf_api_dir not in __path__:
|
||||
# Hook external TensorFlow modules.
|
||||
try:
|
||||
from tensorflow_estimator.python.estimator.api._v1 import estimator
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(estimator))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(estimator)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
from tensorflow.python.keras.api._v1 import keras
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(keras))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(keras)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
@ -32,7 +32,8 @@ from tensorflow.python.tools import module_util as _module_util
|
||||
_current_module = _sys.modules[__name__]
|
||||
try:
|
||||
from tensorboard.summary._tf import summary
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(summary))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(summary)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
_logging.warning(
|
||||
"Limited tf.compat.v2.summary API due to missing TensorBoard "
|
||||
@ -40,13 +41,15 @@ except ImportError:
|
||||
|
||||
try:
|
||||
from tensorflow_estimator.python.estimator.api._v2 import estimator
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(estimator))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(estimator)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
from tensorflow.python.keras.api._v2 import keras
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(keras))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(keras)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
@ -31,13 +31,15 @@ from tensorflow.python.tools import module_util as _module_util
|
||||
_current_module = _sys.modules[__name__]
|
||||
try:
|
||||
from tensorflow_estimator.python.estimator.api._v1 import estimator
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(estimator))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(estimator)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
from tensorflow.python.keras.api._v1 import keras
|
||||
_current_module.__path__.append(_module_util.get_parent_dir(keras))
|
||||
_current_module.__path__ = (
|
||||
[_module_util.get_parent_dir(keras)] + _current_module.__path__)
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user