aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/util
diff options
context:
space:
mode:
authorGravatar Jacques Pienaar <jpienaar@google.com>2018-03-15 12:58:08 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-03-15 13:03:19 -0700
commitccd8079e579604547f4b4d8a6b061cfdc6ce49bf (patch)
tree0d498e84ca32a101afcada0993a30a5e3b0452a2 /tensorflow/contrib/util
parent61032e9ca7bf9849cb65db9b646381d124080856 (diff)
Merge changes from github.
PiperOrigin-RevId: 189231636
Diffstat (limited to 'tensorflow/contrib/util')
-rw-r--r--tensorflow/contrib/util/loader.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tensorflow/contrib/util/loader.py b/tensorflow/contrib/util/loader.py
index f4283cd9ed..dca01d26f4 100644
--- a/tensorflow/contrib/util/loader.py
+++ b/tensorflow/contrib/util/loader.py
@@ -42,9 +42,10 @@ def load_op_library(path):
plugin.
"""
if os.name == 'nt':
- # To avoid makeing every user_ops aware of windows, re-write
- # the file extension from .so to .dll.
- path = re.sub(r'\.so$', '.dll', path)
+ # To avoid making every user_ops aware of windows, re-write
+ # the file extension from .so to .dll if .so file doesn't exist.
+ if not os.path.exists(path):
+ path = re.sub(r'\.so$', '.dll', path)
# Currently we have only some user_ops as dlls on windows - don't try
# to load them if the dll is not found.