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

updating addresses and adding tests

Browse Source
This commit is contained in:
Robert Nishihara
2016-03-10 14:40:46 -08:00
parent b63d20126d
commit d2aa71de76
5 changed files with 94 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/runtest.py
+54 -7
View File
@@ -71,9 +71,9 @@ class ObjStoreTest(unittest.TestCase):
worker1_port = new_worker_port()
worker2_port = new_worker_port()
services.start_scheduler(IP_ADDRESS, scheduler_port)
services.start_objstore(IP_ADDRESS, objstore1_port)
services.start_objstore(IP_ADDRESS, objstore2_port)
services.start_scheduler(address(IP_ADDRESS, scheduler_port))
services.start_objstore(address(IP_ADDRESS, objstore1_port))
services.start_objstore(address(IP_ADDRESS, objstore2_port))
time.sleep(0.2)
@@ -110,8 +110,8 @@ class SchedulerTest(unittest.TestCase):
worker1_port = new_worker_port()
worker2_port = new_worker_port()
services.start_scheduler(IP_ADDRESS, scheduler_port)
services.start_objstore(IP_ADDRESS, objstore_port)
services.start_scheduler(address(IP_ADDRESS, scheduler_port))
services.start_objstore(address(IP_ADDRESS, objstore_port))
time.sleep(0.2)
@@ -125,11 +125,17 @@ class SchedulerTest(unittest.TestCase):
test_dir = os.path.dirname(os.path.abspath(__file__))
test_path = os.path.join(test_dir, "testrecv.py")
services.start_worker(test_path, IP_ADDRESS, scheduler_port, worker2_port, objstore_port)
services.start_worker(test_path, address(IP_ADDRESS, scheduler_port), address(IP_ADDRESS, objstore_port), address(IP_ADDRESS, worker2_port))
time.sleep(0.2)
worker1.remote_call("print_string", ["hi"])
value_before = "test_string"
objref = worker1.remote_call("__main__.print_string", [value_before])
time.sleep(0.2)
# value_after = worker.pull(objref, worker1)
# self.assertEqual(value_before, value_after)
time.sleep(0.1)
@@ -137,5 +143,46 @@ class SchedulerTest(unittest.TestCase):
services.cleanup()
class WorkerTest(unittest.TestCase):
def testPushPull(self):
scheduler_port = new_scheduler_port()
objstore_port = new_objstore_port()
worker1_port = new_worker_port()
services.start_scheduler(address(IP_ADDRESS, scheduler_port))
services.start_objstore(address(IP_ADDRESS, objstore_port))
time.sleep(0.2)
worker1 = worker.Worker()
worker.connect(address(IP_ADDRESS, scheduler_port), address(IP_ADDRESS, objstore_port), address(IP_ADDRESS, worker1_port), worker1)
for i in range(100):
value_before = i * 10 ** 6
objref = worker.push(value_before, worker1)
value_after = worker.pull(objref, worker1)
self.assertEqual(value_before, value_after)
for i in range(100):
value_before = i * 10 ** 6 * 1.0
objref = worker.push(value_before, worker1)
value_after = worker.pull(objref, worker1)
self.assertEqual(value_before, value_after)
for i in range(100):
value_before = "h" * i
objref = worker.push(value_before, worker1)
value_after = worker.pull(objref, worker1)
self.assertEqual(value_before, value_after)
for i in range(100):
value_before = [1] * i
objref = worker.push(value_before, worker1)
value_after = worker.pull(objref, worker1)
self.assertEqual(value_before, value_after)
services.cleanup()
if __name__ == '__main__':
unittest.main()
test/shell.py
+7 -8
View File
@@ -8,10 +8,9 @@ import orchestra_pb2
import types_pb2
parser = argparse.ArgumentParser(description='Parse addresses for the worker to connect to.')
parser.add_argument("--ip_address", default="127.0.0.1", help="the IP address to use for both the scheduler and objstore")
parser.add_argument("--scheduler_port", default=10001, type=int, help="the scheduler's port")
parser.add_argument("--objstore_port", default=20001, type=int, help="the objstore's port")
parser.add_argument("--worker_port", default=40001, type=int, help="the worker's port")
parser.add_argument("--scheduler-address", default="127.0.0.1:10001", type=str, help="the scheduler's address")
parser.add_argument("--objstore-address", default="127.0.0.1:20001", type=str, help="the objstore's address")
parser.add_argument("--worker-address", default="127.0.0.1:40001", type=str, help="the worker's address")
@worker.distributed([str], [str])
def print_string(string):
@@ -24,8 +23,8 @@ def print_string(string):
def handle_int(a, b):
return a + 1, b + 1
def connect_to_scheduler(host, port):
channel = implementations.insecure_channel(host, port)
def connect_to_scheduler(address):
channel = implementations.insecure_channel(address)
return orchestra_pb2.beta_create_Scheduler_stub(channel)
def address(host, port):
@@ -33,7 +32,7 @@ def address(host, port):
if __name__ == '__main__':
args = parser.parse_args()
scheduler_stub = connect_to_scheduler(args.ip_address, args.scheduler_port)
worker.connect(address(args.ip_address, args.scheduler_port), address(args.ip_address, args.objstore_port), address(args.ip_address, args.worker_port))
scheduler_stub = connect_to_scheduler(args.scheduler_address)
worker.connect(args.scheduler_address, args.objstore_address, args.worker_address))
import IPython
IPython.embed()
test/testrecv.py
+4 -8
View File
@@ -5,10 +5,9 @@ import orchpy.services as services
import orchpy.worker as worker
parser = argparse.ArgumentParser(description='Parse addresses for the worker to connect to.')
parser.add_argument("--ip_address", default="127.0.0.1", help="the IP address to use for both the scheduler and objstore")
parser.add_argument("--scheduler_port", default=10001, type=int, help="the scheduler's port")
parser.add_argument("--objstore_port", default=20001, type=int, help="the objstore's port")
parser.add_argument("--worker_port", default=40001, type=int, help="the worker's port")
parser.add_argument("--scheduler-address", default="127.0.0.1:10001", type=str, help="the scheduler's address")
parser.add_argument("--objstore-address", default="127.0.0.1:20001", type=str, help="the objstore's address")
parser.add_argument("--worker-address", default="127.0.0.1:40001", type=str, help="the worker's address")
@worker.distributed([str], [str])
def print_string(string):
@@ -21,12 +20,9 @@ def print_string(string):
def handle_int(a, b):
return a + 1, b + 1
def address(host, port):
return host + ":" + str(port)
if __name__ == '__main__':
args = parser.parse_args()
worker.connect(address(args.ip_address, args.scheduler_port), address(args.ip_address, args.objstore_port), address(args.ip_address, args.worker_port))
worker.connect(args.scheduler_address, args.objstore_address, args.worker_address)
worker.global_worker.register_function(print_string)
worker.global_worker.register_function(handle_int)