hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 10:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix: cmake copy plasma java lib from lib64 directory in centos (#2885)

Browse source
This commit is contained in:
Hanwei Jin 2018-09-17 13:32:09 +08:00 • committed by Robert Nishihara
parent f372f48bf3
commit dc76e51a60
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -154,5 +154,5 @@ if ("${CMAKE_RAY_LANG_JAVA}" STREQUAL "YES")
# copy libplasma_java files # copy libplasma_java files
add_custom_command(TARGET copy_ray POST_BUILD add_custom_command(TARGET copy_ray POST_BUILD
COMMAND bash -c "cp ${ARROW_HOME}/lib/libplasma_java.* ${CMAKE_CURRENT_BINARY_DIR}/src/plasma") COMMAND bash -c "cp ${ARROW_LIBRARY_DIR}/libplasma_java.* ${CMAKE_CURRENT_BINARY_DIR}/src/plasma")
endif() endif()

3
cmake/Modules/ThirdpartyToolchain.cmake
View file

@ -179,6 +179,7 @@ if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
# clean the arrow_ep/python/build/lib.xxxxx directory, # clean the arrow_ep/python/build/lib.xxxxx directory,
# or when you build with another python version, it creates multiple lib.xxxx directories # or when you build with another python version, it creates multiple lib.xxxx directories
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${ARROW_SOURCE_DIR}/python/build/") set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${ARROW_SOURCE_DIR}/python/build/")
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_SOURCE_DIR}/python/ray/pyarrow_files/pyarrow")
# here we use externalProject to process pyarrow building # here we use externalProject to process pyarrow building
# add_custom_command would have problem with setup.py # add_custom_command would have problem with setup.py
@ -189,6 +190,6 @@ if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cd ${ARROW_SOURCE_DIR}/python && ${CMAKE_COMMAND} -E env ${pyarrow_ENV} ${PYTHON_EXECUTABLE} setup.py build CONFIGURE_COMMAND cd ${ARROW_SOURCE_DIR}/python && ${CMAKE_COMMAND} -E env ${pyarrow_ENV} ${PYTHON_EXECUTABLE} setup.py build
BUILD_COMMAND cd ${ARROW_SOURCE_DIR}/python && ${CMAKE_COMMAND} -E env ${pyarrow_ENV} ${PYTHON_EXECUTABLE} setup.py build_ext BUILD_COMMAND cd ${ARROW_SOURCE_DIR}/python && ${CMAKE_COMMAND} -E env ${pyarrow_ENV} ${PYTHON_EXECUTABLE} setup.py build_ext
INSTALL_COMMAND bash -c "cp -r \$(find ${ARROW_SOURCE_DIR}/python/build/ -maxdepth 1 -type d -print | grep -m1 'lib')/pyarrow ${CMAKE_SOURCE_DIR}/python/ray/pyarrow_files/") INSTALL_COMMAND bash -c "cp -rf \$(find ${ARROW_SOURCE_DIR}/python/build/ -maxdepth 1 -type d -print | grep -m1 'lib')/pyarrow ${CMAKE_SOURCE_DIR}/python/ray/pyarrow_files/")
endif () endif ()

3
test/runtest.py
View file

@ -2524,6 +2524,8 @@ class GlobalStateAPI(unittest.TestCase):
if tables_ready: if tables_ready:
break break
# this test case is blocked sometimes, add this may fix the problem
time.sleep(0.1)
# Flush the tables. # Flush the tables.
ray.experimental.flush_redis_unsafe() ray.experimental.flush_redis_unsafe()
@ -2537,6 +2539,7 @@ class GlobalStateAPI(unittest.TestCase):
ray.get([f.remote() for _ in range(10)]) ray.get([f.remote() for _ in range(10)])
while len(ray.global_state.task_table()) != 0: while len(ray.global_state.task_table()) != 0:
time.sleep(0.1)
ray.experimental.flush_finished_tasks_unsafe() ray.experimental.flush_finished_tasks_unsafe()
# Make sure that we can call this method (but it won't do anything in # Make sure that we can call this method (but it won't do anything in