Skip to content

Commit

Permalink
Rename allow_concurrent_inputs in protobuf (#2173)
Browse files Browse the repository at this point in the history
  • Loading branch information
cathyzbn committed Aug 30, 2024
1 parent b36881a commit 100b633
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion modal/_container_io_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def _init(self, container_args: api_pb2.ContainerArguments, client: _Client):
target_concurrency = 1
max_concurrency = 0
else:
target_concurrency = container_args.function_def.allow_concurrent_inputs or 1
target_concurrency = container_args.function_def.target_concurrent_inputs or 1
max_concurrency = container_args.function_def.max_concurrent_inputs or target_concurrency

self._target_concurrency = target_concurrency
Expand Down
2 changes: 1 addition & 1 deletion modal/cls.py
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def with_options(
task_idle_timeout_secs=container_idle_timeout,
replace_volume_mounts=replace_volume_mounts,
volume_mounts=volume_mounts,
allow_concurrent_inputs=allow_concurrent_inputs,
target_concurrent_inputs=allow_concurrent_inputs,
)

return cls
Expand Down
2 changes: 1 addition & 1 deletion modal/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ async def _load(self: _Function, resolver: Resolver, existing_object_id: Optiona
runtime_debug=config.get("function_runtime_debug"),
app_name=app_name,
is_builder_function=is_builder_function,
allow_concurrent_inputs=allow_concurrent_inputs or 0,
target_concurrent_inputs=allow_concurrent_inputs or 0,
batch_max_size=batch_max_size or 0,
batch_linger_ms=batch_wait_ms or 0,
worker_id=config.get("worker_id"),
Expand Down
4 changes: 2 additions & 2 deletions modal_proto/api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ message Function {

repeated VolumeMount volume_mounts = 33;

uint32 allow_concurrent_inputs = 34;
uint32 target_concurrent_inputs = 34;

repeated CustomDomainInfo custom_domain_info = 35;

Expand Down Expand Up @@ -1276,7 +1276,7 @@ message FunctionOptions {
optional uint32 task_idle_timeout_secs = 7;
optional uint32 warm_pool_size = 8;
repeated VolumeMount volume_mounts = 9;
optional uint32 allow_concurrent_inputs = 10;
optional uint32 target_concurrent_inputs = 10;
bool replace_volume_mounts = 11;
bool replace_secret_ids = 12;
}
Expand Down
4 changes: 2 additions & 2 deletions test/container_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def _container_args(
app_name=app_name or "",
is_builder_function=is_builder_function,
is_auto_snapshot=is_auto_snapshot,
allow_concurrent_inputs=allow_concurrent_inputs,
target_concurrent_inputs=allow_concurrent_inputs,
max_concurrent_inputs=max_concurrent_inputs,
batch_max_size=batch_max_size,
batch_linger_ms=batch_wait_ms,
Expand Down Expand Up @@ -1965,7 +1965,7 @@ def test_no_warn_on_remote_local_volume_mount(client, servicer, recwarn, set_env
@pytest.mark.parametrize("concurrency_limit", [1, 2])
def test_container_io_manager_concurrency_tracking(client, servicer, concurrency_limit):
dummy_container_args = api_pb2.ContainerArguments(
function_id="fu-123", function_def=api_pb2.Function(allow_concurrent_inputs=concurrency_limit)
function_id="fu-123", function_def=api_pb2.Function(target_concurrent_inputs=concurrency_limit)
)
from modal._utils.async_utils import synchronizer

Expand Down

0 comments on commit 100b633

Please sign in to comment.