Skip to content

Remove buck2 CI from pull.yml #6539

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Remove buck2 CI from pull.yml #6539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446bd7c
Remove buck2 CI from pull.yml
kirklandsign Oct 28, 2024
d524277
Use for now
kirklandsign Oct 29, 2024
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
56 changes: 11 additions & 45 deletions .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ jobs:
name: test-setup-linux-gcc
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
Copy link
Contributor

@huydhn huydhn Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you could just remove this strategy section, it does nothing now

Copy link
Contributor Author

@kirklandsign kirklandsign Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a fail-fast: false below

matrix:
include:
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -50,7 +47,7 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"

PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
# Build and test ExecuTorch with the add model on portable backend.
Expand Down Expand Up @@ -89,20 +86,11 @@ jobs:
strategy:
matrix:
dtype: [fp32]
build-tool: [buck2, cmake]
mode: [portable, xnnpack+custom, xnnpack+custom+qe]
include:
- dtype: bf16
build-tool: cmake
mode: portable
- dtype: bf16
build-tool: buck2
mode: portable
- dtype: bf16
build-tool: cmake
mode: custom
- dtype: bf16
build-tool: buck2
mode: custom
fail-fast: false
with:
Expand All @@ -117,11 +105,11 @@ jobs:
conda activate "${CONDA_ENV}"

DTYPE=${{ matrix.dtype }}
BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
MODE=${{ matrix.mode }}

# Setup executorch
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh buck2
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh cmake
Copy link
Contributor

@huydhn huydhn Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Use ${BUILD_TOOL} here?

# Install requirements for export_llama
PYTHON_EXECUTABLE=python bash examples/models/llama/install_requirements.sh
# Test llama2
Expand All @@ -131,9 +119,6 @@ jobs:
name: test-llama-runner-linux-android
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -146,18 +131,14 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
PYTHON_EXECUTABLE=python \
bash .ci/scripts/build_llama_android.sh "${BUILD_TOOL}"

test-custom-ops-linux:
name: test-custom-ops-linux
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: buck2
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -170,7 +151,7 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
# Test custom ops
PYTHON_EXECUTABLE=python bash examples/portable/custom_ops/test_custom_ops.sh "${BUILD_TOOL}"
Expand All @@ -179,10 +160,6 @@ jobs:
name: test-selective-build-linux
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: buck2
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -195,7 +172,7 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
# Test selective build
PYTHON_EXECUTABLE=python bash examples/selective_build/test_selective_build.sh "${BUILD_TOOL}"
Expand Down Expand Up @@ -235,9 +212,6 @@ jobs:
name: test-quantized-aot-lib-linux
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -250,17 +224,14 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh "${BUILD_TOOL}"
PYTHON_EXECUTABLE=python bash examples/xnnpack/quantization/test_quantize.sh "${BUILD_TOOL}" mv2

test-pybind-build-linux:
name: test-pybind-build-linux
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: cmake
fail-fast: false
with:
runner: linux.2xlarge
Expand All @@ -274,7 +245,7 @@ jobs:
conda activate "${CONDA_ENV}"

# build module for executorch.extension.pybindings.portable_lib
BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
PYTHON_EXECUTABLE=python \
EXECUTORCH_BUILD_XNNPACK=ON \
EXECUTORCH_BUILD_PYBIND=ON \
Expand Down Expand Up @@ -357,10 +328,6 @@ jobs:

unittest-arm:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
strategy:
matrix:
include:
- build-tool: buck2
with:
runner: linux.2xlarge
docker-image: executorch-ubuntu-22.04-arm-sdk
Expand All @@ -374,7 +341,7 @@ jobs:
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
conda activate "${CONDA_ENV}"

BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"

# Setup MacOS dependencies as there is no Docker support on MacOS atm
PYTHON_EXECUTABLE=python \
Expand All @@ -396,7 +363,6 @@ jobs:
strategy:
matrix:
dtype: [fp32]
build-tool: [cmake]
mode: [qnn]
fail-fast: false
with:
Expand All @@ -411,14 +377,14 @@ jobs:
conda activate "${CONDA_ENV}"

DTYPE=${{ matrix.dtype }}
BUILD_TOOL=${{ matrix.build-tool }}
BUILD_TOOL="cmake"
MODE=${{ matrix.mode }}

PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh

# Setup executorch
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh buck2
PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh cmake
Copy link
Contributor

@huydhn huydhn Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Use ${BUILD_TOOL} here?

Copy link
Contributor

@larryliu0820 larryliu0820 Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or remove BUILD_TOOL

# Install requirements for export_llama
PYTHON_EXECUTABLE=python bash examples/models/llama/install_requirements.sh
# Test llama2
Expand Down
Loading