hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 18:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[PlacementGroup]Add PlacementGroup wait python api (#12601)" (#12825)

Browse source 
This reverts commit 401d342602.
This commit is contained in:
Eric Liang 2020-12-12 12:13:48 -08:00 • committed by GitHub
parent b73d4831d4
commit bdc6624da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
python/ray/tests/test_placement_group.py
View file

@ -50,7 +50,7 @@ def test_placement_group_pack(ray_start_cluster):
"CPU": 2 "CPU": 2
} }
]) ])
assert placement_group.wait(10000) ray.get(placement_group.ready())
actor_1 = Actor.options( actor_1 = Actor.options(
placement_group=placement_group, placement_group=placement_group,
placement_group_bundle_index=0).remote() placement_group_bundle_index=0).remote()
@ -96,7 +96,7 @@ def test_placement_group_strict_pack(ray_start_cluster):
}, { }, {
"CPU": 2 "CPU": 2
}]) }])
assert placement_group.wait(10000) ray.get(placement_group.ready())
actor_1 = Actor.options( actor_1 = Actor.options(
placement_group=placement_group, placement_group=placement_group,
placement_group_bundle_index=0).remote() placement_group_bundle_index=0).remote()
@ -142,7 +142,7 @@ def test_placement_group_spread(ray_start_cluster):
}, { }, {
"CPU": 2 "CPU": 2
}]) }])
assert placement_group.wait(10000) ray.get(placement_group.ready())
actor_1 = Actor.options( actor_1 = Actor.options(
placement_group=placement_group, placement_group=placement_group,
placement_group_bundle_index=0).remote() placement_group_bundle_index=0).remote()
@ -192,7 +192,7 @@ def test_placement_group_strict_spread(ray_start_cluster):
}, { }, {
"CPU": 2 "CPU": 2
}]) }])
assert placement_group.wait(10000) ray.get(placement_group.ready())
actor_1 = Actor.options( actor_1 = Actor.options(
placement_group=placement_group, placement_group=placement_group,
placement_group_bundle_index=0).remote() placement_group_bundle_index=0).remote()
@ -1177,7 +1177,7 @@ def test_create_placement_group_after_gcs_server_restart(
# Create placement group 1 successfully. # Create placement group 1 successfully.
placement_group1 = ray.util.placement_group([{"CPU": 1}, {"CPU": 1}]) placement_group1 = ray.util.placement_group([{"CPU": 1}, {"CPU": 1}])
assert placement_group1.wait(10000) ray.get(placement_group1.ready(), timeout=10)
table = ray.util.placement_group_table(placement_group1) table = ray.util.placement_group_table(placement_group1)
assert table["state"] == "CREATED" assert table["state"] == "CREATED"
@ -1187,7 +1187,7 @@ def test_create_placement_group_after_gcs_server_restart(
# Create placement group 2 successfully. # Create placement group 2 successfully.
placement_group2 = ray.util.placement_group([{"CPU": 1}, {"CPU": 1}]) placement_group2 = ray.util.placement_group([{"CPU": 1}, {"CPU": 1}])
assert placement_group2.wait(10000) ray.get(placement_group2.ready(), timeout=10)
table = ray.util.placement_group_table(placement_group2) table = ray.util.placement_group_table(placement_group2)
assert table["state"] == "CREATED" assert table["state"] == "CREATED"
@ -1250,21 +1250,7 @@ def test_create_placement_group_during_gcs_server_restart(
cluster.head_node.start_gcs_server() cluster.head_node.start_gcs_server()
for i in range(0, 100): for i in range(0, 100):
assert placement_groups[i].wait(10000) ray.get(placement_groups[i].ready())
def test_placement_group_wait_api(ray_start_cluster):
cluster = ray_start_cluster
cluster.add_node(num_cpus=4)
ray.init(address=cluster.address)
placement_group = ray.util.placement_group(
name="name", strategy="PACK", bundles=[{
"CPU": 2,
}, {
"CPU": 2
}])
assert placement_group.wait(10000)
if __name__ == "__main__": if __name__ == "__main__":

15
python/ray/util/placement_group.py
View file

@ -83,21 +83,6 @@ class PlacementGroup:
placement_group_bundle_index=bundle_index, placement_group_bundle_index=bundle_index,
resources=resources).remote(self) resources=resources).remote(self)
def wait(self, timeout_ms: int) -> bool:
"""Wait for the placement group to be ready within the specified time.
Args:
timeout_ms(str): Timeout in milliseconds.
Return:
True if the placement group is created. False otherwise.
"""
worker = ray.worker.global_worker
worker.check_connected()
return worker.core_worker.wait_placement_group_ready(
self.id, timeout_ms)
@property @property
def bundle_specs(self) -> List[Dict]: def bundle_specs(self) -> List[Dict]:
"""List[Dict]: Return bundles belonging to this placement group.""" """List[Dict]: Return bundles belonging to this placement group."""