diff options
| author |  Martin Wicke <wicke@google.com> | 2017-02-14 22:55:16 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-02-14 23:11:35 -0800 |
| commit | 78819871a4425cee4d1ed9eb2830683d3d9f6d56 (patch) | |
| tree | 35085bda0dbde29375b5921212d04cfe63c70b8b | |
| parent | a8f8018e9b770379201cb22c441a72b0bcef30d8 (diff) | |
Don't die if pandas import cannot write a temp file.
Change: 147563588
| -rw-r--r-- | tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py | 5 | ||||
| -rw-r--r-- | tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py index 44f0e435bb..fada9f817f 100644 --- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py +++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py @@ -33,10 +33,13 @@ from tensorflow.python.platform import tf_logging as logging from tensorflow.python.summary import summary from tensorflow.python.training import queue_runner -# pylint: disable=g-import-not-at-top try: + # pylint: disable=g-import-not-at-top import pandas as pd HAS_PANDAS = True +except IOError: + # Pandas writes a temporary file during import. If it fails, don't use pandas. + HAS_PANDAS = False except ImportError: HAS_PANDAS = False diff --git a/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py b/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py index d5ed2eba62..437c0b1ebb 100644 --- a/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py +++ b/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py @@ -26,6 +26,9 @@ try: # pylint: disable=g-import-not-at-top import pandas as pd HAS_PANDAS = True +except IOError: + # Pandas writes a temporary file during import. If it fails, don't use pandas. + HAS_PANDAS = False except ImportError: HAS_PANDAS = False |