diff --git a/python/ray/worker.py b/python/ray/worker.py index 8e19f4839..19ddad8ca 100644 --- a/python/ray/worker.py +++ b/python/ray/worker.py @@ -1044,6 +1044,7 @@ def _initialize_serialization(worker=global_worker): worker.serialization_context.set_pickle(pickle.dumps, pickle.loads) pyarrow.register_default_serialization_handlers( worker.serialization_context) + pyarrow.register_torch_serialization_handlers(worker.serialization_context) # Define a custom serializer and deserializer for handling Object IDs. def objectid_custom_serializer(obj): diff --git a/src/local_scheduler/local_scheduler_algorithm.cc b/src/local_scheduler/local_scheduler_algorithm.cc index 51bc90250..a0a8d431f 100644 --- a/src/local_scheduler/local_scheduler_algorithm.cc +++ b/src/local_scheduler/local_scheduler_algorithm.cc @@ -368,7 +368,7 @@ void finish_killed_task(LocalSchedulerState *state, int64_t num_returns = TaskSpec_num_returns(spec); for (int i = 0; i < num_returns; i++) { ObjectID object_id = TaskSpec_return(spec, i); - std::shared_ptr data; + std::shared_ptr data; // TODO(ekl): this writes an invalid arrow object, which is sufficient to // signal that the worker failed, but it would be nice to return more // detailed failure metadata in the future. diff --git a/src/plasma/plasma_manager.cc b/src/plasma/plasma_manager.cc index 6abbe0225..1ec5b4bed 100644 --- a/src/plasma/plasma_manager.cc +++ b/src/plasma/plasma_manager.cc @@ -863,7 +863,7 @@ void process_data_request(event_loop *loop, /* The corresponding call to plasma_release should happen in * process_data_chunk. */ - std::shared_ptr data; + std::shared_ptr data; plasma::Status s = conn->manager_state->plasma_conn->Create( object_id.to_plasma_id(), data_size, NULL, metadata_size, &data); diff --git a/src/plasma/test/client_tests.cc b/src/plasma/test/client_tests.cc index 6879b8d4a..04a206241 100644 --- a/src/plasma/test/client_tests.cc +++ b/src/plasma/test/client_tests.cc @@ -32,7 +32,7 @@ TEST plasma_status_tests(void) { int64_t data_size = 100; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK( client1.Create(oid1, data_size, metadata, metadata_size, &data)); ARROW_CHECK_OK(client1.Seal(oid1)); @@ -73,7 +73,7 @@ TEST plasma_fetch_tests(void) { int64_t data_size = 100; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK( client1.Create(oid1, data_size, metadata, metadata_size, &data)); ARROW_CHECK_OK(client1.Seal(oid1)); @@ -144,7 +144,7 @@ TEST plasma_nonblocking_get_tests(void) { int64_t data_size = 4; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK(client.Create(oid, data_size, metadata, metadata_size, &data)); init_data_123(data->mutable_data(), data_size, 0); ARROW_CHECK_OK(client.Seal(oid)); @@ -194,7 +194,7 @@ TEST plasma_wait_for_objects_tests(void) { int64_t data_size = 4; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK( client1.Create(oid1, data_size, metadata, metadata_size, &data)); ARROW_CHECK_OK(client1.Seal(oid1)); @@ -248,7 +248,7 @@ TEST plasma_get_tests(void) { int64_t data_size = 4; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK( client1.Create(oid1, data_size, metadata, metadata_size, &data)); init_data_123(data->mutable_data(), data_size, 1); @@ -291,7 +291,7 @@ TEST plasma_get_multiple_tests(void) { int64_t data_size = 4; uint8_t metadata[] = {5}; int64_t metadata_size = sizeof(metadata); - std::shared_ptr data; + std::shared_ptr data; ARROW_CHECK_OK( client1.Create(oid1, data_size, metadata, metadata_size, &data)); init_data_123(data->mutable_data(), data_size, obj1_first); diff --git a/src/thirdparty/download_thirdparty.sh b/src/thirdparty/download_thirdparty.sh index b9f12142f..30e55fd21 100755 --- a/src/thirdparty/download_thirdparty.sh +++ b/src/thirdparty/download_thirdparty.sh @@ -13,4 +13,4 @@ fi cd $TP_DIR/arrow git fetch origin master -git checkout d135974a0d3dd9a9fbbb10da4c5dbc65f9324234 +git checkout e26f3dad3675288564ef0c0330a5c9afcac652f1