clean up imports (#230)

This commit is contained in:
Robert Nishihara
2016-07-08 12:46:47 -07:00
committed by Philipp Moritz
parent 191909dd93
commit 5dd411546d
16 changed files with 81 additions and 105 deletions
+2 -4
View File
@@ -7,8 +7,6 @@ import ray.array.distributed as da
import example_functions
import ray
import ray.services as services
import ray.worker as worker
parser = argparse.ArgumentParser(description="Parse addresses for the worker to connect to.")
parser.add_argument("--scheduler-address", default="127.0.0.1:10001", type=str, help="the scheduler's address")
@@ -17,7 +15,7 @@ parser.add_argument("--worker-address", default="127.0.0.1:40001", type=str, hel
if __name__ == "__main__":
args = parser.parse_args()
worker.connect(args.scheduler_address, args.objstore_address, args.worker_address)
ray.worker.connect(args.scheduler_address, args.objstore_address, args.worker_address)
ray.register_module(ra)
ray.register_module(ra.random)
@@ -27,4 +25,4 @@ if __name__ == "__main__":
ray.register_module(da.linalg)
ray.register_module(example_functions)
worker.main_loop()
ray.worker.main_loop()
+4 -6
View File
@@ -3,8 +3,6 @@ import argparse
import numpy as np
import ray
import ray.services as services
import ray.worker as worker
import ray.array.remote as ra
import ray.array.distributed as da
@@ -26,11 +24,11 @@ if __name__ == "__main__":
if args.attach:
assert args.worker_path is None, "when attaching, no new worker can be started"
assert args.num_workers is None, "when attaching, no new worker can be started"
worker.connect(args.scheduler_address, args.objstore_address, args.worker_address, is_driver=True, mode=ray.SHELL_MODE)
ray.worker.connect(args.scheduler_address, args.objstore_address, args.worker_address, is_driver=True, mode=ray.SHELL_MODE)
else:
services.start_ray_local(num_workers=args.num_workers if not args.num_workers is None else DEFAULT_NUM_WORKERS,
worker_path=args.worker_path if not args.worker_path is None else DEFAULT_WORKER_PATH,
driver_mode=ray.SHELL_MODE)
ray.services.start_ray_local(num_workers=args.num_workers if not args.num_workers is None else DEFAULT_NUM_WORKERS,
worker_path=args.worker_path if not args.worker_path is None else DEFAULT_WORKER_PATH,
driver_mode=ray.SHELL_MODE)
import IPython
IPython.embed()