Skip to content

Commit 72b02ec

Browse files
kirklandsignkirklandsign
authored
Remove buck2 CI from pull.yml (#6539)
Keep one model E2E (mv3) from gather_models only for basic validation We removed all buck2 from docs already Test: CI Pull Request resolved: #6539
1 parent 2c32bf3 commit 72b02ec

File tree

1 file changed

+11
-45
lines changed

1 file changed

+11
-45
lines changed

‎.github/workflows/pull.yml‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ jobs:
3535
name: test-setup-linux-gcc
3636
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
3737
strategy:
38-
matrix:
39-
include:
40-
- build-tool: cmake
4138
fail-fast: false
4239
with:
4340
runner: linux.2xlarge
@@ -50,7 +47,7 @@ jobs:
5047
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
5148
conda activate "${CONDA_ENV}"
5249
53-
BUILD_TOOL=${{ matrix.build-tool }}
50+
BUILD_TOOL="cmake"
5451
5552
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
5653
# Build and test ExecuTorch with the add model on portable backend.
@@ -89,20 +86,11 @@ jobs:
8986
strategy:
9087
matrix:
9188
dtype: [fp32]
92-
build-tool: [buck2, cmake]
9389
mode: [portable, xnnpack+custom, xnnpack+custom+qe]
9490
include:
9591
- dtype: bf16
96-
build-tool: cmake
97-
mode: portable
98-
- dtype: bf16
99-
build-tool: buck2
10092
mode: portable
10193
- dtype: bf16
102-
build-tool: cmake
103-
mode: custom
104-
- dtype: bf16
105-
build-tool: buck2
10694
mode: custom
10795
fail-fast: false
10896
with:
@@ -117,11 +105,11 @@ jobs:
117105
conda activate "${CONDA_ENV}"
118106
119107
DTYPE=${{ matrix.dtype }}
120-
BUILD_TOOL=${{ matrix.build-tool }}
108+
BUILD_TOOL="cmake"
121109
MODE=${{ matrix.mode }}
122110
123111
# Setup executorch
124-
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh buck2
112+
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
125113
# Install requirements for export_llama
126114
PYTHON_EXECUTABLE=python bash examples/models/llama/install_requirements.sh
127115
# Test llama2
@@ -131,9 +119,6 @@ jobs:
131119
name: test-llama-runner-linux-android
132120
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
133121
strategy:
134-
matrix:
135-
include:
136-
- build-tool: cmake
137122
fail-fast: false
138123
with:
139124
runner: linux.2xlarge
@@ -146,18 +131,14 @@ jobs:
146131
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
147132
conda activate "${CONDA_ENV}"
148133
149-
BUILD_TOOL=${{ matrix.build-tool }}
134+
BUILD_TOOL="cmake"
150135
PYTHON_EXECUTABLE=python \
151136
bash .ci/scripts/build_llama_android.sh "${BUILD_TOOL}"
152137
153138
test-custom-ops-linux:
154139
name: test-custom-ops-linux
155140
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
156141
strategy:
157-
matrix:
158-
include:
159-
- build-tool: buck2
160-
- build-tool: cmake
161142
fail-fast: false
162143
with:
163144
runner: linux.2xlarge
@@ -170,7 +151,7 @@ jobs:
170151
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
171152
conda activate "${CONDA_ENV}"
172153
173-
BUILD_TOOL=${{ matrix.build-tool }}
154+
BUILD_TOOL="cmake"
174155
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
175156
# Test custom ops
176157
PYTHON_EXECUTABLE=python bash examples/portable/custom_ops/test_custom_ops.sh "${BUILD_TOOL}"
@@ -179,10 +160,6 @@ jobs:
179160
name: test-selective-build-linux
180161
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
181162
strategy:
182-
matrix:
183-
include:
184-
- build-tool: buck2
185-
- build-tool: cmake
186163
fail-fast: false
187164
with:
188165
runner: linux.2xlarge
@@ -195,7 +172,7 @@ jobs:
195172
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
196173
conda activate "${CONDA_ENV}"
197174
198-
BUILD_TOOL=${{ matrix.build-tool }}
175+
BUILD_TOOL="cmake"
199176
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
200177
# Test selective build
201178
PYTHON_EXECUTABLE=python bash examples/selective_build/test_selective_build.sh "${BUILD_TOOL}"
@@ -235,9 +212,6 @@ jobs:
235212
name: test-quantized-aot-lib-linux
236213
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
237214
strategy:
238-
matrix:
239-
include:
240-
- build-tool: cmake
241215
fail-fast: false
242216
with:
243217
runner: linux.2xlarge
@@ -250,17 +224,14 @@ jobs:
250224
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
251225
conda activate "${CONDA_ENV}"
252226
253-
BUILD_TOOL=${{ matrix.build-tool }}
227+
BUILD_TOOL="cmake"
254228
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
255229
PYTHON_EXECUTABLE=python bash examples/xnnpack/quantization/test_quantize.sh "${BUILD_TOOL}" mv2
256230
257231
test-pybind-build-linux:
258232
name: test-pybind-build-linux
259233
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
260234
strategy:
261-
matrix:
262-
include:
263-
- build-tool: cmake
264235
fail-fast: false
265236
with:
266237
runner: linux.2xlarge
@@ -274,7 +245,7 @@ jobs:
274245
conda activate "${CONDA_ENV}"
275246
276247
# build module for executorch.extension.pybindings.portable_lib
277-
BUILD_TOOL=${{ matrix.build-tool }}
248+
BUILD_TOOL="cmake"
278249
PYTHON_EXECUTABLE=python \
279250
EXECUTORCH_BUILD_XNNPACK=ON \
280251
EXECUTORCH_BUILD_PYBIND=ON \
@@ -357,10 +328,6 @@ jobs:
357328

358329
unittest-arm:
359330
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
360-
strategy:
361-
matrix:
362-
include:
363-
- build-tool: buck2
364331
with:
365332
runner: linux.2xlarge
366333
docker-image: executorch-ubuntu-22.04-arm-sdk
@@ -374,7 +341,7 @@ jobs:
374341
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
375342
conda activate "${CONDA_ENV}"
376343
377-
BUILD_TOOL=${{ matrix.build-tool }}
344+
BUILD_TOOL="cmake"
378345
379346
# Setup MacOS dependencies as there is no Docker support on MacOS atm
380347
PYTHON_EXECUTABLE=python \
@@ -396,7 +363,6 @@ jobs:
396363
strategy:
397364
matrix:
398365
dtype: [fp32]
399-
build-tool: [cmake]
400366
mode: [qnn]
401367
fail-fast: false
402368
with:
@@ -411,14 +377,14 @@ jobs:
411377
conda activate "${CONDA_ENV}"
412378
413379
DTYPE=${{ matrix.dtype }}
414-
BUILD_TOOL=${{ matrix.build-tool }}
380+
BUILD_TOOL="cmake"
415381
MODE=${{ matrix.mode }}
416382
417383
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
418384
PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
419385
420386
# Setup executorch
421-
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh buck2
387+
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
422388
# Install requirements for export_llama
423389
PYTHON_EXECUTABLE=python bash examples/models/llama/install_requirements.sh
424390
# Test llama2

0 commit comments

Comments
 (0)