From 490a2235fb609de91cda3bae8a9aa808b4a014d1 Mon Sep 17 00:00:00 2001 From: Jonathan Hseu Date: Fri, 17 Mar 2017 10:07:17 -0800 Subject: Remove the unnecessary RTLD_GLOBAL dlopen flag in the remaining tests. Change: 150460215 --- tensorflow/contrib/compiler/jit_test.py | 10 ---------- tensorflow/contrib/layers/python/layers/feature_column_test.py | 9 --------- .../learn/python/learn/estimators/estimator_input_test.py | 9 --------- .../learn/python/learn/utils/saved_model_export_utils_test.py | 8 -------- .../contrib/seq2seq/python/kernel_tests/basic_decoder_test.py | 8 -------- tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py | 8 -------- .../python/kernel_tests/dynamic_attention_wrapper_test.py | 7 ------- tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py | 8 -------- tensorflow/contrib/training/python/training/training_test.py | 7 ------- 9 files changed, 74 deletions(-) diff --git a/tensorflow/contrib/compiler/jit_test.py b/tensorflow/contrib/compiler/jit_test.py index 2130f32f85..5e03833260 100644 --- a/tensorflow/contrib/compiler/jit_test.py +++ b/tensorflow/contrib/compiler/jit_test.py @@ -18,16 +18,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import sys - - -# TODO(keveman): #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, "getdlopenflags") and hasattr(sys, "setdlopenflags"): - import ctypes # pylint: disable=g-import-not-at-top - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - - -# pylint: disable=g-import-not-at-top from tensorflow.contrib.compiler import jit from tensorflow.python.framework import constant_op from tensorflow.python.framework import function diff --git a/tensorflow/contrib/layers/python/layers/feature_column_test.py b/tensorflow/contrib/layers/python/layers/feature_column_test.py index 3241af0dce..a35a586b74 100644 --- a/tensorflow/contrib/layers/python/layers/feature_column_test.py +++ b/tensorflow/contrib/layers/python/layers/feature_column_test.py @@ -21,17 +21,8 @@ from __future__ import print_function import copy import itertools import os -import sys import tempfile -# pylint: disable=g-bad-todo -# TODO(#6568): Remove this hack that makes dlopen() not crash. -# pylint: enable=g-bad-todo -# pylint: disable=g-import-not-at-top -if hasattr(sys, "getdlopenflags") and hasattr(sys, "setdlopenflags"): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - import numpy as np from tensorflow.contrib.layers.python.layers import feature_column as fc diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_input_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_input_test.py index db596da1af..248c6c733f 100644 --- a/tensorflow/contrib/learn/python/learn/estimators/estimator_input_test.py +++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_input_test.py @@ -19,17 +19,8 @@ from __future__ import division from __future__ import print_function import functools -import sys import tempfile -# pylint: disable=g-bad-todo -# TODO(#6568): Remove this hack that makes dlopen() not crash. -# pylint: enable=g-bad-todo -# pylint: disable=g-import-not-at-top -if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - import numpy as np from tensorflow.contrib.framework.python.ops import variables diff --git a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py index c9a52f455a..157744bed1 100644 --- a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py +++ b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py @@ -18,17 +18,9 @@ from __future__ import division from __future__ import print_function import os -import sys import tempfile import time -# pylint: disable=g-import-not-at-top - -# TODO(jart): #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.layers.python.layers import feature_column as fc from tensorflow.contrib.learn.python.learn import export_strategy as export_strategy_lib from tensorflow.contrib.learn.python.learn.estimators import constants diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py index 56298e20e9..5116a4db1e 100644 --- a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py +++ b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py @@ -19,14 +19,6 @@ from __future__ import division from __future__ import print_function # pylint: enable=unused-import -import sys - -# TODO(jart): #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, "getdlopenflags") and hasattr(sys, "setdlopenflags"): - import ctypes # pylint: disable=g-import-not-at-top - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - -# pylint: disable=g-import-not-at-top import numpy as np from tensorflow.contrib.rnn import core_rnn_cell diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py index 83a8e87a66..00854ed8b7 100644 --- a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py +++ b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py @@ -19,14 +19,6 @@ from __future__ import division from __future__ import print_function # pylint: enable=unused-import -import sys - -# TODO(jart): #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, "getdlopenflags") and hasattr(sys, "setdlopenflags"): - import ctypes # pylint: disable=g-import-not-at-top - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - -# pylint: disable=g-import-not-at-top import numpy as np from tensorflow.contrib.rnn import core_rnn_cell diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/dynamic_attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/dynamic_attention_wrapper_test.py index a85ae3c5c3..47cf102f39 100644 --- a/tensorflow/contrib/seq2seq/python/kernel_tests/dynamic_attention_wrapper_test.py +++ b/tensorflow/contrib/seq2seq/python/kernel_tests/dynamic_attention_wrapper_test.py @@ -20,14 +20,7 @@ from __future__ import print_function # pylint: enable=unused-import import functools -import sys -# TODO(jart): #6568 Remove this hack that makes dlopen() not crash. -if hasattr(sys, "getdlopenflags") and hasattr(sys, "setdlopenflags"): - import ctypes # pylint: disable=g-import-not-at-top - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - -# pylint: disable=g-import-not-at-top import numpy as np from tensorflow.contrib.rnn import core_rnn_cell diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py index 4e65960ea4..8c6d85d106 100644 --- a/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py +++ b/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py @@ -21,14 +21,6 @@ from __future__ import print_function # pylint: enable=unused-import import numpy as np -import sys - -# TODO(jart): #6568 Remove this hack that makes dlopen() not crash. -# pylint: disable=g-import-not-at-top -if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'): - import ctypes - sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) - from tensorflow.contrib.seq2seq.python.ops import loss from tensorflow.python.framework import constant_op diff --git a/tensorflow/contrib/training/python/training/training_test.py b/tensorflow/contrib/training/python/training/training_test.py index 57770ba284..e7c8fcd2a0 100644 --- a/tensorflow/contrib/training/python/training/training_test.py +++ b/tensorflow/contrib/training/python/training/training_test.py @@ -19,13 +19,6 @@ from __future__ import division from __future__ import print_function import os -import sys - -# pylint: disable=g-import-not-at-top -# TODO(jart): #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) import numpy as np -- cgit v1.2.3