Skip to content

Export no-longer accepts callable; wrap in nn.Module. #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Export no-longer accepts callable; wrap in nn.Module. #6345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ae22d6
Export no-longer accepts callable; wrap in nn.Module.
qihqi Jan 22, 2024
4691231
Enable test
qihqi Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ function run_xla_op_tests3 {
run_torchrun "$CDIR/pjrt/test_torchrun.py"
run_test "$CDIR/test_persistent_cache.py"
# NOTE: this line below is testing export and don't care about GPU
# TODO(qihqi): Enable after fix
# PJRT_DEVICE=CPU CPU_NUM_DEVICES=1 run_coverage "$CDIR/test_core_aten_ops.py"
PJRT_DEVICE=CPU CPU_NUM_DEVICES=1 run_coverage "$CDIR/test_core_aten_ops.py"
}

#######################################################################################
Expand Down
19 changes: 13 additions & 6 deletions test/test_core_aten_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ def diff_output(testcase, output1, output2, rtol, atol, equal_nan=True):
testcase.assertEqual(output1, output2)


class NNModWrapper(torch.nn.Module):

def __init__(self, op):
super().__init__()
self._op = op

def forward(self, *args, **kwargs):
return self._op(*args, **kwargs)


def run_export_and_compare(testcase,
func,
args,
Expand All @@ -62,7 +72,7 @@ def run_export_and_compare(testcase,
diff_output(
testcase, res, res_xla, atol=atol, rtol=rtol, equal_nan=equal_nan)
with testcase.subTest('can_export'):
exported = torch.export.export(func, args, kwargs)
exported = torch.export.export(NNModWrapper(func), args, kwargs)
with testcase.subTest('can_convert_to_stablehlo'):
shlo = exported_program_to_stablehlo(exported)
with testcase.subTest('stablehlo_can_run'):
Expand Down Expand Up @@ -4596,9 +4606,6 @@ def test_aten_upsample_nearest2d_0(self):
run_export_and_compare(self, torch.ops.aten.upsample_nearest2d, args,
kwargs)

def correction_wrapper(self, input, correction):
return torch.ops.aten.var.correction(input, correction=correction)

def test_aten_var_correction_0(self):
args = (torch.randn((10, 10)).to(torch.float32),)
kwargs = dict()
Expand All @@ -4612,12 +4619,12 @@ def test_aten_var_correction_1(self):
def test_aten_var_correction_2(self):
args = (torch.randn((10, 10)).to(torch.float32), 0)
kwargs = dict()
run_export_and_compare(self, self.correction_wrapper, args, kwargs)
run_export_and_compare(self, torch.ops.aten.var.correction, args, kwargs)

def test_aten_var_correction_3(self):
args = (torch.randn((10, 10)).to(torch.float16), 0)
kwargs = dict()
run_export_and_compare(self, self.correction_wrapper, args, kwargs)
run_export_and_compare(self, torch.ops.aten.var.correction, args, kwargs)

def test_aten_view_0(self):
args = (
Expand Down