Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE] Remove MacOS x86 artifacts from the code #5780

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions .github/workflows/test_build_conda_macos.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/test_build_wheels_macos.yml

This file was deleted.

38 changes: 4 additions & 34 deletions .github/workflows/test_macos_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,25 @@ on:
workflow_dispatch:

jobs:
test-x86:
uses: ./.github/workflows/macos_job.yml
with:
job-name: "macos-x86-64-py3.8"
runner: macos-12
test-infra-repository: ${{ github.repository }}
test-infra-ref: ${{ github.ref }}
script: |
conda create --yes --quiet -n test python=3.8
conda activate test
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
# Can import pytorch
python3 -c 'import torch'
test-m1:
uses: ./.github/workflows/macos_job.yml
with:
job-name: "macos-arm64-py3.8"
job-name: "macos-arm64-py3.10"
runner: macos-m1-stable
test-infra-repository: ${{ github.repository }}
test-infra-ref: ${{ github.ref }}
submodules: ${{ 'true' }}
timeout: 60
script: |
conda create --yes --quiet -n test python=3.8
conda create --yes --quiet -n test python=3.10
conda activate test
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
# Can import pytorch, cuda is available
python3 -c 'import torch'
test-x86-with-repo:
uses: ./.github/workflows/macos_job.yml
with:
job-name: "macos-x86-64-py3.8"
runner: macos-12
test-infra-repository: ${{ github.repository }}
test-infra-ref: ${{ github.ref }}
repository: pytorch/vision
ref: main
script: |
conda create --yes --quiet -n test python=3.8
conda activate test
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
# Can import pytorch
python3 -c 'import torch'
test-m1-with-repo:
uses: ./.github/workflows/macos_job.yml
with:
job-name: "macos-arm64-py3.8"
job-name: "macos-arm64-py3.10"
runner: macos-m1-stable
test-infra-repository: ${{ github.repository }}
test-infra-ref: ${{ github.ref }}
Expand All @@ -64,7 +36,7 @@ jobs:
ref: main
timeout: 60
script: |
conda create --yes --quiet -n test python=3.8
conda create --yes --quiet -n test python=3.10
conda activate test
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
# Can import pytorch, cuda is available
Expand Down Expand Up @@ -105,7 +77,6 @@ jobs:
matrix:
include:
- runner: macos-m1-stable
- runner: macos-13-xlarge
fail-fast: false
with:
job-name: "test-secrets-no-filter-var"
Expand All @@ -121,7 +92,6 @@ jobs:
matrix:
include:
- runner: macos-m1-stable
- runner: macos-13-xlarge
fail-fast: false
with:
job-name: "test-secrets-filter-var"
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/validate-domain-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@ jobs:
os: windows
channel: ${{ inputs.channel }}
with-cuda: ${{ inputs.with_cuda }}
generate-macos-matrix:
if: (inputs.os == 'macos' || inputs.os == 'all')
uses: ./.github/workflows/generate_binary_build_matrix.yml
with:
package-type: ${{ inputs.package_type }}
os: macos
channel: ${{ inputs.channel }}
with-cuda: ${{ inputs.with_cuda }}
generate-macos-arm64-matrix:
if: (inputs.os == 'macos-arm64' || inputs.os == 'all')
uses: ./.github/workflows/generate_binary_build_matrix.yml
Expand Down Expand Up @@ -136,30 +128,6 @@ jobs:
source "${GITHUB_WORKSPACE}/test-infra/.github/scripts/install_torch.sh"
fi
eval $SMOKE_TEST
validate-macos:
if: (inputs.os == 'macos' || inputs.os == 'all')
needs: generate-macos-matrix
strategy:
matrix: ${{ fromJson(needs.generate-macos-matrix.outputs.matrix) }}
fail-fast: false
uses: ./.github/workflows/macos_job.yml
name: "macos-${{ matrix.package_type }}-${{ matrix.python_version }}-${{ matrix.desired_cuda }}"
with:
runner: ${{ matrix.validation_runner }}
repository: ${{ inputs.repository }}
ref: ${{ inputs.ref || github.ref }}
job-name: "macos-${{ matrix.package_type }}-${{ matrix.python_version }}-${{ matrix.desired_cuda }}"
binary-matrix: ${{ toJSON(matrix) }}
script: |
set -ex
export ENV_NAME="conda-env-${{ github.run_id }}"
export TARGET_OS="macos"
export SMOKE_TEST="${{ inputs.smoke_test }}"
export RELEASE_VERSION=${{ inputs.version }}
if [[ ${{inputs.install_torch}} == 'true' ]]; then
source "${GITHUB_WORKSPACE}/test-infra/.github/scripts/install_torch.sh"
fi
eval $SMOKE_TEST
validate-macos-arm64:
if: (inputs.os == 'macos-arm64' || inputs.os == 'all')
needs: generate-macos-arm64-matrix
Expand Down
Loading
Loading