Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARROW-2657: [Python] Import TensorFlow python extension before pyarrow to avoid segfault #2210

Closed
wants to merge 11 commits into from
Closed

ARROW-2657: [Python] Import TensorFlow python extension before pyarrow to avoid segfault #2210

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1c9628f
try fixing tensorflow crash
pcmoritz Jul 2, 2018
7835fba
check for linux
pcmoritz Jul 2, 2018
02cb500
tests if the wheels work with tensorflow
pcmoritz Jul 2, 2018
57ca5fc
install conda to test wheels outside of docker
pcmoritz Jul 3, 2018
1135b51
silence tensorflow installation
pcmoritz Jul 3, 2018
ac38837
add clarification comment
pcmoritz Jul 3, 2018
c18cccb
address comments
pcmoritz Jul 3, 2018
bbf6cfc
load TensorFlow for sure if it exists
pcmoritz Jul 3, 2018
70f3bca
workaround for virtualenv
pcmoritz Jul 3, 2018
2ca3de9
clarify comment
pcmoritz Jul 3, 2018
92aef7a
Use compat namespace to avoid adding import_tensorflow_extension to p…
wesm Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ci/travis_script_manylinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,21 @@ pushd python/manylinux1
git clone ../../ arrow
docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 .
docker run --shm-size=2g --rm -e PYARROW_PARALLEL=3 -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh

# Testing for https://issues.apache.org/jira/browse/ARROW-2657
# These tests cannot be run inside of the docker container, since TensorFlow
# does not run on manylinux1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this test fail before this fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I tried it on an ec2 instance before putting it in.


source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh

source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh

PYTHON_VERSION=3.6
CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION

conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION
source activate $CONDA_ENV_DIR

pip install -q tensorflow
pip install "dist/`ls dist/ | grep cp36`"
python -c "import pyarrow; import tensorflow"
19 changes: 19 additions & 0 deletions python/pyarrow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,25 @@ def parse_version(root):
__version__ = None


try:
# We need to do the following to load TensorFlow before
# pyarrow.lib. If we don't do this there are symbol clashes
# between TensorFlow's use of threading and our global
# thread pool, see also
# https://issues.apache.org/jira/browse/ARROW-2657 and
# https://github.com/apache/arrow/pull/2096.
import ctypes
import os
from sys import platform
import site
if platform == "linux" or platform == "linux2":
SITE_PATH, = site.getsitepackages()
ctypes.CDLL(os.path.join(SITE_PATH, "tensorflow",
"libtensorflow_framework.so"))
except:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be better to make this less restrictive. You could even get away without a try/except and only attempt to load the shared lib if the TF folder is there. How about putting this in a function in pyarrow.compat?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

pass


from pyarrow.lib import cpu_count, set_cpu_count
from pyarrow.lib import (null, bool_,
int8, int16, int32, int64,
Expand Down