Update on "Ensure that deleter is called even for a no-data tensor."

Summary:

When using a custom deleter InefficientStdFunctionContext was using a
std::unique_ptr<> to store the pointer and call the deleter - but this failed to
call the deleter if the pointer was null. Since we have a separate holder class
anyway take out the std::unique_ptr<> and call the deleter directly.

Fixes #117273

Test Plan:

[ghstack-poisoned]

Author: aorenste

.ci/docker/ci_commit_pins/executorch.txt

@@ -1 +1 @@
-663882fe7dc518c04adf3d2ee5ccb7d99f41ade4
+2d39c223f23fbd6cc063e06f3374cb107e229a31

.ci/docker/common/install_executorch.sh

@@ -48,7 +48,6 @@ setup_executorch() {
 
   install_flatc_from_source
   pip_install .
-  build_executorch_runner "cmake"
 
   # Make sure that all the newly generate files are owned by Jenkins
   chown -R jenkins .

.ci/pytorch/test.sh

@@ -278,18 +278,13 @@ test_dynamo_shard() {
       test_autograd \
       test_jit \
       test_quantization \
-      test_public_bindings \
       test_dataloader \
       test_reductions \
-      test_namedtensor \
       profiler/test_profiler \
       profiler/test_profiler_tree \
       test_python_dispatch \
       test_fx \
-      test_package \
-      test_legacy_vmap \
       test_custom_ops \
-      test_content_store \
       export/test_db \
       functorch/test_dims \
       functorch/test_aotdispatch \
@@ -690,9 +685,8 @@ test_xpu_bin(){
   TEST_REPORTS_DIR=$(pwd)/test/test-reports
   mkdir -p "$TEST_REPORTS_DIR"
 
-  for xpu_case in "${BUILD_BIN_DIR}"/*{xpu,sycl}*
-  do
-    if [[ "$xpu_case" != *"*"* ]]; then
+  for xpu_case in "${BUILD_BIN_DIR}"/*{xpu,sycl}*; do
+    if [[ "$xpu_case" != *"*"* && "$xpu_case" != *.so && "$xpu_case" != *.a ]]; then
       case_name=$(basename "$xpu_case")
       echo "Testing ${case_name} ..."
       "$xpu_case" --gtest_output=xml:"$TEST_REPORTS_DIR"/"$case_name".xml
@@ -1035,14 +1029,17 @@ test_docs_test() {
 }
 
 test_executorch() {
+  echo "Install torchvision and torchaudio"
+  install_torchvision
+  install_torchaudio
+
   pushd /executorch
 
-  echo "Install torchvision and torchaudio"
-  # TODO(huydhn): Switch this to the pinned commits on ExecuTorch once they are
-  # there.  These libraries need to be built here, and not part of the Docker
-  # image because they require the target version of torch to be installed first
-  pip_install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git"
-  pip_install --no-use-pep517 --user "git+https://github.com/pytorch/vision.git"
+  # NB: We need to build ExecuTorch runner here and not inside the Docker image
+  # because it depends on PyTorch
+  # shellcheck disable=SC1091
+  source .ci/scripts/utils.sh
+  build_executorch_runner "cmake"
 
   echo "Run ExecuTorch regression tests for some models"
   # NB: This is a sample model, more can be added here

.github/actions/setup-rocm/action.yml

@@ -9,6 +9,16 @@ runs:
       shell: bash
       run: echo "DOCKER_HOST=unix:///run/user/$(id -u)/docker.sock" >> "${GITHUB_ENV}"
 
+    - name: Remove leftover Docker config file
+      shell: bash
+      continue-on-error: true
+      run: |
+        set -ex
+
+        cat ~/.docker/config.json || true
+        # https://stackoverflow.com/questions/64455468/error-when-logging-into-ecr-with-docker-login-error-saving-credentials-not
+        rm -f ~/.docker/config.json
+
     - name: Stop all running docker containers
       if: always()
       shell: bash

.github/actions/update-commit-hash/action.yml

@@ -1 +1 @@
-e3efbc2d9094685dd2d4ae143853941f82f167af
+b2d9c3e315405f2b5cfdfa5b93f849d5b27a4109

.github/ci_commit_pins/audio.txt

@@ -1 +1 @@
-d23430765b5df76cd1267f438f129f51b7d6e3e1
+a00a72b1ee41483407717379fb5cafe992de2f82

.github/ci_commit_pins/vision.txt

@@ -1 +1 @@
-e1c94dfa5a74331a376537c23bf74a2c367f24bd
+27ae6dc955734b223e2b93e1c5bbcd681b0537fd

.github/ci_commit_pins/xla.txt

@@ -275,17 +275,20 @@
   - wanchaol
   - fduwjj
   - H-Huang
-  - aazzolini
   - kwen2501
   - XilunWu
   - wz337
   - awgu
   - fegin
-  - kumpera
-  - yhcharles
+  - kurman
+  - LucasLLC
+  - sanketpurandare
+  - shuqiangzhang
+  - tianyu-l
   - kiukchung
   - d4l3k
   - shuqiangzhang
+  - weifengpy
   mandatory_checks_name:
   - EasyCLA
   - Lint

.github/merge_rules.yaml

@@ -7,6 +7,7 @@
 name: !{{ build_environment }}
 {%- endblock %}
 
+
 on:
   push:
     {%- if branches == "nightly" %}

.github/scripts/update_commit_hashes.py

@@ -53,6 +53,9 @@
 {%- macro upload_binaries(config, is_windows=False, has_test=True, use_s3=True) -%}
 !{{ config["build_name"] }}-upload:  # Uploading
     if: ${{ github.repository_owner == 'pytorch' }}
+    permissions:
+      id-token: write
+      contents: read
 {%- if has_test %}
     needs: !{{ config["build_name"] }}-test
 {%- else %}
@@ -65,8 +68,6 @@
       {%- endif %}
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
-      aws-pytorch-uploader-access-key-id: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
-      aws-pytorch-uploader-secret-access-key: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}
       conda-pytorchbot-token: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
       conda-pytorchbot-token-test: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}
     uses: ./.github/workflows/_binary-upload.yml