[Torch Dialect] Emit `torch.aten.mul.float_int`, add folder and conversion to Arith. #3750

giacs-epic · 2024-10-01T16:44:11Z

Folder is required to simplify the shape calculation of torch.aten.__interpolate.size_list_scale_list:

torch-mlir/lib/Dialect/Torch/Transforms/AbstractInterpLibrary.cpp

Lines 6900 to 6907 in 5eab669

    
           "        %13 = torch.operator \"aten.mul.float_int\"(%11, %12) : (!torch.float, !torch.int) -> !torch.float \n" 
        
           "        %14 = torch.aten.Int.float %13 : !torch.float -> !torch.int\n" 
        
           "        %15 = torch.aten.append.t %3, %14 : !torch.list<int>, !torch.int -> !torch.list<int>\n" 
        
           "        %16 = torch.aten.__getitem__.t %9, %int1 : !torch.list<float>, !torch.int -> !torch.float\n" 
        
           "        %17 = torch.aten.__getitem__.t %arg0, %int3 : !torch.list<int>, !torch.int -> !torch.int\n" 
        
           "        %18 = torch.operator \"aten.mul.float_int\"(%16, %17) : (!torch.float, !torch.int) -> !torch.float \n" 
        
           "        %19 = torch.aten.Int.float %18 : !torch.float -> !torch.int\n" 
        
           "        %20 = torch.aten.append.t %3, %19 : !torch.list<int>, !torch.int -> !torch.list<int>\n"

(I've re-run build_tools/update_abstract_interp_lib.sh)

…lding.

zjgarvey

Thanks! Similar comments as on the other PR.

test/Conversion/TorchToArith/basic.mlir

lib/Dialect/Torch/IR/TorchOps.cpp

zjgarvey

I made some suggestions. Ping me when you make those and I'll approve the PR.

test/Conversion/TorchToArith/basic.mlir

Co-authored-by: zjgarvey <47986913+zjgarvey@users.noreply.github.com>

…shape calculation of `upsample_nearest2d`) (#3764) As per title. See also [PR](#3750) for `torch.aten.mul.float_int`. --------- Co-authored-by: zjgarvey <47986913+zjgarvey@users.noreply.github.com>

zjgarvey · 2024-11-26T22:43:33Z

It does look like this needs to resolve some minor conflicts. Would you mind syncing with main so we can merge?

…nd conversion to Arith. (#3750)" This reverts commit 4498569.

giacs-epic added 3 commits October 1, 2024 16:18

Add torch.aten.mul.float_int via torch_ods_gen.py and implment its fo…

85d9d62

…lding.

Add Arith conversion test.

b0b0d74

Merge branch 'main' into add_aten_mul_float_int

402b980

giacs-epic mentioned this pull request Oct 4, 2024

[Torch Dialect] Add torch.aten.mul.int_float (required to simplify shape calculation of upsample_nearest2d) #3764

Merged

zjgarvey requested changes Nov 8, 2024

View reviewed changes

test/Conversion/TorchToArith/basic.mlir Outdated Show resolved Hide resolved

lib/Dialect/Torch/IR/TorchOps.cpp Show resolved Hide resolved

giacs-epic added 2 commits November 15, 2024 11:02

Merge branch 'main' into add_aten_mul_float_int

a3984a9

Correct missing arith.sitofp in unit test

c6fdab1

zjgarvey requested changes Nov 18, 2024

View reviewed changes

test/Conversion/TorchToArith/basic.mlir Outdated Show resolved Hide resolved

giacs-epic and others added 2 commits November 20, 2024 08:58

Fix check in test/Conversion/TorchToArith/basic.mlir

74effb2

Co-authored-by: zjgarvey <47986913+zjgarvey@users.noreply.github.com>

Fix checks in basic.mlir

009eef9

zjgarvey self-requested a review November 26, 2024 22:21

zjgarvey approved these changes Nov 26, 2024

View reviewed changes

Merge branch 'main' into add_aten_mul_float_int

23b84f3

zjgarvey merged commit 4498569 into llvm:main Nov 27, 2024
3 checks passed

rahuls-cerebras added a commit that referenced this pull request Jan 3, 2025

Revert "[Torch Dialect] Emit torch.aten.mul.float_int, add folder a…

20c65b6

…nd conversion to Arith. (#3750)" This reverts commit 4498569.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Torch Dialect] Emit `torch.aten.mul.float_int`, add folder and conversion to Arith. #3750

[Torch Dialect] Emit `torch.aten.mul.float_int`, add folder and conversion to Arith. #3750

giacs-epic commented Oct 1, 2024

zjgarvey left a comment

zjgarvey left a comment

zjgarvey commented Nov 26, 2024

	" %13 = torch.operator \"aten.mul.float_int\"(%11, %12) : (!torch.float, !torch.int) -> !torch.float \n"
	" %14 = torch.aten.Int.float %13 : !torch.float -> !torch.int\n"
	" %15 = torch.aten.append.t %3, %14 : !torch.list<int>, !torch.int -> !torch.list<int>\n"
	" %16 = torch.aten.__getitem__.t %9, %int1 : !torch.list<float>, !torch.int -> !torch.float\n"
	" %17 = torch.aten.__getitem__.t %arg0, %int3 : !torch.list<int>, !torch.int -> !torch.int\n"
	" %18 = torch.operator \"aten.mul.float_int\"(%16, %17) : (!torch.float, !torch.int) -> !torch.float \n"
	" %19 = torch.aten.Int.float %18 : !torch.float -> !torch.int\n"
	" %20 = torch.aten.append.t %3, %19 : !torch.list<int>, !torch.int -> !torch.list<int>\n"

[Torch Dialect] Emit torch.aten.mul.float_int, add folder and conversion to Arith. #3750

[Torch Dialect] Emit torch.aten.mul.float_int, add folder and conversion to Arith. #3750

Conversation

giacs-epic commented Oct 1, 2024

zjgarvey left a comment

Choose a reason for hiding this comment

zjgarvey left a comment

Choose a reason for hiding this comment

zjgarvey commented Nov 26, 2024

[Torch Dialect] Emit `torch.aten.mul.float_int`, add folder and conversion to Arith. #3750

[Torch Dialect] Emit `torch.aten.mul.float_int`, add folder and conversion to Arith. #3750