Skip to content

ARROW-1016: Python: Include C++ headers (optionally) in wheels #678

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

Closed
xhochy wants to merge 5 commits into from
Closed

ARROW-1016: Python: Include C++ headers (optionally) in wheels #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3de6a8a
ARROW-1016: Python: Include C++ headers (optionally) in wheels
xhochy May 12, 2017
590f629
Add output to wrap cmake command
xhochy May 12, 2017
0b3209a
More cmake debug output
xhochy May 12, 2017
c982c97
Remove existing include folder
xhochy May 12, 2017
bc9b5ee
Build pyarrow using multiple cores
xhochy May 12, 2017
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
2 changes: 1 addition & 1 deletion ci/travis_script_manylinux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ set -ex
pushd python/manylinux1
git clone ../../ arrow
docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 .
docker run --rm -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh
docker run --rm -e PYARROW_PARALLEL=3 -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh
1 change: 1 addition & 0 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ endfunction(bundle_arrow_lib)

if (PYARROW_BUNDLE_ARROW_CPP)
# arrow
file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
bundle_arrow_lib(ARROW_SHARED_LIB)
bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
endif()
Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ git clone ../../ arrow
# Build the native baseimage
docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 .
# Build the python packages
docker run --rm -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh
docker run --rm -t -i -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh
# Now the new packages are located in the dist/ folder
ls -l dist/
```
12 changes: 12 additions & 0 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,18 @@ def _run_cmake(self):
cmake_command = (['cmake', self.extra_cmake_args] +
cmake_options + [source])

print("-- Runnning cmake for pyarrow")
self.spawn(cmake_command)
print("-- Finished cmake for pyarrow")
args = ['make']
if os.environ.get('PYARROW_BUILD_VERBOSE', '0') == '1':
args.append('VERBOSE=1')

if 'PYARROW_PARALLEL' in os.environ:
args.append('-j{0}'.format(os.environ['PYARROW_PARALLEL']))
print("-- Running cmake --build for pyarrow")
self.spawn(args)
print("-- Finished cmake --build for pyarrow")
else:
import shlex
cmake_generator = 'Visual Studio 14 2015 Win64'
Expand All @@ -183,9 +187,13 @@ def _run_cmake(self):
if "-G" in self.extra_cmake_args:
cmake_command = cmake_command[:-2]

print("-- Runnning cmake for pyarrow")
self.spawn(cmake_command)
print("-- Finished cmake for pyarrow")
# Do the build
print("-- Running cmake --build for pyarrow")
self.spawn(['cmake', '--build', '.', '--config', self.build_type])
print("-- Finished cmake --build for pyarrow")

if self.inplace:
# a bit hacky
Expand Down Expand Up @@ -225,6 +233,10 @@ def move_lib(lib_name):
os.symlink(lib_filename, link_name)

if self.bundle_arrow_cpp:
print(pjoin(self.build_type, 'include'), pjoin(build_lib, 'pyarrow'))
if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
shutil.move(pjoin(self.build_type, 'include'), pjoin(build_lib, 'pyarrow'))
move_lib("arrow")
move_lib("arrow_python")
if self.with_jemalloc:
Expand Down