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

[Core] Use core worker options to initialize (#10467)

Browse Source 
* fix

* fix

* .
This commit is contained in:
kisuke95
2020-09-07 18:36:43 -05:00
committed by GitHub
parent 8db1f16f25
commit b7003839bd
9 changed files with 149 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/src/ray/util/process_helper.cc
+16 -30
View File
@@ -53,36 +53,22 @@ void ProcessHelper::RayStart(std::shared_ptr<RayConfig> config) {
gcs::GcsClientOptions gcs_options =
gcs::GcsClientOptions(redis_ip, config->redis_port, config->redis_password);
CoreWorkerOptions options = {
config->worker_type, // worker_type
Language::CPP, // langauge
session_dir + "/sockets/plasma_store", // store_socket
session_dir + "/sockets/raylet", // raylet_socket
JobID::FromInt(1), // job_id
gcs_options, // gcs_options
true, // enable_logging
"", // log_dir
true, // install_failure_signal_handler
"127.0.0.1", // node_ip_address
config->node_manager_port, // node_manager_port
"127.0.0.1", // raylet_ip_address
"cpp_worker", // driver_name
"", // stdout_file
"", // stderr_file
nullptr, // task_execution_callback
nullptr, // check_signals
nullptr, // gc_collect
nullptr, // spill_objects
nullptr, // restore_spilled_objects
nullptr, // get_lang_stack
nullptr, // kill_main
true, // ref_counting_enabled
false, // is_local_mode
1, // num_workers
nullptr, // terminate_asyncio_thread
"", // serialized_job_config
-1, // metrics_agent_port
};
CoreWorkerOptions options;
options.worker_type = config->worker_type;
options.language = Language::CPP;
options.store_socket = session_dir + "/sockets/plasma_store";
options.raylet_socket = session_dir + "/sockets/raylet";
options.job_id = JobID::FromInt(1);
options.gcs_options = gcs_options;
options.enable_logging = true;
options.install_failure_signal_handler = true;
options.node_ip_address = "127.0.0.1";
options.node_manager_port = config->node_manager_port;
options.raylet_ip_address = "127.0.0.1";
options.driver_name = "cpp_worker";
options.ref_counting_enabled = true;
options.num_workers = 1;
options.metrics_agent_port = -1;
CoreWorkerProcess::Initialize(options);
}
cpp/src/ray/worker/default_worker.cc
+18 -31
View File
@@ -13,37 +13,24 @@ class DefaultWorker {
DefaultWorker(const std::string &store_socket, const std::string &raylet_socket,
int node_manager_port, const gcs::GcsClientOptions &gcs_options,
const std::string &session_dir) {
CoreWorkerOptions options = {
WorkerType::WORKER, // worker_type
Language::CPP, // langauge
store_socket, // store_socket
raylet_socket, // raylet_socket
JobID::FromInt(1), // job_id
gcs_options, // gcs_options
true, // enable_logging
session_dir + "/logs", // log_dir
true, // install_failure_signal_handler
"127.0.0.1", // node_ip_address
node_manager_port, // node_manager_port
"127.0.0.1", // raylet_ip_address
"", // driver_name
"", // stdout_file
"", // stderr_file
std::bind(&DefaultWorker::ExecuteTask, this, _1, _2, _3, _4, _5, _6, _7,
_8), // task_execution_callback
nullptr, // check_signals
nullptr, // gc_collect
nullptr, // spill_objects
nullptr, // restore_spilled_objects
nullptr, // get_lang_stack
nullptr, // kill_main
true, // ref_counting_enabled
false, // is_local_mode
1, // num_workers
nullptr, // terminate_asyncio_thread
"", // serialized_job_config
-1, // metrics_agent_port
};
CoreWorkerOptions options;
options.worker_type = WorkerType::WORKER;
options.language = Language::CPP;
options.store_socket = store_socket;
options.raylet_socket = raylet_socket;
options.job_id = JobID::FromInt(1);
options.gcs_options = gcs_options;
options.enable_logging = true;
options.log_dir = session_dir + "/logs";
options.install_failure_signal_handler = true;
options.node_ip_address = "127.0.0.1";
options.node_manager_port = node_manager_port;
options.raylet_ip_address = "127.0.0.1";
options.task_execution_callback =
std::bind(&DefaultWorker::ExecuteTask, this, _1, _2, _3, _4, _5, _6, _7, _8);
options.ref_counting_enabled = true;
options.num_workers = 1;
options.metrics_agent_port = -1;
CoreWorkerProcess::Initialize(options);
}