remove args

angelayi · lucylq · commit 3451182b3ab8 · 2024-12-18T14:03:29.000-08:00
diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt
@@ -1 +1 @@
-80ca6dd892613fd4f1dee9040b8273ddeadb1c50
+2ea4b56ec872424e486c4fe2d55da061067a2ed3
diff --git a/examples/models/llama3_2_vision/text_decoder/test/test_text_decoder.py b/examples/models/llama3_2_vision/text_decoder/test/test_text_decoder.py
@@ -74,8 +74,6 @@ def test_llama3_2_text_decoder_aoti(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:
             path = torch._inductor.aoti_compile_and_package(
                 ep,
-                model.get_example_inputs(),
-                kwargs=model.get_example_kwarg_inputs(),
                 package_path=os.path.join(tmpdir, "text_decoder.pt2"),
             )
             encoder_aoti = torch._inductor.aoti_load_package(path)
diff --git a/examples/models/llama3_2_vision/vision_encoder/test/test_vision_encoder.py b/examples/models/llama3_2_vision/vision_encoder/test/test_vision_encoder.py
@@ -36,7 +36,6 @@ def test_flamingo_vision_encoder(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:
             path = torch._inductor.aoti_compile_and_package(
                 ep,
-                model.get_example_inputs(),
                 package_path=os.path.join(tmpdir, "vision_encoder.pt2"),
             )
             print(path)
diff --git a/extension/llm/export/builder.py b/extension/llm/export/builder.py
@@ -184,15 +184,22 @@ def export(self) -> "LLMEdgeManager":
         # 2. torch.no_grad() is for getting rid of the dropout (not sure why training ops will show up)
         with torch.nn.attention.sdpa_kernel([SDPBackend.MATH]), torch.no_grad():
             if hasattr(self.args, "qnn") and self.args.qnn:
-                # TODO: this is temporary and export_for_training doesn't work with qnn either. We need a
-                # functional graph. See issue https://github.com/pytorch/executorch/pull/4627 for more details
-                exported_module = torch.export.export(
-                    self.model,
-                    self.example_inputs,
-                    self.example_kwarg_inputs,
-                    dynamic_shapes=dynamic_shape,
-                    strict=True,
-                )
+                from unittest.mock import patch
+
+                with patch.object(
+                    torch._utils_internal,
+                    "export_training_ir_rollout_check",
+                    return_value=False,
+                ):
+                    # TODO: this is temporary and export_for_training doesn't work with qnn either. We need a
+                    # functional graph. See issue https://github.com/pytorch/executorch/pull/4627 for more details
+                    exported_module = torch.export.export(
+                        self.model,
+                        self.example_inputs,
+                        self.example_kwarg_inputs,
+                        dynamic_shapes=dynamic_shape,
+                        strict=True,
+                    )
             else:
                 logging.info("Exporting with:")
                 logging.info(f"inputs: {self.example_inputs}")
diff --git a/extension/llm/modules/test/test_position_embeddings.py b/extension/llm/modules/test/test_position_embeddings.py
@@ -177,7 +177,6 @@ def test_tiled_token_positional_embedding_aoti(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             path = torch._inductor.aoti_compile_and_package(
                 tpe_ep,
-                (self.x, self.aspect_ratio),
                 package_path=os.path.join(tmpdir, "tpe.pt2"),
             )
             tpe_aoti = load_package(path)
diff --git a/install_requirements.py b/install_requirements.py
@@ -112,7 +112,7 @@ def python_is_compatible():
 # NOTE: If a newly-fetched version of the executorch repo changes the value of
 # NIGHTLY_VERSION, you should re-run this script to install the necessary
 # package versions.
-NIGHTLY_VERSION = "dev20241206"
+NIGHTLY_VERSION = "dev20241218"
 
 # The pip repository that hosts nightly torch packages.
 TORCH_NIGHTLY_URL = "https://download.pytorch.org/whl/nightly/cpu"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-80ca6dd892613fd4f1dee9040b8273ddeadb1c50`
	`1`	`+2ea4b56ec872424e486c4fe2d55da061067a2ed3`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ def test_llama3_2_text_decoder_aoti(self) -> None:`
`74`	`74`	`with tempfile.TemporaryDirectory() as tmpdir:`
`75`	`75`	`path = torch._inductor.aoti_compile_and_package(`
`76`	`76`	`ep,`
`77`		`- model.get_example_inputs(),`
`78`		`- kwargs=model.get_example_kwarg_inputs(),`
`79`	`77`	`package_path=os.path.join(tmpdir, "text_decoder.pt2"),`
`80`	`78`	`)`
`81`	`79`	`encoder_aoti = torch._inductor.aoti_load_package(path)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ def test_flamingo_vision_encoder(self) -> None:`
`36`	`36`	`with tempfile.TemporaryDirectory() as tmpdir:`
`37`	`37`	`path = torch._inductor.aoti_compile_and_package(`
`38`	`38`	`ep,`
`39`		`- model.get_example_inputs(),`
`40`	`39`	`package_path=os.path.join(tmpdir, "vision_encoder.pt2"),`
`41`	`40`	`)`
`42`	`41`	`print(path)`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ def test_tiled_token_positional_embedding_aoti(self):`
`177`	`177`	`with tempfile.TemporaryDirectory() as tmpdir:`
`178`	`178`	`path = torch._inductor.aoti_compile_and_package(`
`179`	`179`	`tpe_ep,`
`180`		`- (self.x, self.aspect_ratio),`
`181`	`180`	`package_path=os.path.join(tmpdir, "tpe.pt2"),`
`182`	`181`	`)`
`183`	`182`	`tpe_aoti = load_package(path)`