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

Remove use_legacy_config tests (#12272)

Browse Source
This commit is contained in:
Edward Oakes
2020-11-23 20:30:50 -06:00
committed by GitHub
parent 1b3c48b922
commit be2187f942
1 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/serve/tests/test_api.py
+18 -49
View File
@@ -193,8 +193,7 @@ def test_set_traffic_missing_data(serve_instance):
client.set_traffic("nonexistent_endpoint_name", {backend_name: 1.0})
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_scaling_replicas(serve_instance, use_legacy_config):
def test_scaling_replicas(serve_instance):
client = serve_instance
class Counter:
@@ -205,9 +204,7 @@ def test_scaling_replicas(serve_instance, use_legacy_config):
self.count += 1
return self.count
config = {
"num_replicas": 2
} if use_legacy_config else BackendConfig(num_replicas=2)
config = BackendConfig(num_replicas=2)
client.create_backend("counter:v1", Counter, config=config)
client.create_endpoint("counter", backend="counter:v1", route="/increment")
@@ -225,9 +222,7 @@ def test_scaling_replicas(serve_instance, use_legacy_config):
# If the load is shared among two replicas. The max result cannot be 10.
assert max(counter_result) < 10
update_config = {
"num_replicas": 1
} if use_legacy_config else BackendConfig(num_replicas=1)
update_config = BackendConfig(num_replicas=1)
client.update_backend_config("counter:v1", update_config)
counter_result = []
@@ -239,8 +234,7 @@ def test_scaling_replicas(serve_instance, use_legacy_config):
assert max(counter_result) - min(counter_result) > 6
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_batching(serve_instance, use_legacy_config):
def test_batching(serve_instance):
client = serve_instance
class BatchingExample:
@@ -254,11 +248,7 @@ def test_batching(serve_instance, use_legacy_config):
return [self.count] * batch_size
# set the max batch size
config = {
"max_batch_size": 5,
"batch_wait_timeout": 1
} if use_legacy_config else BackendConfig(
max_batch_size=5, batch_wait_timeout=1)
config = BackendConfig(max_batch_size=5, batch_wait_timeout=1)
client.create_backend("counter:v11", BatchingExample, config=config)
client.create_endpoint(
"counter1", backend="counter:v11", route="/increment2")
@@ -281,8 +271,7 @@ def test_batching(serve_instance, use_legacy_config):
assert max(counter_result) < 20
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_batching_exception(serve_instance, use_legacy_config):
def test_batching_exception(serve_instance):
client = serve_instance
class NoListReturned:
@@ -293,10 +282,8 @@ def test_batching_exception(serve_instance, use_legacy_config):
def __call__(self, requests):
return len(requests)
# set the max batch size
config = {
"max_batch_size": 5
} if use_legacy_config else BackendConfig(max_batch_size=5)
# Set the max batch size.
config = BackendConfig(max_batch_size=5)
client.create_backend("exception:v1", NoListReturned, config=config)
client.create_endpoint(
"exception-test", backend="exception:v1", route="/noListReturned")
@@ -306,8 +293,7 @@ def test_batching_exception(serve_instance, use_legacy_config):
assert ray.get(handle.remote(temp=1))
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_updating_config(serve_instance, use_legacy_config):
def test_updating_config(serve_instance):
client = serve_instance
class BatchSimple:
@@ -318,11 +304,7 @@ def test_updating_config(serve_instance, use_legacy_config):
def __call__(self, request):
return [1] * len(request)
config = {
"max_batch_size": 2,
"num_replicas": 3
} if use_legacy_config else BackendConfig(
max_batch_size=2, num_replicas=3)
config = BackendConfig(max_batch_size=2, num_replicas=3)
client.create_backend("bsimple:v1", BatchSimple, config=config)
client.create_endpoint("bsimple", backend="bsimple:v1", route="/bsimple")
@@ -330,9 +312,7 @@ def test_updating_config(serve_instance, use_legacy_config):
old_replica_tag_list = ray.get(
controller._list_replicas.remote("bsimple:v1"))
update_config = {
"max_batch_size": 5
} if use_legacy_config else BackendConfig(max_batch_size=5)
update_config = BackendConfig(max_batch_size=5)
client.update_backend_config("bsimple:v1", update_config)
new_replica_tag_list = ray.get(
controller._list_replicas.remote("bsimple:v1"))
@@ -502,8 +482,7 @@ def test_multiple_instances():
client1.delete_backend(backend)
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_parallel_start(serve_instance, use_legacy_config):
def test_parallel_start(serve_instance):
client = serve_instance
# Test the ability to start multiple replicas in parallel.
@@ -534,9 +513,7 @@ def test_parallel_start(serve_instance, use_legacy_config):
def __call__(self, _):
return "Ready"
config = {
"num_replicas": 2
} if use_legacy_config else BackendConfig(num_replicas=2)
config = BackendConfig(num_replicas=2)
client.create_backend("p:v0", LongStartingServable, config=config)
client.create_endpoint("test-parallel", backend="p:v0")
handle = client.get_handle("test-parallel")
@@ -588,26 +565,21 @@ def test_list_endpoints(serve_instance):
assert len(client.list_endpoints()) == 0
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_list_backends(serve_instance, use_legacy_config):
def test_list_backends(serve_instance):
client = serve_instance
@serve.accept_batch
def f():
pass
config1 = {
"max_batch_size": 10
} if use_legacy_config else BackendConfig(max_batch_size=10)
config1 = BackendConfig(max_batch_size=10)
client.create_backend("backend", f, config=config1)
backends = client.list_backends()
assert len(backends) == 1
assert "backend" in backends
assert backends["backend"].max_batch_size == 10
config2 = {
"num_replicas": 10
} if use_legacy_config else BackendConfig(num_replicas=10)
config2 = BackendConfig(num_replicas=10)
client.create_backend("backend2", f, config=config2)
backends = client.list_backends()
assert len(backends) == 2
@@ -638,8 +610,7 @@ def test_endpoint_input_validation(serve_instance):
client.create_endpoint("endpoint", backend="backend")
@pytest.mark.parametrize("use_legacy_config", [False, True])
def test_create_infeasible_error(serve_instance, use_legacy_config):
def test_create_infeasible_error(serve_instance):
client = serve_instance
def f():
@@ -657,9 +628,7 @@ def test_create_infeasible_error(serve_instance, use_legacy_config):
# Even each replica might be feasible, the total might not be.
current_cpus = int(ray.nodes()[0]["Resources"]["CPU"])
num_replicas = current_cpus + 20
config = {
"num_replicas": num_replicas
} if use_legacy_config else BackendConfig(num_replicas=num_replicas)
config = BackendConfig(num_replicas=num_replicas)
with pytest.raises(RayServeException, match="Cannot scale backend"):
client.create_backend(
"f:1",