From beed393cb98c0064caf5f02987ea5b294bd1b64e Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Wed, 1 Mar 2023 22:37:34 +0100
Subject: [PATCH 01/21] add macOS unittest to GHA

---
 .github/workflows/test-m1.yml    | 50 --------------------------------
 .github/workflows/test-macos.yml | 35 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/test-m1.yml
 create mode 100644 .github/workflows/test-macos.yml

diff --git a/.github/workflows/test-m1.yml b/.github/workflows/test-m1.yml
deleted file mode 100644
index c03fa9f76e4..00000000000
--- a/.github/workflows/test-m1.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Unit-tests on M1
-on:
-  pull_request:
-  push:
-    branches:
-      - nightly
-      - main
-      - release/*
-  workflow_dispatch:
-env:
-  CHANNEL: "nightly"
-jobs:
-  tests:
-    name: "Unit-tests on M1"
-    runs-on: macos-m1-12
-    strategy:
-      matrix:
-        py_vers: [ "3.8"]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Set Release CHANNEL (for release)
-        if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'refs/heads/release') }}
-        run: |
-          echo "CHANNEL=test" >> "$GITHUB_ENV"
-      - name: Install TorchVision
-        shell: arch -arch arm64 bash {0}
-        env:
-          ENV_NAME: conda-env-${{ github.run_id }}
-          PY_VERS: ${{ matrix.py_vers }}
-        run: |
-          . ~/miniconda3/etc/profile.d/conda.sh
-          # Needed for JPEG library detection as setup.py detects conda presence by running `shutil.which('conda')`
-          export PATH=~/miniconda3/bin:$PATH
-          set -ex
-          conda create -yp ${ENV_NAME} python=${PY_VERS} numpy libpng jpeg scipy
-          conda run -p ${ENV_NAME} python3 -mpip install --pre torch --extra-index-url=https://download.pytorch.org/whl/${CHANNEL}
-          conda run -p ${ENV_NAME} python3 setup.py develop
-          conda run -p ${ENV_NAME} python3 -mpip install pytest pytest-mock 'av<10'
-      - name: Run tests
-        shell: arch -arch arm64 bash {0}
-        env:
-          ENV_NAME: conda-env-${{ github.run_id }}
-          PY_VERS: ${{ matrix.py_vers }}
-        run: |
-          . ~/miniconda3/etc/profile.d/conda.sh
-          set -ex
-          conda run -p ${ENV_NAME} --no-capture-output python3 -u -mpytest -v --tb=long --durations 20
-          conda env remove -p ${ENV_NAME}
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
new file mode 100644
index 00000000000..7b3280c6189
--- /dev/null
+++ b/.github/workflows/test-macos.yml
@@ -0,0 +1,35 @@
+name: Unit-tests on macOS
+
+on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+  workflow_dispatch:
+
+jobs:
+  tests:
+    strategy:
+      matrix:
+        python-version:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+        runner: ["macos-12"]
+        include:
+          - python-version: "3.8"
+            runner: macos-m1-12
+      fail-fast: false
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml
+    with:
+      repository: pytorch/vision
+      timeout: 120
+      runner: ${{ matrix.runner }}
+      script: |
+        export PYTHON_VERSION=${{ matrix.python-version }}
+        export GPU_ARCH_TYPE=cpu
+
+        ./.github/unittest.sh

From cdb2697808e9a1a1d521bc51d7369ee73d5937a8 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Wed, 1 Mar 2023 23:00:04 +0100
Subject: [PATCH 02/21] trigger CI


From 3b89814b54ba210162797b404db577a633b0b082 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Wed, 1 Mar 2023 23:03:09 +0100
Subject: [PATCH 03/21] fix version

---
 .github/workflows/test-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 7b3280c6189..f4320711e01 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -23,7 +23,7 @@ jobs:
           - python-version: "3.8"
             runner: macos-m1-12
       fail-fast: false
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       repository: pytorch/vision
       timeout: 120

From 773412d141689baa4c7616a075d5b271cc7f71bf Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 09:48:49 +0100
Subject: [PATCH 04/21] increase timeout

---
 .github/workflows/test-macos.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index f4320711e01..ce4d8cb1fe3 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -26,7 +26,9 @@ jobs:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       repository: pytorch/vision
-      timeout: 120
+      # We need an increased timeout here, since the macos-12 runner is the free one from GH
+      # and needs roughly 2 hours to just run the test suite
+      timeout: 240
       runner: ${{ matrix.runner }}
       script: |
         export PYTHON_VERSION=${{ matrix.python-version }}

From 5da3f42262a4c6547d74e046e60adf4dc9be9b54 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 10:00:23 +0100
Subject: [PATCH 05/21] add debug workflow

---
 .github/workflows/debug-macos-jpeg.yml | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/debug-macos-jpeg.yml

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
new file mode 100644
index 00000000000..91ac99cf48c
--- /dev/null
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -0,0 +1,33 @@
+on:
+  pull_request:
+
+jobs:
+  debug:
+
+    runs-on: macos-12
+
+    defaults:
+      run:
+        shell: bash -el {0}
+
+    steps:
+      - name: Set up miniconda
+        uses: conda-incubator/setup-miniconda@v2
+
+      - name: Create build environment
+        run: |
+          conda --quiet install python=3.10 pip libpng jpeg ffmpeg=4.2 ninja
+          pip install --progress-bar=off --upgrade setuptools light-the-torch
+          ltt install --progress-bar=off --pytorch-channel=nightly torch
+          python -m torch.utils.collect_env
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: build torchvision
+        run: python setup.py develop
+
+      - name: Test
+        run: |
+          pip install --progress-bar=off pytest pytest-mock
+          pytest -v test/test_image.py -k jpeg

From 19402efcc6c1dba2a2d83a78d63f2381221035fc Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 10:03:16 +0100
Subject: [PATCH 06/21] fix install command

---
 .github/workflows/debug-macos-jpeg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index 91ac99cf48c..66ab8bc1203 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -16,7 +16,7 @@ jobs:
 
       - name: Create build environment
         run: |
-          conda --quiet install python=3.10 pip libpng jpeg ffmpeg=4.2 ninja
+          conda install --quiet python=3.10 pip libpng jpeg ffmpeg=4.2 ninja
           pip install --progress-bar=off --upgrade setuptools light-the-torch
           ltt install --progress-bar=off --pytorch-channel=nightly torch
           python -m torch.utils.collect_env

From 5e2253d1fa453218160ab14b4e0ba57d1b353436 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 10:12:29 +0100
Subject: [PATCH 07/21] add tmate session

---
 .github/workflows/debug-macos-jpeg.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index 66ab8bc1203..8f0a60edb62 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -31,3 +31,6 @@ jobs:
         run: |
           pip install --progress-bar=off pytest pytest-mock
           pytest -v test/test_image.py -k jpeg
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3

From 5fb92ff202a4a4a47d01b3cfb93804154ded5e6d Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 10:47:16 +0100
Subject: [PATCH 08/21] always setup tmate

---
 .github/workflows/debug-macos-jpeg.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index 8f0a60edb62..eab3e1b614d 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -33,4 +33,5 @@ jobs:
           pytest -v test/test_image.py -k jpeg
 
       - name: Setup tmate session
+        if: always()
         uses: mxschmitt/action-tmate@v3

From 03ba33bb7573e29f60d5ad1ff28795557580c04d Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 14:25:19 +0100
Subject: [PATCH 09/21] add jpeg debug and delocate

---
 .github/workflows/debug-macos-jpeg.yml | 11 ++++++++++-
 setup.py                               |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index eab3e1b614d..2811190094e 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -25,7 +25,16 @@ jobs:
         uses: actions/checkout@v2
 
       - name: build torchvision
-        run: python setup.py develop
+        run: |
+          python setup.py develop
+          python setup.py bdist_wheel
+
+      - name: delocate
+        run: |
+          pip install --progress-bar=off delocate
+          export DYLD_FALLBACK_LIBRARY_PATH="${CONDA_PREFIX}/lib"
+          delocate-path --ignore-missing-dependencies torchvision
+          delocate-wheel -v --ignore-missing-dependencies dist/*.whl
 
       - name: Test
         run: |
diff --git a/setup.py b/setup.py
index 24b7a2edb94..059c4f424fa 100644
--- a/setup.py
+++ b/setup.py
@@ -298,6 +298,8 @@ def get_extensions():
     use_jpeg = use_jpeg and jpeg_found
     if use_jpeg:
         print("Building torchvision with JPEG image support")
+        print(f"  libpng include path: {jpeg_include}")
+        print(f"  libpng lib path: {jpeg_lib}")
         image_link_flags.append("jpeg")
         if jpeg_conda:
             image_library += [jpeg_lib]

From 6a10cc62eb1a444e379c2dde2f776bacbf86af03 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 15:27:06 +0100
Subject: [PATCH 10/21] try regular wheel build with libjpeg and libpng from
 conda

---
 .github/workflows/build-wheels-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index 6c5ebc0fc37..b9193a38f70 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -33,7 +33,7 @@ jobs:
             smoke-test-script: test/smoke_test.py
             package-name: torchvision
     name: ${{ matrix.repository }}
-    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
+    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@conda-png-jpeg
     with:
       repository: ${{ matrix.repository }}
       ref: ""

From 89259696e04b32fd06e69ab7d77f5af727b6c6e3 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 17:11:23 +0100
Subject: [PATCH 11/21] trigger CI


From 94db606dc20b2d613a7a858e03d3ac24110fbc90 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 17:30:23 +0100
Subject: [PATCH 12/21] fix test infra ref

---
 .github/workflows/build-wheels-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index b9193a38f70..cc27af89e6f 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -38,7 +38,7 @@ jobs:
       repository: ${{ matrix.repository }}
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: conda-png-jpeg
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}

From 8b8bc87fcaffec63b80e812bee7a371def47f3fb Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 17:39:24 +0100
Subject: [PATCH 13/21] trigger CI


From 90210c17474f52d5c4809b78bd848c6712d8f04f Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Thu, 2 Mar 2023 20:42:05 +0100
Subject: [PATCH 14/21] try uninstalling system jpeg libs on macos

---
 .github/unittest.sh                    | 21 +++++++++++++++++++++
 .github/workflows/debug-macos-jpeg.yml |  8 ++++++++
 2 files changed, 29 insertions(+)

diff --git a/.github/unittest.sh b/.github/unittest.sh
index 0109a5cc2b1..624dcc90f6a 100755
--- a/.github/unittest.sh
+++ b/.github/unittest.sh
@@ -7,6 +7,27 @@ CONDA_PATH=$(which conda)
 eval "$(${CONDA_PATH} shell.bash hook)"
 conda config --set channel_priority strict
 
+case $(uname) in
+  Linux)
+    OS_TYPE=linux
+    ;;
+  Darwin)
+    OS_TYPE=macos
+    ;;
+  *)
+    echo "Unknown OS type:" $(uname)
+    exit 1
+    ;;
+esac
+
+if [[ "${OS_TYPE}" != "macos" ]]; then
+  JPEG_LIBS=$(brew list | grep jpeg)
+  echo $JPEG_LIBS
+  for lib in $JPEG_LIBS; do
+    brew uninstall --ignore-dependencies --force $lib || true
+  done
+fi
+
 echo '::group::Set PyTorch conda channel and wheel index'
 # TODO: Can we maybe have this as environment variable in the job template? For example, `IS_RELEASE`.
 if [[ (${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index 2811190094e..e2c481907c5 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -14,6 +14,14 @@ jobs:
       - name: Set up miniconda
         uses: conda-incubator/setup-miniconda@v2
 
+      - name: Uninstall system libs
+        run: |
+          JPEG_LIBS=$(brew list | grep jpeg)
+          echo $JPEG_LIBS
+          for lib in $JPEG_LIBS; do
+            brew uninstall --ignore-dependencies --force $lib || true
+          done
+
       - name: Create build environment
         run: |
           conda install --quiet python=3.10 pip libpng jpeg ffmpeg=4.2 ninja

From 893df7bb3c2f1cbc84d11e5d4badef18fdf88466 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 09:24:12 +0100
Subject: [PATCH 15/21] fix conditional

---
 .github/unittest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/unittest.sh b/.github/unittest.sh
index 624dcc90f6a..7135fff6843 100755
--- a/.github/unittest.sh
+++ b/.github/unittest.sh
@@ -20,7 +20,7 @@ case $(uname) in
     ;;
 esac
 
-if [[ "${OS_TYPE}" != "macos" ]]; then
+if [[ "${OS_TYPE}" == "macos" ]]; then
   JPEG_LIBS=$(brew list | grep jpeg)
   echo $JPEG_LIBS
   for lib in $JPEG_LIBS; do

From f76c795b65269da352d0fb5892564081145448be Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 09:25:14 +0100
Subject: [PATCH 16/21] try without delocate

---
 .github/workflows/debug-macos-jpeg.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
index e2c481907c5..654ee2822f8 100644
--- a/.github/workflows/debug-macos-jpeg.yml
+++ b/.github/workflows/debug-macos-jpeg.yml
@@ -33,22 +33,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: build torchvision
-        run: |
-          python setup.py develop
-          python setup.py bdist_wheel
-
-      - name: delocate
-        run: |
-          pip install --progress-bar=off delocate
-          export DYLD_FALLBACK_LIBRARY_PATH="${CONDA_PREFIX}/lib"
-          delocate-path --ignore-missing-dependencies torchvision
-          delocate-wheel -v --ignore-missing-dependencies dist/*.whl
+        run: python setup.py develop
 
       - name: Test
         run: |
           pip install --progress-bar=off pytest pytest-mock
           pytest -v test/test_image.py -k jpeg
-
-      - name: Setup tmate session
-        if: always()
-        uses: mxschmitt/action-tmate@v3
+          python test/smoke_test.py

From da828de7112d517943252bf75ce8fac61312ef41 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 09:26:58 +0100
Subject: [PATCH 17/21] revert changes on build workflow

---
 .github/workflows/build-wheels-macos.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index cc27af89e6f..6c5ebc0fc37 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -33,12 +33,12 @@ jobs:
             smoke-test-script: test/smoke_test.py
             package-name: torchvision
     name: ${{ matrix.repository }}
-    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@conda-png-jpeg
+    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
     with:
       repository: ${{ matrix.repository }}
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: conda-png-jpeg
+      test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}

From c46fb06800ade6cf0f177f0410a7f6b488f07868 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 15:38:10 +0100
Subject: [PATCH 18/21] add debug for M1

---
 .github/unittest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/unittest.sh b/.github/unittest.sh
index 7135fff6843..14e2f9001a7 100755
--- a/.github/unittest.sh
+++ b/.github/unittest.sh
@@ -21,6 +21,7 @@ case $(uname) in
 esac
 
 if [[ "${OS_TYPE}" == "macos" ]]; then
+  uname -a
   JPEG_LIBS=$(brew list | grep jpeg)
   echo $JPEG_LIBS
   for lib in $JPEG_LIBS; do

From 140f3835be2c14b02ab37e2ed8ce82a197342e30 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 15:52:49 +0100
Subject: [PATCH 19/21] only uninstall jpeg libs on x86 macos runners

---
 .github/unittest.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/unittest.sh b/.github/unittest.sh
index 14e2f9001a7..1abae39538b 100755
--- a/.github/unittest.sh
+++ b/.github/unittest.sh
@@ -7,6 +7,7 @@ CONDA_PATH=$(which conda)
 eval "$(${CONDA_PATH} shell.bash hook)"
 conda config --set channel_priority strict
 
+# Setup the OS_TYPE environment variable that should be used for conditions involving the OS below.
 case $(uname) in
   Linux)
     OS_TYPE=linux
@@ -20,8 +21,9 @@ case $(uname) in
     ;;
 esac
 
-if [[ "${OS_TYPE}" == "macos" ]]; then
-  uname -a
+# The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG libraries installed by default
+# that interfere with our build. We uninstall them here and use the one from conda below.
+if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
   JPEG_LIBS=$(brew list | grep jpeg)
   echo $JPEG_LIBS
   for lib in $JPEG_LIBS; do

From b2651171132818a3721ebfbcd960f0cdbacdc4b1 Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Fri, 3 Mar 2023 16:01:19 +0100
Subject: [PATCH 20/21] remove debug workflow

---
 .github/workflows/debug-macos-jpeg.yml | 42 --------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 .github/workflows/debug-macos-jpeg.yml

diff --git a/.github/workflows/debug-macos-jpeg.yml b/.github/workflows/debug-macos-jpeg.yml
deleted file mode 100644
index 654ee2822f8..00000000000
--- a/.github/workflows/debug-macos-jpeg.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-on:
-  pull_request:
-
-jobs:
-  debug:
-
-    runs-on: macos-12
-
-    defaults:
-      run:
-        shell: bash -el {0}
-
-    steps:
-      - name: Set up miniconda
-        uses: conda-incubator/setup-miniconda@v2
-
-      - name: Uninstall system libs
-        run: |
-          JPEG_LIBS=$(brew list | grep jpeg)
-          echo $JPEG_LIBS
-          for lib in $JPEG_LIBS; do
-            brew uninstall --ignore-dependencies --force $lib || true
-          done
-
-      - name: Create build environment
-        run: |
-          conda install --quiet python=3.10 pip libpng jpeg ffmpeg=4.2 ninja
-          pip install --progress-bar=off --upgrade setuptools light-the-torch
-          ltt install --progress-bar=off --pytorch-channel=nightly torch
-          python -m torch.utils.collect_env
-
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: build torchvision
-        run: python setup.py develop
-
-      - name: Test
-        run: |
-          pip install --progress-bar=off pytest pytest-mock
-          pytest -v test/test_image.py -k jpeg
-          python test/smoke_test.py

From 4145d70fc017b1a7e8aa156642716adc26c9931e Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Mon, 6 Mar 2023 09:24:40 +0100
Subject: [PATCH 21/21] wrap uninstalling into a group

---
 .github/unittest.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/unittest.sh b/.github/unittest.sh
index 1abae39538b..0cfb138b444 100755
--- a/.github/unittest.sh
+++ b/.github/unittest.sh
@@ -21,6 +21,7 @@ case $(uname) in
     ;;
 esac
 
+echo '::group::Uninstall system JPEG libraries on macOS'
 # The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG libraries installed by default
 # that interfere with our build. We uninstall them here and use the one from conda below.
 if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
@@ -30,6 +31,7 @@ if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
     brew uninstall --ignore-dependencies --force $lib || true
   done
 fi
+echo '::endgroup::'
 
 echo '::group::Set PyTorch conda channel and wheel index'
 # TODO: Can we maybe have this as environment variable in the job template? For example, `IS_RELEASE`.