Skip to content

Commit 18cabc3

Browse files
Sync from upstream (#3086)
Changes are made upstream in triton-lang/triton@d7ebf79, but accidentally removed in 2347dba. Signed-off-by: Whitney Tsang <[email protected]>
1 parent 26d2947 commit 18cabc3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

python/test/unit/language/print_helper.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ def exit_hook(lazy_dict: triton.compiler.LazyDict):
154154
BLOCK_SIZE_Y=BLOCK_SIZE_Y)
155155
else:
156156
assert f"Unknown kernel: {func}"
157+
157158
if func != "print_no_arg" and func != "no_arg_print" and func != "device_print_large" and \
158159
func != "print_multiple_args" and func != "device_print_multiple_args" and \
159160
func != "device_print_pointer" and func != "device_print_scalar" and func != "device_print_2d_tensor":

python/triton/compiler/code_generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ def visit_Return(self, node):
414414
self.builder.ret([])
415415
ret_ty = language.void
416416
elif isinstance(ret_value, language.tuple):
417-
ret_values = [language.semantic.to_tensor(v, self.builder) for v in ret_value.values]
417+
ret_values = [semantic.to_tensor(v, self.builder) for v in ret_value.values]
418418
ret_types = [v.type for v in ret_values]
419419
self.builder.ret([v.handle for v in ret_values])
420420
ret_ty = language.tuple_type(ret_types)
@@ -543,7 +543,7 @@ def _sanitize_value(value):
543543
if value is not None and \
544544
not _is_triton_value(value) and \
545545
not isinstance(value, native_nontensor_types):
546-
value = language.semantic.to_tensor(value, self.builder)
546+
value = semantic.to_tensor(value, self.builder)
547547
return value
548548

549549
values = _sanitize_value(self.visit(node.value))

0 commit comments

Comments
 (0)