diff --git a/.ci/docker/ci_commit_pins/optimum-executorch.txt b/.ci/docker/ci_commit_pins/optimum-executorch.txt index 4cf99a4f78e..b8cbc940cee 100644 --- a/.ci/docker/ci_commit_pins/optimum-executorch.txt +++ b/.ci/docker/ci_commit_pins/optimum-executorch.txt @@ -1 +1 @@ -bd06b54e627fbfd354a2cffa4c80fb21883209a9 +4b108cad37bd8e211cf9d9c1633b3d5753708bd5 diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index ae3001ca920..2d00d38b811 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -827,36 +827,21 @@ jobs: # The generic Linux job chooses to use base env, not the one setup by the image CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]") conda activate "${CONDA_ENV}" - PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool cmake - # Build executor_runner with ETdump enabled - PYTHON_EXECUTABLE=python cmake -DPYTHON_EXECUTABLE=python \ - -DCMAKE_INSTALL_PREFIX=cmake-out \ - -DEXECUTORCH_ENABLE_LOGGING=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \ - -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \ - -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \ - -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \ - -DEXECUTORCH_BUILD_XNNPACK=ON \ - -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \ - -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \ - -DEXECUTORCH_BUILD_KERNELS_LLM=ON \ - -DEXECUTORCH_BUILD_DEVTOOLS=ON \ - -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \ - -Bcmake-out . - cmake --build cmake-out -j16 --target install --config Release + echo "::endgroup::" echo "::group::Set up Hugging Face" pip install -U "huggingface_hub[cli]" huggingface-cli login --token $SECRET_EXECUTORCH_HF_TOKEN OPTIMUM_ET_COMMIT=$(cat .ci/docker/ci_commit_pins/optimum-executorch.txt) + echo "Cloning optimum-executorch..." git clone https://github.com/huggingface/optimum-executorch pushd optimum-executorch # There is no release yet, for CI stability, always test from the same commit on main git checkout $OPTIMUM_ET_COMMIT python install_dev.py --skip_override_torch popd + echo "Checking out commit: $OPTIMUM_ET_COMMIT" pip list echo "::endgroup::" @@ -865,6 +850,11 @@ jobs: python .ci/scripts/test_huggingface_optimum_model.py --model ${MODEL} --recipe ${RECIPE} ${QUANTIZE} --model_dir ${OUTPUT_DIR} echo "::endgroup::" + # Install executorch + echo "::group::Set up ExecuTorch" + ./install_requirements.sh --use-pt-pinned-commit + echo "::endgroup::" + echo "::group::Generate artifacts for performance profiling" ./cmake-out/executor_runner \ --model_path ${OUTPUT_DIR}/model.pte \