diff --git a/tensorflow/api_template.__init__.py b/tensorflow/api_template.__init__.py index 5932dda514d..99a278a14a4 100644 --- a/tensorflow/api_template.__init__.py +++ b/tensorflow/api_template.__init__.py @@ -138,12 +138,12 @@ if _running_from_pip_package(): for _s in _site_packages_dirs: # Load first party dynamic kernels. _main_dir = _os.path.join(_s, 'tensorflow/core/kernels') - if _fi.file_exists(_main_dir): + if _os.path.exists(_main_dir): _ll.load_library(_main_dir) # Load third party dynamic kernels. _plugin_dir = _os.path.join(_s, 'tensorflow-plugins') - if _fi.file_exists(_plugin_dir): + if _os.path.exists(_plugin_dir): _ll.load_library(_plugin_dir) # Add module aliases diff --git a/tensorflow/api_template_v1.__init__.py b/tensorflow/api_template_v1.__init__.py index 0d1d2e56fae..ae82f7b4792 100644 --- a/tensorflow/api_template_v1.__init__.py +++ b/tensorflow/api_template_v1.__init__.py @@ -148,12 +148,12 @@ if _running_from_pip_package(): for _s in _site_packages_dirs: # Load first party dynamic kernels. _main_dir = _os.path.join(_s, 'tensorflow/core/kernels') - if _fi.file_exists(_main_dir): + if _os.path.exists(_main_dir): _ll.load_library(_main_dir) # Load third party dynamic kernels. _plugin_dir = _os.path.join(_s, 'tensorflow-plugins') - if _fi.file_exists(_plugin_dir): + if _os.path.exists(_plugin_dir): _ll.load_library(_plugin_dir) # Delete modules that should be hidden from dir(). diff --git a/tensorflow/python/framework/load_library.py b/tensorflow/python/framework/load_library.py index 2e7bade095b..f37b48e76c2 100644 --- a/tensorflow/python/framework/load_library.py +++ b/tensorflow/python/framework/load_library.py @@ -27,7 +27,6 @@ import sys from tensorflow.python import _pywrap_python_op_gen from tensorflow.python.client import pywrap_tf_session as py_tf -from tensorflow.python.lib.io import file_io from tensorflow.python.util import deprecation from tensorflow.python.util.tf_export import tf_export @@ -140,9 +139,9 @@ def load_library(library_location): OSError: When the file to be loaded is not found. RuntimeError: when unable to load the library. """ - if file_io.file_exists(library_location): - if file_io.is_directory(library_location): - directory_contents = file_io.list_directory(library_location) + if os.path.exists(library_location): + if os.path.isdir(library_location): + directory_contents = os.listdir(library_location) kernel_libraries = [ os.path.join(library_location, f) for f in directory_contents