diff options
| author |  Jonathan Hseu <jhseu@google.com> | 2017-02-28 18:36:23 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-02-28 18:51:06 -0800 |
| commit | 718812c9e4df55b8b3275aa4db7bb6833ed03111 (patch) | |
| tree | e8bc57fe5bfaea125d4d4c4535e29a7ed2306057 /tensorflow/contrib/tfprof | |
| parent | 4e63540076921d2c08d03aa9efb76fd483920593 (diff) | |
Fix the dlopen contrib test hack by making a pywrap_tensorflow module that imports
pywrap_tensorflow_internal with RTLD_GLOBAL.
Fixes #6568
Change: 148843302
Diffstat (limited to 'tensorflow/contrib/tfprof')
3 files changed, 0 insertions, 20 deletions
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py index 3344407cd2..66b9267cbe 100644 --- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py +++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py @@ -18,12 +18,6 @@ from __future__ import division from __future__ import print_function import os -import sys - -# TODO: #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) from tensorflow.core.protobuf import config_pb2 from tensorflow.python.client import session diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py index 07ed324d7c..f0ac36c66a 100644 --- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py +++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py @@ -18,13 +18,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import sys - -# TODO: #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - from google.protobuf import text_format from tensorflow.python.client import session diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger_test.py index 9a7fe9a887..87dfdc0fc1 100644 --- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger_test.py +++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger_test.py @@ -17,13 +17,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import sys - -# TODO: #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - from tensorflow.contrib.copy_graph.python.util import copy_elements from tensorflow.contrib.tfprof.python.tools.tfprof import tfprof_logger from tensorflow.core.protobuf import config_pb2 |