manually fix rebase issues

Author: XilunWu

.ci/docker/requirements.txt

@@ -36,7 +36,7 @@ datasets
 transformers
 torchmultimodal-nightly # needs to be updated to stable as soon as it's avaialable
 onnx
-onnxscript>=0.2.2
+onnxscript
 onnxruntime
 evaluate
 accelerate>=0.20.1
@@ -69,5 +69,5 @@ pycocotools
 semilearn==0.3.2
 torchao==0.5.0
 segment_anything==1.0
-torchrec==1.1.0; platform_system == "Linux"
+torchrec==1.0.0; platform_system == "Linux"
 fbgemm-gpu==1.1.0; platform_system == "Linux"

.jenkins/build.sh

@@ -22,14 +22,10 @@ sudo apt-get install -y pandoc
 #Install PyTorch Nightly for test.
 # Nightly - pip install --pre torch torchvision torchaudio -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
 # Install 2.5 to merge all 2.4 PRs - uncomment to install nightly binaries (update the version as needed).
-sudo pip uninstall -y torch torchvision torchaudio torchtext torchdata torchrl tensordict
-pip3 install torch==2.7.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu126
-#sudo pip uninstall -y fbgemm-gpu
-#sudo pip3 install --pre fbgemm-gpu --index-url https://download.pytorch.org/whl/nightly/cu126/
-#pip install tensordict-nightly
-#pip install torchrl-nightly
-#sudo pip3 install fbgemm-gpu==1.1.0 torchrec==1.0.0 --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu126
-
+# sudo pip uninstall -y torch torchvision torchaudio torchtext torchdata
+# sudo pip3 install torch==2.6.0 torchvision --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
+# sudo pip uninstall -y fbgemm-gpu torchrec
+# sudo pip3 install fbgemm-gpu==1.1.0 torchrec==1.0.0 --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
 
 # Install two language tokenizers for Translation with TorchText tutorial
 python -m spacy download en_core_web_sm

intermediate_source/torch_export_tutorial.py

@@ -995,7 +995,7 @@ def forward(self, x):
 #    with torch.no_grad():
 #        pt2_path = torch._inductor.aoti_compile_and_package(ep)
 #
-#    # Load and run the .pt2 file in Python.
+#    # Load and run the .so file in Python.
 #    # To load and run it in a C++ environment, see:
 #    # https://pytorch.org/docs/main/torch.compiler_aot_inductor.html
 #    aoti_compiled = torch._inductor.aoti_load_package(pt2_path)

recipes_source/torch_export_aoti_python.py

@@ -238,11 +238,11 @@ def timed(fn):
 
 torch._dynamo.reset()
 
-compiled_model = torch._inductor.aoti_load_package(model_path)
-example_inputs = torch.randn(1, 3, 224, 224, device=device)
+model = torch._inductor.aoti_load_package(model_path)
+example_inputs = (torch.randn(1, 3, 224, 224, device=device),)
 
 with torch.inference_mode():
-    _, time_taken = timed(lambda: compiled_model(example_inputs))
+    _, time_taken = timed(lambda: model(example_inputs))
     print(f"Time taken for first inference for AOTInductor is {time_taken:.2f} ms")