Skip to content

Commit 2c6c73a

Browse files
guangy10Guang Yang
andauthored
Pin bump for optimum-executorch (#12022)
### Summary Pin bump to include latest changes for gemma-3, phi-4, and more ### Test plan CI --------- Co-authored-by: Guang Yang <[email protected]>
1 parent ad73cbd commit 2c6c73a

File tree

4 files changed

+14
-37
lines changed

4 files changed

+14
-37
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a3942627f5ac048e06b4b1d703b0a6a53bf6da5b

.github/workflows/android-perf.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,11 @@ jobs:
341341
echo "tokenizer.json is downloaded to $DOWNLOADED_PATH"
342342
343343
# Install optimum-executorch
344+
OPTIMUM_ET_COMMIT=$(cat .ci/docker/ci_commit_pins/optimum-executorch.txt)
344345
git clone https://github.com/huggingface/optimum-executorch
345346
pushd optimum-executorch
346347
# There is no release yet, for CI stability, always test from the same commit on main
347-
git checkout 4c3b18f6cca68c5ccff809131d570062723d7188
348+
git checkout $OPTIMUM_ET_COMMIT
348349
python install_dev.py --skip_override_torch
349350
pip list
350351
@@ -353,21 +354,12 @@ jobs:
353354
"--task" "text-generation"
354355
"--recipe" "xnnpack"
355356
"--use_custom_sdpa"
357+
"--use_custom_kv_cache"
356358
"--qlinear"
357359
"--qembedding"
358360
"--output_dir" ".."
359361
)
360362
361-
# Add conditional arguments based on model
362-
case "${HF_MODEL_REPO}" in
363-
*"google/gemma-3-1b-it"*)
364-
echo "--use_custom_kv_cache can not be used for HybridCache"
365-
;;
366-
*)
367-
ARGS+=("--use_custom_kv_cache")
368-
;;
369-
esac
370-
371363
optimum-cli export executorch "${ARGS[@]}"
372364
popd
373365

.github/workflows/apple-perf.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,11 @@ jobs:
346346
echo "tokenizer.json is downloaded to $DOWNLOADED_PATH"
347347
348348
# Install optimum-executorch
349+
OPTIMUM_ET_COMMIT=$(cat .ci/docker/ci_commit_pins/optimum-executorch.txt)
349350
git clone https://github.com/huggingface/optimum-executorch
350351
pushd optimum-executorch
351352
# There is no release yet, for CI stability, always test from the same commit on main
352-
git checkout 4c3b18f6cca68c5ccff809131d570062723d7188
353+
git checkout $OPTIMUM_ET_COMMIT
353354
${CONDA_RUN} python install_dev.py --skip_override_torch
354355
pip list
355356
@@ -358,21 +359,12 @@ jobs:
358359
"--task" "text-generation"
359360
"--recipe" "xnnpack"
360361
"--use_custom_sdpa"
362+
"--use_custom_kv_cache"
361363
"--qlinear"
362364
"--qembedding"
363365
"--output_dir" ".."
364366
)
365367
366-
# Add conditional arguments based on model
367-
case "${HF_MODEL_REPO}" in
368-
*"google/gemma-3-1b-it"*)
369-
echo "--use_custom_kv_cache can not be used for HybridCache"
370-
;;
371-
*)
372-
ARGS+=("--use_custom_kv_cache")
373-
;;
374-
esac
375-
376368
${CONDA_RUN} optimum-cli export executorch "${ARGS[@]}"
377369
popd
378370

.github/workflows/trunk.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,11 @@ jobs:
594594
echo "::group::Set up Hugging Face"
595595
pip install -U "huggingface_hub[cli]"
596596
huggingface-cli login --token $SECRET_EXECUTORCH_HF_TOKEN
597+
OPTIMUM_ET_COMMIT=$(cat .ci/docker/ci_commit_pins/optimum-executorch.txt)
597598
git clone https://github.com/huggingface/optimum-executorch
598599
pushd optimum-executorch
599600
# There is no release yet, for CI stability, always test from the same commit on main
600-
git checkout 4c3b18f6cca68c5ccff809131d570062723d7188
601+
git checkout $OPTIMUM_ET_COMMIT
601602
python install_dev.py --skip_override_torch
602603
popd
603604
pip list
@@ -614,21 +615,12 @@ jobs:
614615
"--task" "text-generation"
615616
"--recipe" "xnnpack"
616617
"--use_custom_sdpa"
618+
"--use_custom_kv_cache"
617619
"--qlinear"
618620
"--qembedding"
619621
"--output_dir" "${OUTPUT_DIR}"
620622
)
621623
622-
# Add conditional arguments based on model
623-
case "${MODEL_ID}" in
624-
*"google/gemma-3-1b-it"*)
625-
echo "--use_custom_kv_cache can not be used for HybridCache"
626-
;;
627-
*)
628-
ARGS+=("--use_custom_kv_cache")
629-
;;
630-
esac
631-
632624
optimum-cli export executorch "${ARGS[@]}"
633625
634626
ls -FlAGhp ${OUTPUT_DIR}
@@ -732,18 +724,18 @@ jobs:
732724
timeout: 90
733725
script: |
734726
set -eux
735-
727+
736728
# The generic Linux job chooses to use base env, not the one setup by the image
737729
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
738730
conda activate "${CONDA_ENV}"
739-
731+
740732
# Build and install Executorch
741733
PYTHON_EXECUTABLE=python \
742734
CMAKE_ARGS="-DEXECUTORCH_BUILD_NXP_NEUTRON=ON" \
743735
.ci/scripts/setup-linux.sh --build-tool "cmake"
744-
736+
745737
# Install test requirements
746738
pip install -r backends/nxp/requirements-tests.txt
747-
739+
748740
# Run pytest
749741
PYTHON_EXECUTABLE=python bash backends/nxp/run_unittests.sh

0 commit comments

Comments
 (0)