wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-08-11 11:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate C++ Buffer management and Seal global threadpool fix from arrow (#1950)

Browse Source
This commit is contained in:
Philipp Moritz
2018-04-25 22:53:44 -07:00
committed by Robert Nishihara
parent dad465a2bf
commit af88fdefcf
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/cmake/Common.cmake
+9 -3
View File
@@ -10,7 +10,12 @@ if(UNIX AND NOT APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
endif()
set(FLATBUFFERS_VERSION "1.7.1")
# The following is needed because in CentOS, the lib directory is named lib64
if(EXISTS "/etc/redhat-release" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(LIB_SUFFIX 64)
endif()
set(FLATBUFFERS_VERSION "1.9.0")
set(FLATBUFFERS_PREFIX "${CMAKE_BINARY_DIR}/flatbuffers_ep-prefix/src/flatbuffers_ep-install")
if (NOT TARGET flatbuffers_ep)
@@ -19,13 +24,14 @@ if (NOT TARGET flatbuffers_ep)
CMAKE_ARGS
"-DCMAKE_CXX_FLAGS=-fPIC"
"-DCMAKE_INSTALL_PREFIX:PATH=${FLATBUFFERS_PREFIX}"
"-DFLATBUFFERS_BUILD_TESTS=OFF")
"-DFLATBUFFERS_BUILD_TESTS=OFF"
"-DCMAKE_BUILD_TYPE=RELEASE")
endif()
set(FBS_DEPENDS flatbuffers_ep)
set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_PREFIX}/include")
set(FLATBUFFERS_STATIC_LIB "${FLATBUFFERS_PREFIX}/lib/libflatbuffers.a")
set(FLATBUFFERS_STATIC_LIB "${FLATBUFFERS_PREFIX}/lib${LIB_SUFFIX}/libflatbuffers.a")
set(FLATBUFFERS_COMPILER "${FLATBUFFERS_PREFIX}/bin/flatc")
message(STATUS "Flatbuffers include dir: ${FLATBUFFERS_INCLUDE_DIR}")
src/ray/object_manager/object_buffer_pool.cc
+1 -1
View File
@@ -51,7 +51,7 @@ std::pair<const ObjectBufferPool::ChunkInfo &, ray::Status> ObjectBufferPool::Ge
RAY_CHECK(object_buffer.metadata->data() ==
object_buffer.data->data() + object_buffer.data->size());
RAY_CHECK(data_size == static_cast<uint64_t>(object_buffer.data->size() +
object_buffer.metadata_size));
object_buffer.metadata->size()));
auto *data = const_cast<uint8_t *>(object_buffer.data->data());
uint64_t num_chunks = GetNumChunks(data_size);
get_buffer_state_.emplace(
src/ray/object_manager/test/object_manager_stress_test.cc
+3 -3
View File
@@ -296,9 +296,9 @@ class StressTestObjectManager : public TestObjectManagerBase {
plasma::ObjectBuffer object_buffer_2 = GetObject(client2, object_id_2);
uint8_t *data_1 = const_cast<uint8_t *>(object_buffer_1.data->data());
uint8_t *data_2 = const_cast<uint8_t *>(object_buffer_2.data->data());
ASSERT_EQ(object_buffer_1.data->size(), object_buffer_2.data_size);
ASSERT_EQ(object_buffer_1.metadata_size, object_buffer_2.metadata_size);
int64_t total_size = object_buffer_1.data->size() + object_buffer_1.metadata_size;
ASSERT_EQ(object_buffer_1.data->size(), object_buffer_2.data->size());
ASSERT_EQ(object_buffer_1.metadata->size(), object_buffer_2.metadata->size());
int64_t total_size = object_buffer_1.data->size() + object_buffer_1.metadata->size();
RAY_LOG(DEBUG) << "total_size " << total_size;
for (int i = -1; ++i < total_size;) {
ASSERT_TRUE(data_1[i] == data_2[i]);