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

Change Python's ObjectID to ObjectRef (#9353)

Browse Source
This commit is contained in:
Hao Chen
2020-07-10 17:49:04 +08:00
committed by GitHub
parent 6311e5a947
commit d49dadf891
91 changed files with 959 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/tests/test_metrics.py
+9 -9
View File
@@ -11,7 +11,7 @@ from ray.core.generated import node_manager_pb2
from ray.core.generated import node_manager_pb2_grpc
from ray.core.generated import reporter_pb2
from ray.core.generated import reporter_pb2_grpc
from ray.dashboard.memory import (ReferenceType, decode_object_id_if_needed,
from ray.dashboard.memory import (ReferenceType, decode_object_ref_if_needed,
MemoryTableEntry, MemoryTable, SortingType)
from ray.test_utils import (RayTestTimeoutException,
wait_until_succeeded_without_exception,
@@ -210,7 +210,7 @@ def test_raylet_info_endpoint(shutdown_only):
try:
assert len(actor_info) == 1
_, parent_actor_info = actor_info.popitem()
assert parent_actor_info["numObjectIdsInScope"] == 13
assert parent_actor_info["numObjectRefsInScope"] == 13
assert parent_actor_info["numLocalObjects"] == 10
children = parent_actor_info["children"]
assert len(children) == 2
@@ -486,7 +486,7 @@ def test_memory_dashboard(shutdown_only):
stop_memory_table()
return True
def test_serialized_object_id_reference():
def test_serialized_object_ref_reference():
@ray.remote
def f(arg):
time.sleep(1)
@@ -508,7 +508,7 @@ def test_memory_dashboard(shutdown_only):
stop_memory_table()
return True
def test_captured_object_id_reference():
def test_captured_object_ref_reference():
a = ray.put(None)
b = ray.put([a]) # Noqa F841
del a
@@ -562,12 +562,12 @@ def test_memory_dashboard(shutdown_only):
True)
assert (wait_for_condition(
test_serialized_object_id_reference,
test_serialized_object_ref_reference,
timeout=30000,
retry_interval_ms=1000) is True)
assert (wait_for_condition(
test_captured_object_id_reference,
test_captured_object_ref_reference,
timeout=30000,
retry_interval_ms=1000) is True)
@@ -583,7 +583,7 @@ IS_DRIVER = True
PID = 1
OBJECT_ID = "7wpsIhgZiBz/////AQAAyAEAAAA="
ACTOR_ID = "fffffffffffffffff66d17ba010000c801000000"
DECODED_ID = decode_object_id_if_needed(OBJECT_ID)
DECODED_ID = decode_object_ref_if_needed(OBJECT_ID)
OBJECT_SIZE = 100
@@ -721,8 +721,8 @@ def test_invalid_memory_entry():
def test_valid_reference_memory_entry():
memory_entry = build_local_reference_entry()
assert memory_entry.reference_type == ReferenceType.LOCAL_REFERENCE
assert memory_entry.object_id == ray.ObjectID(
decode_object_id_if_needed(OBJECT_ID))
assert memory_entry.object_ref == ray.ObjectRef(
decode_object_ref_if_needed(OBJECT_ID))
assert memory_entry.is_valid() is True