diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml index 94ce5d451b..f1b14bc25c 100644 --- a/.github/actions/setup-binary-builds/action.yml +++ b/.github/actions/setup-binary-builds/action.yml @@ -89,7 +89,7 @@ runs: uses: conda-incubator/setup-miniconda@v3.1.1 with: miniconda-version: "latest" - python-version: 3.9 + python-version: 3.12 - name: Clean conda environment shell: bash -l {0} run: | diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index 720542cef4..8be250e7f0 100644 --- a/.github/workflows/build_wheels_macos.yml +++ b/.github/workflows/build_wheels_macos.yml @@ -146,16 +146,22 @@ jobs: cat "${{ inputs.env-var-script }}" >> "${BUILD_ENV_FILE}" - name: Install delocate-wheel if: ${{ inputs.delocate-wheel }} + shell: bash -l {0} run: | set -euxo pipefail + conda info + conda deactivate + conda activate test + conda info ${CONDA_RUN} python3 -m pip install delocate==0.10.7 - name: Install torch dependency + shell: bash -l {0} run: | set -euxo pipefail # shellcheck disable=SC1090 source "${BUILD_ENV_FILE}" # shellcheck disable=SC2086 - ${CONDA_RUN} ${PIP_INSTALL_TORCH} + ${CONDA_RUN} ${PIP_INSTALL_TORCH} - name: Run Pre-Script with Caching if: ${{ inputs.pre-script != '' }} uses: ./test-infra/.github/actions/run-script-with-cache @@ -166,11 +172,14 @@ jobs: script: ${{ inputs.pre-script }} - name: Build clean working-directory: ${{ inputs.repository }} + shell: bash -l {0} run: | set -euxo pipefail # shellcheck disable=SC1090 source "${BUILD_ENV_FILE}" - ${CONDA_RUN} python3 setup.py clean + ${CONDA_RUN} which python3 + ${CONDA_RUN} conda list + ${CONDA_RUN} python setup.py clean - name: Build the wheel (python-build-package) if: ${{ inputs.build-platform == 'python-build-package' }} working-directory: ${{ inputs.repository }} @@ -193,6 +202,7 @@ jobs: - name: Build the wheel (setup-py) if: ${{ inputs.build-platform == 'setup-py' }} working-directory: ${{ inputs.repository }} + shell: bash -l {0} run: | set -euxo pipefail # shellcheck disable=SC1090 @@ -203,11 +213,13 @@ jobs: fi PYTORCH_VERSION="$(${CONDA_RUN} pip show torch | grep ^Version: | sed 's/Version: *//')" export PYTORCH_VERSION - + + ${CONDA_RUN} python3 -c "import torch" ${CONDA_RUN} python3 setup.py bdist_wheel - name: Delocate wheel if: ${{ inputs.delocate-wheel }} working-directory: ${{ inputs.repository }} + shell: bash -l {0} run: | set -euxo pipefail ${CONDA_RUN} DYLD_FALLBACK_LIBRARY_PATH="${CONDA_ENV}/lib" delocate-wheel -v --ignore-missing-dependencies dist/*.whl diff --git a/.github/workflows/test_build_wheels_m1.yml b/.github/workflows/test_build_wheels_m1.yml index 9bc3cc8f83..05bb14fb74 100644 --- a/.github/workflows/test_build_wheels_m1.yml +++ b/.github/workflows/test_build_wheels_m1.yml @@ -28,10 +28,6 @@ jobs: fail-fast: false matrix: include: - - repository: pytorch/audio - conda-package-directory: packaging/torchaudio - smoke-test-script: test/smoke_test/smoke_test.py - package-name: torchaudio - repository: pytorch/vision pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh