wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-08-05 13:21:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

change remote function invocation from func() to func.remote() (#328)

Browse Source
This commit is contained in:
Robert Nishihara
2016-07-31 15:25:19 -07:00
committed by Philipp Moritz
parent 92f1976e94
commit 0e5b858324
19 changed files with 219 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/array_test.py
+61 -61
View File
@@ -16,25 +16,25 @@ class RemoteArrayTest(unittest.TestCase):
ray.services.start_ray_local(num_workers=1)
# test eye
ref = ra.eye(3)
ref = ra.eye.remote(3)
val = ray.get(ref)
self.assertTrue(np.alltrue(val == np.eye(3)))
# test zeros
ref = ra.zeros([3, 4, 5])
ref = ra.zeros.remote([3, 4, 5])
val = ray.get(ref)
self.assertTrue(np.alltrue(val == np.zeros([3, 4, 5])))
# test qr - pass by value
val_a = np.random.normal(size=[10, 11])
ref_q, ref_r = ra.linalg.qr(val_a)
ref_q, ref_r = ra.linalg.qr.remote(val_a)
val_q = ray.get(ref_q)
val_r = ray.get(ref_r)
self.assertTrue(np.allclose(np.dot(val_q, val_r), val_a))
# test qr - pass by objref
a = ra.random.normal([10, 13])
ref_q, ref_r = ra.linalg.qr(a)
a = ra.random.normal.remote([10, 13])
ref_q, ref_r = ra.linalg.qr.remote(a)
val_a = ray.get(a)
val_q = ray.get(ref_q)
val_r = ray.get(ref_r)
@@ -63,8 +63,8 @@ class DistributedArrayTest(unittest.TestCase):
reload(module)
ray.services.start_ray_local(num_workers=1)
a = ra.ones([da.BLOCK_SIZE, da.BLOCK_SIZE])
b = ra.zeros([da.BLOCK_SIZE, da.BLOCK_SIZE])
a = ra.ones.remote([da.BLOCK_SIZE, da.BLOCK_SIZE])
b = ra.zeros.remote([da.BLOCK_SIZE, da.BLOCK_SIZE])
x = da.DistArray()
x.construct([2 * da.BLOCK_SIZE, da.BLOCK_SIZE], np.array([[a], [b]]))
self.assertTrue(np.alltrue(x.assemble() == np.vstack([np.ones([da.BLOCK_SIZE, da.BLOCK_SIZE]), np.zeros([da.BLOCK_SIZE, da.BLOCK_SIZE])])))
@@ -77,68 +77,68 @@ class DistributedArrayTest(unittest.TestCase):
worker_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../scripts/default_worker.py")
ray.services.start_services_local(num_objstores=2, num_workers_per_objstore=5, worker_path=worker_path)
x = da.zeros([9, 25, 51], "float")
self.assertTrue(np.alltrue(ray.get(da.assemble(x)) == np.zeros([9, 25, 51])))
x = da.zeros.remote([9, 25, 51], "float")
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)) == np.zeros([9, 25, 51])))
x = da.ones([11, 25, 49], dtype_name="float")
self.assertTrue(np.alltrue(ray.get(da.assemble(x)) == np.ones([11, 25, 49])))
x = da.ones.remote([11, 25, 49], dtype_name="float")
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)) == np.ones([11, 25, 49])))
x = da.random.normal([11, 25, 49])
y = da.copy(x)
self.assertTrue(np.alltrue(ray.get(da.assemble(x)) == ray.get(da.assemble(y))))
x = da.random.normal.remote([11, 25, 49])
y = da.copy.remote(x)
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)) == ray.get(da.assemble.remote(y))))
x = da.eye(25, dtype_name="float")
self.assertTrue(np.alltrue(ray.get(da.assemble(x)) == np.eye(25)))
x = da.eye.remote(25, dtype_name="float")
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)) == np.eye(25)))
x = da.random.normal([25, 49])
y = da.triu(x)
self.assertTrue(np.alltrue(ray.get(da.assemble(y)) == np.triu(ray.get(da.assemble(x)))))
x = da.random.normal.remote([25, 49])
y = da.triu.remote(x)
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(y)) == np.triu(ray.get(da.assemble.remote(x)))))
x = da.random.normal([25, 49])
y = da.tril(x)
self.assertTrue(np.alltrue(ray.get(da.assemble(y)) == np.tril(ray.get(da.assemble(x)))))
x = da.random.normal.remote([25, 49])
y = da.tril.remote(x)
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(y)) == np.tril(ray.get(da.assemble.remote(x)))))
x = da.random.normal([25, 49])
y = da.random.normal([49, 18])
z = da.dot(x, y)
w = da.assemble(z)
u = da.assemble(x)
v = da.assemble(y)
x = da.random.normal.remote([25, 49])
y = da.random.normal.remote([49, 18])
z = da.dot.remote(x, y)
w = da.assemble.remote(z)
u = da.assemble.remote(x)
v = da.assemble.remote(y)
np.allclose(ray.get(w), np.dot(ray.get(u), ray.get(v)))
self.assertTrue(np.allclose(ray.get(w), np.dot(ray.get(u), ray.get(v))))
# test add
x = da.random.normal([23, 42])
y = da.random.normal([23, 42])
z = da.add(x, y)
self.assertTrue(np.allclose(ray.get(da.assemble(z)), ray.get(da.assemble(x)) + ray.get(da.assemble(y))))
x = da.random.normal.remote([23, 42])
y = da.random.normal.remote([23, 42])
z = da.add.remote(x, y)
self.assertTrue(np.allclose(ray.get(da.assemble.remote(z)), ray.get(da.assemble.remote(x)) + ray.get(da.assemble.remote(y))))
# test subtract
x = da.random.normal([33, 40])
y = da.random.normal([33, 40])
z = da.subtract(x, y)
self.assertTrue(np.allclose(ray.get(da.assemble(z)), ray.get(da.assemble(x)) - ray.get(da.assemble(y))))
x = da.random.normal.remote([33, 40])
y = da.random.normal.remote([33, 40])
z = da.subtract.remote(x, y)
self.assertTrue(np.allclose(ray.get(da.assemble.remote(z)), ray.get(da.assemble.remote(x)) - ray.get(da.assemble.remote(y))))
# test transpose
x = da.random.normal([234, 432])
y = da.transpose(x)
self.assertTrue(np.alltrue(ray.get(da.assemble(x)).T == ray.get(da.assemble(y))))
x = da.random.normal.remote([234, 432])
y = da.transpose.remote(x)
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)).T == ray.get(da.assemble.remote(y))))
# test numpy_to_dist
x = da.random.normal([23, 45])
y = da.assemble(x)
z = da.numpy_to_dist(y)
w = da.assemble(z)
self.assertTrue(np.alltrue(ray.get(da.assemble(x)) == ray.get(da.assemble(z))))
x = da.random.normal.remote([23, 45])
y = da.assemble.remote(x)
z = da.numpy_to_dist.remote(y)
w = da.assemble.remote(z)
self.assertTrue(np.alltrue(ray.get(da.assemble.remote(x)) == ray.get(da.assemble.remote(z))))
self.assertTrue(np.alltrue(ray.get(y) == ray.get(w)))
# test da.tsqr
for shape in [[123, da.BLOCK_SIZE], [7, da.BLOCK_SIZE], [da.BLOCK_SIZE, da.BLOCK_SIZE], [da.BLOCK_SIZE, 7], [10 * da.BLOCK_SIZE, da.BLOCK_SIZE]]:
x = da.random.normal(shape)
x = da.random.normal.remote(shape)
K = min(shape)
q, r = da.linalg.tsqr(x)
x_val = ray.get(da.assemble(x))
q_val = ray.get(da.assemble(q))
q, r = da.linalg.tsqr.remote(x)
x_val = ray.get(da.assemble.remote(x))
q_val = ray.get(da.assemble.remote(q))
r_val = ray.get(r)
self.assertTrue(r_val.shape == (K, shape[1]))
self.assertTrue(np.alltrue(r_val == np.triu(r_val)))
@@ -150,12 +150,12 @@ class DistributedArrayTest(unittest.TestCase):
print "testing dist_modified_lu with d1 = " + str(d1) + ", d2 = " + str(d2)
assert d1 >= d2
k = min(d1, d2)
m = ra.random.normal([d1, d2])
q, r = ra.linalg.qr(m)
l, u, s = da.linalg.modified_lu(da.numpy_to_dist(q))
m = ra.random.normal.remote([d1, d2])
q, r = ra.linalg.qr.remote(m)
l, u, s = da.linalg.modified_lu.remote(da.numpy_to_dist.remote(q))
q_val = ray.get(q)
r_val = ray.get(r)
l_val = ray.get(da.assemble(l))
l_val = ray.get(da.assemble.remote(l))
u_val = ray.get(u)
s_val = ray.get(s)
s_mat = np.zeros((d1, d2))
@@ -171,10 +171,10 @@ class DistributedArrayTest(unittest.TestCase):
# test dist_tsqr_hr
def test_dist_tsqr_hr(d1, d2):
print "testing dist_tsqr_hr with d1 = " + str(d1) + ", d2 = " + str(d2)
a = da.random.normal([d1, d2])
y, t, y_top, r = da.linalg.tsqr_hr(a)
a_val = ray.get(da.assemble(a))
y_val = ray.get(da.assemble(y))
a = da.random.normal.remote([d1, d2])
y, t, y_top, r = da.linalg.tsqr_hr.remote(a)
a_val = ray.get(da.assemble.remote(a))
y_val = ray.get(da.assemble.remote(y))
t_val = ray.get(t)
y_top_val = ray.get(y_top)
r_val = ray.get(r)
@@ -189,12 +189,12 @@ class DistributedArrayTest(unittest.TestCase):
def test_dist_qr(d1, d2):
print "testing qr with d1 = {}, and d2 = {}.".format(d1, d2)
a = da.random.normal([d1, d2])
a = da.random.normal.remote([d1, d2])
K = min(d1, d2)
q, r = da.linalg.qr(a)
a_val = ray.get(da.assemble(a))
q_val = ray.get(da.assemble(q))
r_val = ray.get(da.assemble(r))
q, r = da.linalg.qr.remote(a)
a_val = ray.get(da.assemble.remote(a))
q_val = ray.get(da.assemble.remote(q))
r_val = ray.get(da.assemble.remote(r))
self.assertTrue(q_val.shape == (d1, K))
self.assertTrue(r_val.shape == (K, d2))
self.assertTrue(np.allclose(np.dot(q_val.T, q_val), np.eye(K)))
test/microbenchmarks.py
+3 -3
View File
@@ -16,7 +16,7 @@ class MicroBenchmarkTest(unittest.TestCase):
elapsed_times = []
for _ in range(1000):
start_time = time.time()
test_functions.empty_function()
test_functions.empty_function.remote()
end_time = time.time()
elapsed_times.append(end_time - start_time)
elapsed_times = np.sort(elapsed_times)
@@ -32,7 +32,7 @@ class MicroBenchmarkTest(unittest.TestCase):
elapsed_times = []
for _ in range(1000):
start_time = time.time()
test_functions.trivial_function()
test_functions.trivial_function.remote()
end_time = time.time()
elapsed_times.append(end_time - start_time)
elapsed_times = np.sort(elapsed_times)
@@ -48,7 +48,7 @@ class MicroBenchmarkTest(unittest.TestCase):
elapsed_times = []
for _ in range(1000):
start_time = time.time()
x = test_functions.trivial_function()
x = test_functions.trivial_function.remote()
ray.get(x)
end_time = time.time()
elapsed_times.append(end_time - start_time)
test/runtest.py
+66 -66
View File
@@ -182,11 +182,11 @@ class APITest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(num_workers=3, driver_mode=ray.SILENT_MODE)
ref = test_functions.test_alias_f()
ref = test_functions.test_alias_f.remote()
self.assertTrue(np.alltrue(ray.get(ref) == np.ones([3, 4, 5])))
ref = test_functions.test_alias_g()
ref = test_functions.test_alias_g.remote()
self.assertTrue(np.alltrue(ray.get(ref) == np.ones([3, 4, 5])))
ref = test_functions.test_alias_h()
ref = test_functions.test_alias_h.remote()
self.assertTrue(np.alltrue(ray.get(ref) == np.ones([3, 4, 5])))
ray.services.cleanup()
@@ -195,35 +195,35 @@ class APITest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(num_workers=1)
x = test_functions.keyword_fct1(1)
x = test_functions.keyword_fct1.remote(1)
self.assertEqual(ray.get(x), "1 hello")
x = test_functions.keyword_fct1(1, "hi")
x = test_functions.keyword_fct1.remote(1, "hi")
self.assertEqual(ray.get(x), "1 hi")
x = test_functions.keyword_fct1(1, b="world")
x = test_functions.keyword_fct1.remote(1, b="world")
self.assertEqual(ray.get(x), "1 world")
x = test_functions.keyword_fct2(a="w", b="hi")
x = test_functions.keyword_fct2.remote(a="w", b="hi")
self.assertEqual(ray.get(x), "w hi")
x = test_functions.keyword_fct2(b="hi", a="w")
x = test_functions.keyword_fct2.remote(b="hi", a="w")
self.assertEqual(ray.get(x), "w hi")
x = test_functions.keyword_fct2(a="w")
x = test_functions.keyword_fct2.remote(a="w")
self.assertEqual(ray.get(x), "w world")
x = test_functions.keyword_fct2(b="hi")
x = test_functions.keyword_fct2.remote(b="hi")
self.assertEqual(ray.get(x), "hello hi")
x = test_functions.keyword_fct2("w")
x = test_functions.keyword_fct2.remote("w")
self.assertEqual(ray.get(x), "w world")
x = test_functions.keyword_fct2("w", "hi")
x = test_functions.keyword_fct2.remote("w", "hi")
self.assertEqual(ray.get(x), "w hi")
x = test_functions.keyword_fct3(0, 1, c="w", d="hi")
x = test_functions.keyword_fct3.remote(0, 1, c="w", d="hi")
self.assertEqual(ray.get(x), "0 1 w hi")
x = test_functions.keyword_fct3(0, 1, d="hi", c="w")
x = test_functions.keyword_fct3.remote(0, 1, d="hi", c="w")
self.assertEqual(ray.get(x), "0 1 w hi")
x = test_functions.keyword_fct3(0, 1, c="w")
x = test_functions.keyword_fct3.remote(0, 1, c="w")
self.assertEqual(ray.get(x), "0 1 w world")
x = test_functions.keyword_fct3(0, 1, d="hi")
x = test_functions.keyword_fct3.remote(0, 1, d="hi")
self.assertEqual(ray.get(x), "0 1 hello hi")
x = test_functions.keyword_fct3(0, 1)
x = test_functions.keyword_fct3.remote(0, 1)
self.assertEqual(ray.get(x), "0 1 hello world")
ray.services.cleanup()
@@ -232,9 +232,9 @@ class APITest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(num_workers=1)
x = test_functions.varargs_fct1(0, 1, 2)
x = test_functions.varargs_fct1.remote(0, 1, 2)
self.assertEqual(ray.get(x), "0 1 2")
x = test_functions.varargs_fct2(0, 1, 2)
x = test_functions.varargs_fct2.remote(0, 1, 2)
self.assertEqual(ray.get(x), "1 2")
self.assertTrue(test_functions.kwargs_exception_thrown)
@@ -246,14 +246,14 @@ class APITest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(num_workers=1, driver_mode=ray.SILENT_MODE)
test_functions.no_op()
test_functions.no_op.remote()
time.sleep(0.2)
task_info = ray.task_info()
self.assertEqual(len(task_info["failed_tasks"]), 0)
self.assertEqual(len(task_info["running_tasks"]), 0)
self.assertEqual(task_info["num_succeeded"], 1)
test_functions.no_op_fail()
test_functions.no_op_fail.remote()
time.sleep(0.2)
task_info = ray.task_info()
self.assertEqual(len(task_info["failed_tasks"]), 1)
@@ -269,8 +269,8 @@ class APITest(unittest.TestCase):
# Make sure that these functions throw exceptions because there return
# values do not type check.
test_functions.test_return1()
test_functions.test_return2()
test_functions.test_return1.remote()
test_functions.test_return2.remote()
time.sleep(0.2)
task_info = ray.task_info()
self.assertEqual(len(task_info["failed_tasks"]), 2)
@@ -286,30 +286,30 @@ class APITest(unittest.TestCase):
@ray.remote([int], [int])
def f(x):
return x + 1
self.assertEqual(ray.get(f(0)), 1)
self.assertEqual(ray.get(f.remote(0)), 1)
# Test that we can redefine the remote function.
@ray.remote([int], [int])
def f(x):
return x + 10
self.assertEqual(ray.get(f(0)), 10)
self.assertEqual(ray.get(f.remote(0)), 10)
# Test that we can close over plain old data.
data = [np.zeros([3, 5]), (1, 2, "a"), [0.0, 1.0, 2L], 2L, {"a": np.zeros(3)}]
@ray.remote([], [list])
def g():
return data
ray.get(g())
ray.get(g.remote())
# Test that we can close over modules.
@ray.remote([], [np.ndarray])
def h():
return np.zeros([3, 5])
self.assertTrue(np.alltrue(ray.get(h()) == np.zeros([3, 5])))
self.assertTrue(np.alltrue(ray.get(h.remote()) == np.zeros([3, 5])))
@ray.remote([], [float])
def j():
return time.time()
ray.get(j())
ray.get(j.remote())
# Test that we can define remote functions that call other remote functions.
@ray.remote([int], [int])
@@ -317,13 +317,13 @@ class APITest(unittest.TestCase):
return x + 1
@ray.remote([int], [int])
def l(x):
return k(x)
return k.remote(x)
@ray.remote([int], [int])
def m(x):
return ray.get(l(x))
self.assertEqual(ray.get(k(1)), 2)
self.assertEqual(ray.get(l(1)), 2)
self.assertEqual(ray.get(m(1)), 2)
return ray.get(l.remote(x))
self.assertEqual(ray.get(k.remote(1)), 2)
self.assertEqual(ray.get(l.remote(1)), 2)
self.assertEqual(ray.get(m.remote(1)), 2)
ray.services.cleanup()
@@ -348,10 +348,10 @@ class APITest(unittest.TestCase):
ray.services.start_ray_local(num_workers=2)
self.assertEqual(ray.get(use_foo()), 1)
self.assertEqual(ray.get(use_foo()), 1)
self.assertEqual(ray.get(use_bar()), [1])
self.assertEqual(ray.get(use_bar()), [1])
self.assertEqual(ray.get(use_foo.remote()), 1)
self.assertEqual(ray.get(use_foo.remote()), 1)
self.assertEqual(ray.get(use_bar.remote()), [1])
self.assertEqual(ray.get(use_bar.remote()), [1])
ray.services.cleanup()
@@ -360,9 +360,9 @@ class TaskStatusTest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(num_workers=3, driver_mode=ray.SILENT_MODE)
test_functions.test_alias_f()
test_functions.throw_exception_fct1()
test_functions.throw_exception_fct1()
test_functions.test_alias_f.remote()
test_functions.throw_exception_fct1.remote()
test_functions.throw_exception_fct1.remote()
time.sleep(1)
result = ray.task_info()
self.assertEqual(len(result["failed_tasks"]), 2)
@@ -374,7 +374,7 @@ class TaskStatusTest(unittest.TestCase):
self.assertTrue(task["operationid"] not in task_ids)
task_ids.add(task["operationid"])
x = test_functions.throw_exception_fct2()
x = test_functions.throw_exception_fct2.remote()
try:
ray.get(x)
except Exception as e:
@@ -382,7 +382,7 @@ class TaskStatusTest(unittest.TestCase):
else:
self.assertTrue(False) # ray.get should throw an exception
x, y, z = test_functions.throw_exception_fct3(1.0)
x, y, z = test_functions.throw_exception_fct3.remote(1.0)
for ref in [x, y, z]:
try:
ray.get(ref)
@@ -411,7 +411,7 @@ class ReferenceCountingTest(unittest.TestCase):
reload(module)
ray.services.start_ray_local(num_workers=1)
x = test_functions.test_alias_f()
x = test_functions.test_alias_f.remote()
ray.get(x)
time.sleep(0.1)
objref_val = x.val
@@ -420,7 +420,7 @@ class ReferenceCountingTest(unittest.TestCase):
del x
self.assertEqual(ray.scheduler_info()["reference_counts"][objref_val], -1) # -1 indicates deallocated
y = test_functions.test_alias_h()
y = test_functions.test_alias_h.remote()
ray.get(y)
time.sleep(0.1)
objref_val = y.val
@@ -429,7 +429,7 @@ class ReferenceCountingTest(unittest.TestCase):
del y
self.assertEqual(ray.scheduler_info()["reference_counts"][objref_val:(objref_val + 3)], [-1, -1, -1])
z = da.zeros([da.BLOCK_SIZE, 2 * da.BLOCK_SIZE])
z = da.zeros.remote([da.BLOCK_SIZE, 2 * da.BLOCK_SIZE])
time.sleep(0.1)
objref_val = z.val
self.assertEqual(ray.scheduler_info()["reference_counts"][objref_val:(objref_val + 3)], [1, 1, 1])
@@ -438,9 +438,9 @@ class ReferenceCountingTest(unittest.TestCase):
time.sleep(0.1)
self.assertEqual(ray.scheduler_info()["reference_counts"][objref_val:(objref_val + 3)], [-1, -1, -1])
x = ra.zeros([10, 10])
y = ra.zeros([10, 10])
z = ra.dot(x, y)
x = ra.zeros.remote([10, 10])
y = ra.zeros.remote([10, 10])
z = ra.dot.remote(x, y)
objref_val = x.val
time.sleep(0.1)
self.assertEqual(ray.scheduler_info()["reference_counts"][objref_val:(objref_val + 3)], [1, 1, 1])
@@ -502,7 +502,7 @@ class PythonModeTest(unittest.TestCase):
reload(test_functions)
ray.services.start_ray_local(driver_mode=ray.PYTHON_MODE)
xref = test_functions.test_alias_h()
xref = test_functions.test_alias_h.remote()
self.assertTrue(np.alltrue(xref == np.ones([3, 4, 5]))) # remote functions should return by value
self.assertTrue(np.alltrue(xref == ray.get(xref))) # ray.get should be the identity
y = np.random.normal(size=[11, 12])
@@ -510,9 +510,9 @@ class PythonModeTest(unittest.TestCase):
# make sure objects are immutable, this example is why we need to copy
# arguments before passing them into remote functions in python mode
aref = test_functions.python_mode_f()
aref = test_functions.python_mode_f.remote()
self.assertTrue(np.alltrue(aref == np.array([0, 0])))
bref = test_functions.python_mode_g(aref)
bref = test_functions.python_mode_g.remote(aref)
self.assertTrue(np.alltrue(aref == np.array([0, 0]))) # python_mode_g should not mutate aref
self.assertTrue(np.alltrue(bref == np.array([1, 0])))
@@ -528,8 +528,8 @@ class PythonCExtensionTest(unittest.TestCase):
@ray.remote([], [int])
def f():
return sys.getrefcount(obj)
first_count = ray.get(f())
second_count = ray.get(f())
first_count = ray.get(f.remote())
second_count = ray.get(f.remote())
self.assertEqual(first_count, second_count)
ray.services.cleanup()
@@ -552,9 +552,9 @@ class ReusablesTest(unittest.TestCase):
@ray.remote([], [int])
def use_foo():
return ray.reusables.foo
self.assertEqual(ray.get(use_foo()), 1)
self.assertEqual(ray.get(use_foo()), 1)
self.assertEqual(ray.get(use_foo()), 1)
self.assertEqual(ray.get(use_foo.remote()), 1)
self.assertEqual(ray.get(use_foo.remote()), 1)
self.assertEqual(ray.get(use_foo.remote()), 1)
# Test that we can add a variable to the key-value store, mutate it, and reset it.
@@ -567,9 +567,9 @@ class ReusablesTest(unittest.TestCase):
def use_bar():
ray.reusables.bar.append(4)
return ray.reusables.bar
self.assertEqual(ray.get(use_bar()), [1, 2, 3, 4])
self.assertEqual(ray.get(use_bar()), [1, 2, 3, 4])
self.assertEqual(ray.get(use_bar()), [1, 2, 3, 4])
self.assertEqual(ray.get(use_bar.remote()), [1, 2, 3, 4])
self.assertEqual(ray.get(use_bar.remote()), [1, 2, 3, 4])
self.assertEqual(ray.get(use_bar.remote()), [1, 2, 3, 4])
# Test that we can use the reinitializer.
@@ -587,10 +587,10 @@ class ReusablesTest(unittest.TestCase):
baz = ray.reusables.baz
baz[i] = 1
return baz
self.assertTrue(np.alltrue(ray.get(use_baz(0)) == np.array([1, 0, 0, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz(1)) == np.array([0, 1, 0, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz(2)) == np.array([0, 0, 1, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz(3)) == np.array([0, 0, 0, 1])))
self.assertTrue(np.alltrue(ray.get(use_baz.remote(0)) == np.array([1, 0, 0, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz.remote(1)) == np.array([0, 1, 0, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz.remote(2)) == np.array([0, 0, 1, 0])))
self.assertTrue(np.alltrue(ray.get(use_baz.remote(3)) == np.array([0, 0, 0, 1])))
# Make sure the reinitializer is actually getting called. Note that this is
# not the correct usage of a reinitializer because it does not reset qux to
@@ -606,9 +606,9 @@ class ReusablesTest(unittest.TestCase):
@ray.remote([], [int])
def use_qux():
return ray.reusables.qux
self.assertEqual(ray.get(use_qux()), 0)
self.assertEqual(ray.get(use_qux()), 1)
self.assertEqual(ray.get(use_qux()), 2)
self.assertEqual(ray.get(use_qux.remote()), 0)
self.assertEqual(ray.get(use_qux.remote()), 1)
self.assertEqual(ray.get(use_qux.remote()), 2)
ray.services.cleanup()
test/test_functions.py
+2 -2
View File
@@ -16,11 +16,11 @@ def test_alias_f():
@ray.remote([], [np.ndarray])
def test_alias_g():
return test_alias_f()
return test_alias_f.remote()
@ray.remote([], [np.ndarray])
def test_alias_h():
return test_alias_g()
return test_alias_g.remote()
# Test timing