Skip to content

Commit 8c306b9

Browse files
authored
Merge branch 'master' into claude/ray-issue-51442-c7b3c7
2 parents a160a05 + ace0b67 commit 8c306b9

6 files changed

Lines changed: 30 additions & 20 deletions

File tree

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/python/ray/ @ray-project/ray-core
2222

2323
# Java worker.
24-
/java/ @kfstorm @raulchen @WangTaoTheTonic @SongGuyang @ray-project/ray-core
24+
/java/ @ray-project/ray-core
2525

2626
# C++ worker
2727
/cpp/ @SongGuyang @raulchen @kfstorm @ray-project/ray-core
@@ -32,7 +32,7 @@
3232
/doc/source/cluster/kubernetes/ @andrewsykim @ray-project/ray-core @ray-project/ray-docs
3333

3434
# Public protobuf files.
35-
/src/ray/protobuf/public/ @edoakes @dayshah @MengjinYan
35+
/src/ray/protobuf/public/ @edoakes @MengjinYan
3636

3737
# Azure autoscaler
3838
/python/ray/autoscaler/azure/ @ray-project/ray-core @marosset @jackfrancis @alimaazamat
@@ -45,7 +45,7 @@
4545

4646
# Common directory shared by core and the libraries.
4747
# Stricter enforcement because this defines the public boundary supported by core.
48-
/python/ray/_common/ @edoakes @dayshah @MengjinYan
48+
/python/ray/_common/ @edoakes @MengjinYan
4949

5050
# Ray data.
5151
/python/ray/data/ @ray-project/ray-data

doc/source/template_pins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"_note": "Pinned templates.ci.ray.io build ids for the docs build. Managed by the auto-bump workflow in anyscale/docs; prefer bumping via that PR rather than hand-editing. Consumed by template_collections.py. 'pins' maps each template in _TEMPLATE_COLLECTIONS to a build id, fetched as /templates/<name>/<id>/build.zip.",
33
"pins": {
44
"asynchronous_inference": "20260709-002741",
5-
"audio-dataset-curation-llm-judge": "20260608-222228",
5+
"audio-dataset-curation-llm-judge": "20260709-175135",
66
"deepspeed_finetune": "20260709-002714",
77
"deployment-serve-llm": "20260709-065934",
88
"distributing-pytorch": "20260709-055846",

python/ray/data/_internal/execution/operators/map_transformer.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,18 @@ def __init__(
101101
*,
102102
is_udf: bool = False,
103103
output_block_size_option: Optional[OutputBlockSizeOption] = None,
104-
reports_custom_op_stats: bool = False,
104+
should_report_custom_op_stats: bool = False,
105105
):
106106
"""Initialize a :class:`MapTransformFn`.
107107
108108
Args:
109109
fn: The wrapped transform callable. Invoked with ``(data, ctx)``, or
110110
``(data, ctx, report_custom_op_stats)`` when
111-
``reports_custom_op_stats=True``.
111+
``should_report_custom_op_stats=True``.
112112
input_type: Expected type of the input data.
113113
is_udf: Whether this transformation is UDF or not.
114114
output_block_size_option: (Optional) Output block size configuration.
115-
reports_custom_op_stats: If ``True``, the wrapped callable accepts a
115+
should_report_custom_op_stats: If ``True``, the wrapped callable accepts a
116116
third ``report_custom_op_stats`` callback argument and may report
117117
per-task :class:`CustomOpStats` to the driver. Defaults to
118118
``False``, in which case the callable is invoked with
@@ -122,7 +122,7 @@ def __init__(
122122
self._input_type = input_type
123123
self._output_block_size_option = output_block_size_option
124124
self._is_udf = is_udf
125-
self._reports_custom_op_stats = reports_custom_op_stats
125+
self._should_report_custom_op_stats = should_report_custom_op_stats
126126

127127
@abstractmethod
128128
def _post_process(self, results: Iterable[MapTransformFnData]) -> Iterable[Block]:
@@ -137,10 +137,10 @@ def _apply_transform(
137137
"""Call the wrapped fn, passing ``report_custom_op_stats`` only if it opted in.
138138
139139
Keeps the common ``(data, ctx)`` signature for the vast majority of
140-
transforms; only those constructed with ``reports_custom_op_stats=True``
140+
transforms; only those constructed with ``should_report_custom_op_stats=True``
141141
receive the report callback.
142142
"""
143-
if self._reports_custom_op_stats:
143+
if self._should_report_custom_op_stats:
144144
return self._fn(inputs, ctx, report_custom_op_stats)
145145
return self._fn(inputs, ctx)
146146

@@ -375,14 +375,14 @@ def __init__(
375375
*,
376376
is_udf: bool = False,
377377
output_block_size_option: OutputBlockSizeOption,
378-
reports_custom_op_stats: bool = False,
378+
should_report_custom_op_stats: bool = False,
379379
):
380380
super().__init__(
381381
row_fn,
382382
input_type=MapTransformFnDataType.Row,
383383
is_udf=is_udf,
384384
output_block_size_option=output_block_size_option,
385-
reports_custom_op_stats=reports_custom_op_stats,
385+
should_report_custom_op_stats=should_report_custom_op_stats,
386386
)
387387

388388
def _pre_process(self, blocks: Iterable[Block]) -> Iterable[MapTransformFnData]:
@@ -438,14 +438,14 @@ def __init__(
438438
zero_copy_batch: bool = True,
439439
output_block_size_option: Optional[OutputBlockSizeOption] = None,
440440
target_batch_size_bytes: int = _DEFAULT_BATCH_SIZE_BYTES,
441-
reports_custom_op_stats: bool = False,
441+
should_report_custom_op_stats: bool = False,
442442
):
443443
super().__init__(
444444
batch_fn,
445445
input_type=MapTransformFnDataType.Batch,
446446
is_udf=is_udf,
447447
output_block_size_option=output_block_size_option,
448-
reports_custom_op_stats=reports_custom_op_stats,
448+
should_report_custom_op_stats=should_report_custom_op_stats,
449449
)
450450

451451
self._batch_size = batch_size
@@ -487,7 +487,7 @@ def __init__(
487487
is_udf: bool = False,
488488
disable_block_shaping: bool = False,
489489
output_block_size_option: Optional[OutputBlockSizeOption] = None,
490-
reports_custom_op_stats: bool = False,
490+
should_report_custom_op_stats: bool = False,
491491
):
492492
"""
493493
Initializes the object with a transformation function, accompanying options, and
@@ -500,7 +500,7 @@ def __init__(
500500
disable_block_shaping: Disables block-shaping, making transformer to
501501
produce blocks as is.
502502
output_block_size_option: (Optional) Configure output block sizing.
503-
reports_custom_op_stats: If ``True``, ``block_fn`` accepts a third
503+
should_report_custom_op_stats: If ``True``, ``block_fn`` accepts a third
504504
``report_custom_op_stats`` callback argument and may report
505505
per-task :class:`CustomOpStats` to the driver.
506506
"""
@@ -510,7 +510,7 @@ def __init__(
510510
input_type=MapTransformFnDataType.Block,
511511
is_udf=is_udf,
512512
output_block_size_option=output_block_size_option,
513-
reports_custom_op_stats=reports_custom_op_stats,
513+
should_report_custom_op_stats=should_report_custom_op_stats,
514514
)
515515

516516
self._disable_block_shaping = disable_block_shaping

python/ray/data/tests/test_stats.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ def set_stats(blocks, ctx, report_custom_op_stats):
207207
transformer = MapTransformer(
208208
[
209209
BlockMapTransformFn(
210-
set_stats, disable_block_shaping=True, reports_custom_op_stats=True
210+
set_stats,
211+
disable_block_shaping=True,
212+
should_report_custom_op_stats=True,
211213
)
212214
]
213215
)
@@ -257,7 +259,9 @@ def set_stats(blocks, ctx, report_custom_op_stats):
257259
transformer = MapTransformer(
258260
[
259261
BlockMapTransformFn(
260-
set_stats, disable_block_shaping=True, reports_custom_op_stats=True
262+
set_stats,
263+
disable_block_shaping=True,
264+
should_report_custom_op_stats=True,
261265
)
262266
]
263267
)
@@ -296,7 +300,9 @@ def passthrough(blocks, ctx):
296300
upstream = MapTransformer(
297301
[
298302
BlockMapTransformFn(
299-
report_stats, disable_block_shaping=True, reports_custom_op_stats=True
303+
report_stats,
304+
disable_block_shaping=True,
305+
should_report_custom_op_stats=True,
300306
)
301307
]
302308
)

python/ray/tests/accelerators/test_nvidia_gpu.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ def test_gpu_info_parsing(patch_mock_pynvml):
8282
("NVIDIA H20", "H20"),
8383
("NVIDIA B200", "B200"),
8484
("NVIDIA B300", "B300"),
85+
("NVIDIA GB200", "GB200"),
86+
("NVIDIA GB300", "GB300"),
8587
# Consumer GPUs: the regex does not match the mixed-case product line,
8688
# so we fall back to a hyphen-joined product name.
8789
("NVIDIA GeForce RTX 5090", "GeForce-RTX-5090"),

python/ray/util/accelerators/accelerators.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
NVIDIA_H20 = "H20"
1313
NVIDIA_B200 = "B200"
1414
NVIDIA_B300 = "B300"
15+
NVIDIA_GB200 = "GB200"
16+
NVIDIA_GB300 = "GB300"
1517
NVIDIA_RTX_PRO_6000 = "RTX-PRO-6000"
1618
INTEL_MAX_1550 = "Intel-GPU-Max-1550"
1719
INTEL_MAX_1100 = "Intel-GPU-Max-1100"

0 commit comments

Comments
 (0)