mirror of
https://github.com/wassname/ray.git
synced 2026-06-29 01:27:43 +08:00
Pull Plasma from Apache Arrow and remove Plasma store from Ray. (#692)
* Rebase Ray on top of Plasma in Apache Arrow * add thirdparty building scripts * use rebased arrow * fix * fix build * fix python visibility * comment out C tests for now * fix multithreading * fix * reduce logging * fix plasma manager multithreading * make sure old and new object IDs can coexist peacefully * more rebasing * update * fixes * fix * install pyarrow * install cython * fix * install newer cmake * fix * rebase on top of latest arrow * getting runtest.py run locally (needed to comment out a test for that to work) * work on plasma tests * more fixes * fix local scheduler tests * fix global scheduler test * more fixes * fix python 3 bytes vs string * fix manager tests valgrind * fix documentation building * fix linting * fix c++ linting * fix linting * add tests back in * Install without sudo. * Set PKG_CONFIG_PATH in build.sh so that Ray can find plasma. * Install pkg-config * Link -lpthread, note that find_package(Threads) doesn't seem to work reliably. * Comment in testGPUIDs in runtest.py. * Set PKG_CONFIG_PATH when building pyarrow. * Pull apache/arrow and not pcmoritz/arrow. * Fix installation in docker image. * adapt to changes of the plasma api * Fix installation of pyarrow module. * Fix linting. * Use correct python executable to build pyarrow.
This commit is contained in:
committed by
Robert Nishihara
parent
dfcd399dbb
commit
c3b39b4d86
+22
-2
@@ -5,14 +5,35 @@ from __future__ import print_function
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from setuptools import setup, find_packages, Distribution
|
||||
import setuptools.command.build_ext as _build_ext
|
||||
|
||||
|
||||
# This used to be the first line of the run method in the build_ext class.
|
||||
# However, we moved it here because the previous approach seemed to fail in
|
||||
# Docker. Inside of the build.sh script, we install the pyarrow Python module.
|
||||
# Something about calling "python setup.py install" inside of the build_ext
|
||||
# run method doesn't work (this is easily reproducible in Docker with just a
|
||||
# couple files to simulate two Python modules). The problem is that the pyarrow
|
||||
# module doesn't get added to the easy-install.pth file, so it never gets added
|
||||
# to the Python path even though the package is built and copied to the right
|
||||
# location. An alternative fix would be to manually modify the easy-install.pth
|
||||
# file. TODO(rkn): Fix all of this.
|
||||
#
|
||||
# Note: We are passing in sys.executable so that we use the same version of
|
||||
# Python to build pyarrow inside the build.sh script. Note that certain flags
|
||||
# will not be passed along such as --user or sudo. TODO(rkn): Fix this.
|
||||
subprocess.check_call(["../build.sh", sys.executable])
|
||||
|
||||
|
||||
class build_ext(_build_ext.build_ext):
|
||||
def run(self):
|
||||
subprocess.check_call(["../build.sh"])
|
||||
# The line below has been moved outside of the build_ext class. See the
|
||||
# explanation there.
|
||||
# subprocess.check_call(["../build.sh"])
|
||||
|
||||
# Ideally, we could include these files by putting them in a
|
||||
# MANIFEST.in or using the package_data argument to setup, but the
|
||||
# MANIFEST.in gets applied at the very beginning when setup.py runs
|
||||
@@ -46,7 +67,6 @@ files_to_include = [
|
||||
"ray/core/src/common/redis_module/libray_redis_module.so",
|
||||
"ray/core/src/plasma/plasma_store",
|
||||
"ray/core/src/plasma/plasma_manager",
|
||||
"ray/core/src/plasma/libplasma.so",
|
||||
"ray/core/src/local_scheduler/local_scheduler",
|
||||
"ray/core/src/local_scheduler/liblocal_scheduler_library.so",
|
||||
"ray/core/src/numbuf/libnumbuf.so",
|
||||
|
||||
Reference in New Issue
Block a user