Skip to content

Commit 88a0a19

Browse files
committed
Fix trunk jobs
1 parent ca377cc commit 88a0a19

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/android-perf-private-device-experiment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
id-token: write
5858
contents: read
5959
with:
60-
models: ${{ inputs.models || 'google/gemma-3-1b-it,Qwen/Qwen3-0.6B,HuggingFaceTB/SmolLM2-135M,meta-llama/Llama-3.2-1B,allenai/OLMo-1B-hf' }}
60+
models: ${{ inputs.models || 'Qwen/Qwen3-0.6B' }}
6161
devices: samsung_galaxy_s22_private
6262
benchmark_configs: ${{ inputs.benchmark_configs }}

.github/workflows/apple-perf-private-device-experiment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
description: Models to be benchmarked
3535
required: false
3636
type: string
37-
default: google/gemma-3-1b-it,Qwen/Qwen3-0.6B,HuggingFaceTB/SmolLM2-135M,meta-llama/Llama-3.2-1B,allenai/OLMo-1B-hf
37+
default: Qwen/Qwen3-0.6B,HuggingFaceTB/SmolLM2-135M,meta-llama/Llama-3.2-1B,allenai/OLMo-1B-hf
3838
devices:
3939
description: Target devices to run benchmark
4040
required: false
@@ -57,6 +57,6 @@ jobs:
5757
id-token: write
5858
contents: read
5959
with:
60-
models: ${{ inputs.models || 'google/gemma-3-1b-it,Qwen/Qwen3-0.6B,HuggingFaceTB/SmolLM2-135M,meta-llama/Llama-3.2-1B,allenai/OLMo-1B-hf' }}
60+
models: ${{ inputs.models || 'Qwen/Qwen3-0.6B' }}
6161
devices: apple_iphone_15_private
6262
benchmark_configs: ${{ inputs.benchmark_configs }}

.github/workflows/trunk.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ jobs:
591591
"--use_custom_sdpa"
592592
"--qlinear"
593593
"--qembedding"
594-
"--output_dir" "."
594+
"--output_dir" "${OUTPUT_DIR}"
595595
)
596596
597597
# Add conditional arguments based on model
@@ -707,18 +707,18 @@ jobs:
707707
timeout: 90
708708
script: |
709709
set -eux
710-
710+
711711
# The generic Linux job chooses to use base env, not the one setup by the image
712712
CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
713713
conda activate "${CONDA_ENV}"
714-
714+
715715
# Build and install Executorch
716716
PYTHON_EXECUTABLE=python \
717717
CMAKE_ARGS="-DEXECUTORCH_BUILD_NXP_NEUTRON=ON" \
718718
.ci/scripts/setup-linux.sh --build-tool "cmake"
719-
719+
720720
# Install test requirements
721721
pip install -r backends/nxp/requirements-tests.txt
722-
722+
723723
# Run pytest
724724
PYTHON_EXECUTABLE=python bash backends/nxp/run_unittests.sh

extension/benchmark/apple/Benchmark/Tests/Tests.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ HEADER_SEARCH_PATHS = $(inherited) \
2121

2222
LIBRARY_SEARCH_PATHS = $(inherited) \
2323
$(TEMP_DIR)/cmake/lib
24+
25+
OTHER_CFLAGS = $(inherited) -DSUPPORT_REGEX_LOOKAHEAD=1

0 commit comments

Comments
 (0)