Skip to content

Commit 6d9160a

Browse files
lint
Signed-off-by: Alexey Kudinkin <ak@anyscale.com> # Conflicts: # python/ray/data/tests/test_autoscaler.py Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
1 parent 42601ab commit 6d9160a

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

python/ray/data/_internal/execution/resource_manager.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ def max_task_output_bytes_to_read(
781781
return None
782782
res = self._op_budgets[op].object_store_memory
783783
# Add the remaining of `_reserved_for_op_outputs`.
784-
op_outputs_usage = self._resource_manager.get_op_outputs_object_store_usage_with_downstream(
785-
op
784+
op_outputs_usage = (
785+
self._resource_manager.get_op_outputs_object_store_usage_with_downstream(op)
786786
)
787787

788788
res += max(self._reserved_for_op_outputs[op] - op_outputs_usage, 0)
@@ -824,10 +824,14 @@ def update_budgets(
824824
op_mem_usage = 0
825825
# Add the memory usage of the operator itself,
826826
# excluding `_reserved_for_op_outputs`.
827-
op_mem_usage += self._resource_manager.get_op_internal_object_store_usage(op)
827+
op_mem_usage += self._resource_manager.get_op_internal_object_store_usage(
828+
op
829+
)
828830
# Add the portion of op outputs usage that has
829831
# exceeded `_reserved_for_op_outputs`.
830-
op_outputs_usage = self._resource_manager.get_op_outputs_object_store_usage_with_downstream(op)
832+
op_outputs_usage = self._resource_manager.get_op_outputs_object_store_usage_with_downstream(
833+
op
834+
)
831835
op_mem_usage += max(op_outputs_usage - self._reserved_for_op_outputs[op], 0)
832836

833837
op_usage = self._resource_manager.get_op_usage(op).copy(

python/ray/data/tests/test_resource_manager.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -604,9 +604,6 @@ def test_reserve_incremental_resource_usage(self, restore_data_context):
604604
allocator = resource_manager._op_resource_allocator
605605
assert isinstance(allocator, ReservationOpResourceAllocator)
606606

607-
op_usages = {op: ExecutionResources.zero() for op in [o1, o2, o3, o4, o5]}
608-
op_internal_usage = dict.fromkeys([o1, o2, o3, o4, o5], 0)
609-
op_outputs_usages = dict.fromkeys([o1, o2, o3, o4, o5], 0)
610607
allocator.update_budgets(
611608
limits=global_limits,
612609
)
@@ -663,9 +660,6 @@ def test_reserve_min_resources_for_gpu_ops(
663660
allocator = resource_manager._op_resource_allocator
664661
assert isinstance(allocator, ReservationOpResourceAllocator)
665662

666-
op_usages = {op: ExecutionResources.zero() for op in [o1, o2]}
667-
op_internal_usage = dict.fromkeys([o1, o2], 0)
668-
op_outputs_usages = dict.fromkeys([o1, o2], 0)
669663
allocator.update_budgets(
670664
limits=global_limits,
671665
)
@@ -698,9 +692,6 @@ def test_does_not_reserve_more_than_max_resource_usage(self):
698692
)
699693
allocator = resource_manager._op_resource_allocator
700694

701-
op_usages = {op: ExecutionResources.zero() for op in [o1, o2]}
702-
op_internal_usage = dict.fromkeys([o1, o2], 0)
703-
op_outputs_usages = dict.fromkeys([o1, o2], 0)
704695
global_limits = resource_manager.get_global_limits()
705696
allocator.update_budgets(
706697
limits=global_limits,
@@ -736,9 +727,6 @@ def test_only_handle_eligible_ops(self, restore_data_context):
736727
allocator = resource_manager._op_resource_allocator
737728
assert isinstance(allocator, ReservationOpResourceAllocator)
738729

739-
op_usages = {op: ExecutionResources.zero() for op in [o1, o2, o3]}
740-
op_internal_usage = dict.fromkeys([o1, o2, o3], 0)
741-
op_outputs_usages = dict.fromkeys([o1, o2, o3], 0)
742730
global_limits = resource_manager.get_global_limits()
743731
allocator.update_budgets(
744732
limits=global_limits,

python/ray/data/tests/test_stats.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,7 @@ def gen_expected_metrics(
239239
"'block_completion_time': "
240240
f"{gen_histogram_values(histogram_buckets_s, 'N')}"
241241
),
242-
(
243-
"'task_completion_time_s': "
244-
f"{'N' if task_backpressure else 'Z'}"
245-
),
242+
("'task_completion_time_s': " f"{'N' if task_backpressure else 'Z'}"),
246243
(
247244
"'task_completion_time_excl_backpressure_s': "
248245
f"{'N' if task_backpressure else 'Z'}"

0 commit comments

Comments
 (0)