Clean up FFMPEG env var and remove pre/post build script (#3466)

Summary:
Now that we do not build FFmpeg as part of CI build process, we can remove the pre/post build scripts.

Needs to land after https://github.com/pytorch/test-infra/pull/4358

Pull Request resolved: https://github.com/pytorch/audio/pull/3466

Reviewed By: atalman

Differential Revision: D47367022

Pulled By: mthrok

fbshipit-source-id: 17aafff74ee7d269236cffb8a88c803a8d4c44b7

.github/workflows/build-conda-m1.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: macos-m1-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             conda-package-directory: packaging/torchaudio
             smoke-test-script: test/smoke_test/smoke_test.py
             package-name: torchaudio
@@ -48,13 +44,9 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       runner-type: macos-m1-12
       package-name: ${{ matrix.package-name }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}

.github/workflows/build-conda-windows.yml

@@ -28,10 +28,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: windows-ffmpeg
-            pre-script: packaging/ffmpeg/build.bat
-            post-script: ""
             smoke-test-script: test/smoke_test/smoke_test.py
             conda-package-directory: packaging/torchaudio
             package-name: torchaudio
@@ -44,12 +40,8 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}

.github/workflows/build-wheels-m1.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: macos-m1-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             smoke-test-script: test/smoke_test/smoke_test_no_ffmpeg.py
             package-name: torchaudio
     name: ${{ matrix.repository }}
@@ -46,14 +42,10 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       runner-type: macos-m1-12
       package-name: ${{ matrix.package-name }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       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 }}

.github/workflows/build_conda_linux.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: linux-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             smoke-test-script: test/smoke_test/smoke_test.py
             conda-package-directory: packaging/torchaudio
             package-name: torchaudio
@@ -48,12 +44,8 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}

.github/workflows/build_conda_macos.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: macos-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             conda-package-directory: packaging/torchaudio
             smoke-test-script: test/smoke_test/smoke_test.py
             package-name: torchaudio
@@ -48,13 +44,9 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       runner-type: macos-12
       package-name: ${{ matrix.package-name }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}

.github/workflows/build_wheels_linux.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: linux-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             smoke-test-script: test/smoke_test/smoke_test_no_ffmpeg.py
             package-name: torchaudio
     name: ${{ matrix.repository }}
@@ -46,8 +42,6 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       package-name: ${{ matrix.package-name }}
       trigger-event: ${{ github.event_name }}

.github/workflows/build_wheels_macos.yml

@@ -32,10 +32,6 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            cache-path: /third_party/ffmpeg
-            cache-key: macos-ffmpeg
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
             smoke-test-script: test/smoke_test/smoke_test_no_ffmpeg.py
             package-name: torchaudio
     name: ${{ matrix.repository }}
@@ -46,14 +42,10 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      post-script: ${{ matrix.post-script }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       runner-type: macos-12
       package-name: ${{ matrix.package-name }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       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 }}

.github/workflows/build_wheels_windows.yml

@@ -28,12 +28,8 @@ jobs:
       matrix:
         include:
           - repository: pytorch/audio
-            pre-script: packaging/ffmpeg/build.bat
             env-script: packaging/vc_env_helper.bat
-            cache-path: /third_party/ffmpeg
-            cache-key: windows-ffmpeg
             wheel-build-params: "--plat-name win_amd64"
-            post-script: ""
             smoke-test-script: test/smoke_test/smoke_test_no_ffmpeg.py
             package-name: torchaudio
     name: ${{ matrix.repository }}
@@ -44,14 +40,10 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
       env-script: ${{ matrix.env-script }}
-      post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
       trigger-event: ${{ github.event_name }}
-      cache-path: ${{ matrix.cache-path }}
-      cache-key: ${{ matrix.cache-key }}
     secrets:
       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 }}

packaging/post_build_script.sh

-#!/bin/bash
-set -ex
-
-echo "Running post build script..."

packaging/pre_build_script.sh

-#!/bin/bash
-set -ex
-
-echo "Running pre build script..."
-export FFMPEG_ROOT=${PWD}/third_party/ffmpeg
-if [[ ! -d ${FFMPEG_ROOT} ]]; then
-    packaging/ffmpeg/build.sh
-fi
-echo FFMPEG_ROOT=${FFMPEG_ROOT}

packaging/torchaudio/meta.yaml

@@ -46,7 +46,6 @@ build:
     - TORCH_CUDA_ARCH_LIST
     - USE_FFMPEG
     - USE_OPENMP
-    - FFMPEG_ROOT
     - MACOSX_DEPLOYMENT_TARGET
 
 test: