Update

[ghstack-poisoned]
pytorch · Jun 17, 2024 · b79b7b6 · b79b7b6
2 parents 3e6c1ee + f609754
commit b79b7b6
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 4,247 deletions.
diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh
@@ -191,7 +191,7 @@ function clone_pytorch_xla() {
 function checkout_install_torchbench() {
   local commit
   commit=$(get_pinned_commit torchbench)
-  git clone https://github.com/pytorch/benchmark torchbench
+  git clone https://github.com/eellison/benchmark torchbench
   pushd torchbench
   git checkout "$commit"
 

diff --git a/.ci/pytorch/perf_test/test_cpu_speed_mini_sequence_labeler.sh b/.ci/pytorch/perf_test/test_cpu_speed_mini_sequence_labeler.sh
@@ -9,7 +9,7 @@ test_cpu_speed_mini_sequence_labeler () {
   export OMP_NUM_THREADS=4
   export MKL_NUM_THREADS=4
 
-  git clone https://github.com/pytorch/benchmark.git
+  git clone https://github.com/eellison/benchmark.git
 
   cd benchmark/
 

diff --git a/.ci/pytorch/perf_test/test_gpu_speed_cudnn_lstm.sh b/.ci/pytorch/perf_test/test_gpu_speed_cudnn_lstm.sh
@@ -9,7 +9,7 @@ test_gpu_speed_cudnn_lstm () {
   export OMP_NUM_THREADS=4
   export MKL_NUM_THREADS=4
 
-  git clone https://github.com/pytorch/benchmark.git
+  git clone https://github.com/eellison/benchmark.git
 
   cd benchmark/
 

diff --git a/.ci/pytorch/perf_test/test_gpu_speed_lstm.sh b/.ci/pytorch/perf_test/test_gpu_speed_lstm.sh
@@ -9,7 +9,7 @@ test_gpu_speed_lstm () {
   export OMP_NUM_THREADS=4
   export MKL_NUM_THREADS=4
 
-  git clone https://github.com/pytorch/benchmark.git
+  git clone https://github.com/eellison/benchmark.git
 
   cd benchmark/
 

diff --git a/.ci/pytorch/perf_test/test_gpu_speed_mlstm.sh b/.ci/pytorch/perf_test/test_gpu_speed_mlstm.sh
@@ -9,7 +9,7 @@ test_gpu_speed_mlstm () {
   export OMP_NUM_THREADS=4
   export MKL_NUM_THREADS=4
 
-  git clone https://github.com/pytorch/benchmark.git
+  git clone https://github.com/eellison/benchmark.git
 
   cd benchmark/
 

diff --git a/.github/ci_commit_pins/torchbench.txt b/.github/ci_commit_pins/torchbench.txt
@@ -1 +1 @@
-d6015d42d9a1834bc7595c4bd6852562fb80b30b
+pin_yolo_dep
diff --git a/.github/pytorch-probot.yml b/.github/pytorch-probot.yml
@@ -26,3 +26,4 @@ retryable_workflows:
 - windows-binary
 labeler_config: labeler.yml
 label_to_label_config: label_to_label.yml
+mergebot: True
diff --git a/.github/workflows/_win-build.yml b/.github/workflows/_win-build.yml
@@ -47,6 +47,9 @@ jobs:
     timeout-minutes: 240
     outputs:
       test-matrix: ${{ steps.filter.outputs.test-matrix }}
+    defaults:
+      run:
+        shell: bash
     steps:
       # Duplicated in win-test because this MUST go before a checkout
       - name: Enable git symlinks on Windows and disable fsmonitor daemon
@@ -89,6 +92,7 @@ jobs:
 
       - name: Parse ref
         id: parse-ref
+        shell: bash
         run: python3 .github/scripts/parse_ref.py
 
       - name: Get workflow job id

diff --git a/.github/workflows/_win-test.yml b/.github/workflows/_win-test.yml
@@ -41,6 +41,9 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.runner }}
     timeout-minutes: ${{ matrix.mem_leak_check == 'mem_leak_check' && 600 || inputs.timeout-minutes }}
+    defaults:
+      run:
+        shell: bash
     steps:
       # Duplicated in win-build because this MUST go before a checkout
       - name: Enable git symlinks on Windows and disable fsmonitor daemon
@@ -224,6 +227,7 @@ jobs:
 
       - name: Parse ref
         id: parse-ref
+        shell: bash
         run: python3 .github/scripts/parse_ref.py
 
       - name: Uninstall PyTorch

diff --git a/aten/src/ATen/MapAllocator.h b/aten/src/ATen/MapAllocator.h
@@ -55,6 +55,10 @@ class TORCH_API MapAllocator {
     return base_ptr_;
   }
 
+  int flags() const {
+    return flags_;
+  }
+
   static MapAllocator* fromDataPtr(const at::DataPtr&);
   static at::DataPtr makeDataPtr(
       c10::string_view filename,

diff --git a/benchmarks/dynamo/Makefile b/benchmarks/dynamo/Makefile
@@ -10,7 +10,7 @@ clone-deps:
 		&& (test -e detectron2 || git clone --recursive https://github.com/facebookresearch/detectron2) \
 		&& (test -e FBGEMM || git clone --recursive https://github.com/pytorch/FBGEMM) \
 		&& (test -e torchrec || git clone --recursive https://github.com/pytorch/torchrec) \
-		&& (test -e torchbenchmark || git clone --recursive https://github.com/pytorch/benchmark torchbenchmark) \
+		&& (test -e torchbenchmark || git clone --recursive https://github.com/eellison/benchmark torchbenchmark) \
 	)
 
 pull-deps: clone-deps

diff --git a/benchmarks/dynamo/ci_expected_accuracy/cpu_inductor_torchbench_freezing_inference.csv b/benchmarks/dynamo/ci_expected_accuracy/cpu_inductor_torchbench_freezing_inference.csv
@@ -10,7 +10,7 @@ Background_Matting,pass_due_to_skip,0
 
 
 
-DALLE2_pytorch,eager_fail_to_run,0
+DALLE2_pytorch,model_fail_to_load,0
 
 
 

diff --git a/benchmarks/dynamo/ci_expected_accuracy/cpu_inductor_torchbench_inference.csv b/benchmarks/dynamo/ci_expected_accuracy/cpu_inductor_torchbench_inference.csv
@@ -10,7 +10,7 @@ Background_Matting,pass_due_to_skip,0
 
 
 
-DALLE2_pytorch,eager_fail_to_run,0
+DALLE2_pytorch,model_fail_to_load,0
 
 
 

diff --git a/benchmarks/dynamo/ci_expected_accuracy/dynamic_cpu_inductor_torchbench_inference.csv b/benchmarks/dynamo/ci_expected_accuracy/dynamic_cpu_inductor_torchbench_inference.csv
@@ -10,7 +10,7 @@ Background_Matting,pass_due_to_skip,0
 
 
 
-DALLE2_pytorch,eager_fail_to_run,0
+DALLE2_pytorch,model_fail_to_load,0
 
 
 

diff --git a/test/onnx/debug_embed_params.py b/test/onnx/debug_embed_params.py
diff --git a/test/onnx/pytorch_helper.py b/test/onnx/pytorch_helper.py
diff --git a/test/onnx_caffe2/export_onnx_tests_filter.py b/test/onnx_caffe2/export_onnx_tests_filter.py