Skip to content

Commit 9342437

Browse files
authored
[BE] Remove MacOS x86 artifacts from the code (#5780)
MacOS x86 support was deprecated long time ago, remove last artifacts from test-infra code
1 parent 87ad4c4 commit 9342437

File tree

7 files changed

+63
-231
lines changed

7 files changed

+63
-231
lines changed

.github/workflows/test_build_conda_macos.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/test_build_wheels_macos.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/test_macos_job.yml

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,25 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12-
test-x86:
13-
uses: ./.github/workflows/macos_job.yml
14-
with:
15-
job-name: "macos-x86-64-py3.8"
16-
runner: macos-12
17-
test-infra-repository: ${{ github.repository }}
18-
test-infra-ref: ${{ github.ref }}
19-
script: |
20-
conda create --yes --quiet -n test python=3.8
21-
conda activate test
22-
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
23-
# Can import pytorch
24-
python3 -c 'import torch'
2512
test-m1:
2613
uses: ./.github/workflows/macos_job.yml
2714
with:
28-
job-name: "macos-arm64-py3.8"
15+
job-name: "macos-arm64-py3.10"
2916
runner: macos-m1-stable
3017
test-infra-repository: ${{ github.repository }}
3118
test-infra-ref: ${{ github.ref }}
3219
submodules: ${{ 'true' }}
3320
timeout: 60
3421
script: |
35-
conda create --yes --quiet -n test python=3.8
22+
conda create --yes --quiet -n test python=3.10
3623
conda activate test
3724
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
3825
# Can import pytorch, cuda is available
3926
python3 -c 'import torch'
40-
test-x86-with-repo:
41-
uses: ./.github/workflows/macos_job.yml
42-
with:
43-
job-name: "macos-x86-64-py3.8"
44-
runner: macos-12
45-
test-infra-repository: ${{ github.repository }}
46-
test-infra-ref: ${{ github.ref }}
47-
repository: pytorch/vision
48-
ref: main
49-
script: |
50-
conda create --yes --quiet -n test python=3.8
51-
conda activate test
52-
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
53-
# Can import pytorch
54-
python3 -c 'import torch'
5527
test-m1-with-repo:
5628
uses: ./.github/workflows/macos_job.yml
5729
with:
58-
job-name: "macos-arm64-py3.8"
30+
job-name: "macos-arm64-py3.10"
5931
runner: macos-m1-stable
6032
test-infra-repository: ${{ github.repository }}
6133
test-infra-ref: ${{ github.ref }}
@@ -64,7 +36,7 @@ jobs:
6436
ref: main
6537
timeout: 60
6638
script: |
67-
conda create --yes --quiet -n test python=3.8
39+
conda create --yes --quiet -n test python=3.10
6840
conda activate test
6941
python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
7042
# Can import pytorch, cuda is available
@@ -105,7 +77,6 @@ jobs:
10577
matrix:
10678
include:
10779
- runner: macos-m1-stable
108-
- runner: macos-13-xlarge
10980
fail-fast: false
11081
with:
11182
job-name: "test-secrets-no-filter-var"
@@ -121,7 +92,6 @@ jobs:
12192
matrix:
12293
include:
12394
- runner: macos-m1-stable
124-
- runner: macos-13-xlarge
12595
fail-fast: false
12696
with:
12797
job-name: "test-secrets-filter-var"

.github/workflows/validate-domain-library.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ jobs:
7373
os: windows
7474
channel: ${{ inputs.channel }}
7575
with-cuda: ${{ inputs.with_cuda }}
76-
generate-macos-matrix:
77-
if: (inputs.os == 'macos' || inputs.os == 'all')
78-
uses: ./.github/workflows/generate_binary_build_matrix.yml
79-
with:
80-
package-type: ${{ inputs.package_type }}
81-
os: macos
82-
channel: ${{ inputs.channel }}
83-
with-cuda: ${{ inputs.with_cuda }}
8476
generate-macos-arm64-matrix:
8577
if: (inputs.os == 'macos-arm64' || inputs.os == 'all')
8678
uses: ./.github/workflows/generate_binary_build_matrix.yml
@@ -136,30 +128,6 @@ jobs:
136128
source "${GITHUB_WORKSPACE}/test-infra/.github/scripts/install_torch.sh"
137129
fi
138130
eval $SMOKE_TEST
139-
validate-macos:
140-
if: (inputs.os == 'macos' || inputs.os == 'all')
141-
needs: generate-macos-matrix
142-
strategy:
143-
matrix: ${{ fromJson(needs.generate-macos-matrix.outputs.matrix) }}
144-
fail-fast: false
145-
uses: ./.github/workflows/macos_job.yml
146-
name: "macos-${{ matrix.package_type }}-${{ matrix.python_version }}-${{ matrix.desired_cuda }}"
147-
with:
148-
runner: ${{ matrix.validation_runner }}
149-
repository: ${{ inputs.repository }}
150-
ref: ${{ inputs.ref || github.ref }}
151-
job-name: "macos-${{ matrix.package_type }}-${{ matrix.python_version }}-${{ matrix.desired_cuda }}"
152-
binary-matrix: ${{ toJSON(matrix) }}
153-
script: |
154-
set -ex
155-
export ENV_NAME="conda-env-${{ github.run_id }}"
156-
export TARGET_OS="macos"
157-
export SMOKE_TEST="${{ inputs.smoke_test }}"
158-
export RELEASE_VERSION=${{ inputs.version }}
159-
if [[ ${{inputs.install_torch}} == 'true' ]]; then
160-
source "${GITHUB_WORKSPACE}/test-infra/.github/scripts/install_torch.sh"
161-
fi
162-
eval $SMOKE_TEST
163131
validate-macos-arm64:
164132
if: (inputs.os == 'macos-arm64' || inputs.os == 'all')
165133
needs: generate-macos-arm64-matrix

0 commit comments

Comments
 (0)