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/tensor_forest/python | |
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/tensor_forest/python')
5 files changed, 0 insertions, 35 deletions
diff --git a/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_test.py b/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_test.py index 28a4983407..351245fbdd 100644 --- a/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_test.py +++ b/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_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 tensorflow.contrib.tensor_forest.python.ops import data_ops from tensorflow.contrib.tensor_forest.python.ops import tensor_forest_ops diff --git a/tensorflow/contrib/tensor_forest/python/kernel_tests/grow_tree_op_test.py b/tensorflow/contrib/tensor_forest/python/kernel_tests/grow_tree_op_test.py index 6c53b871bb..150632c398 100644 --- a/tensorflow/contrib/tensor_forest/python/kernel_tests/grow_tree_op_test.py +++ b/tensorflow/contrib/tensor_forest/python/kernel_tests/grow_tree_op_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 tensorflow.contrib.tensor_forest.python.ops import tensor_forest_ops from tensorflow.python.framework import test_util from tensorflow.python.ops import state_ops diff --git a/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_test.py b/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_test.py index 89ba53a427..705949a454 100644 --- a/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_test.py +++ b/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_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 tensorflow.contrib.tensor_forest.python.ops import data_ops from tensorflow.contrib.tensor_forest.python.ops import tensor_forest_ops diff --git a/tensorflow/contrib/tensor_forest/python/kernel_tests/scatter_add_ndim_op_test.py b/tensorflow/contrib/tensor_forest/python/kernel_tests/scatter_add_ndim_op_test.py index baf7db609a..e429d12e96 100644 --- a/tensorflow/contrib/tensor_forest/python/kernel_tests/scatter_add_ndim_op_test.py +++ b/tensorflow/contrib/tensor_forest/python/kernel_tests/scatter_add_ndim_op_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 tensorflow.contrib.tensor_forest.python.ops import tensor_forest_ops from tensorflow.python.framework import test_util from tensorflow.python.ops import variables diff --git a/tensorflow/contrib/tensor_forest/python/tensor_forest_test.py b/tensorflow/contrib/tensor_forest/python/tensor_forest_test.py index 254d0de6ef..a9a3f66bbf 100644 --- a/tensorflow/contrib/tensor_forest/python/tensor_forest_test.py +++ b/tensorflow/contrib/tensor_forest/python/tensor_forest_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 tensorflow.contrib.tensor_forest.python import tensor_forest from tensorflow.python.framework import ops from tensorflow.python.framework import sparse_tensor |