Skip to content

Commit 2f18c0b

Browse files
committed
Also update the spec
1 parent be7ba65 commit 2f18c0b

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.github/workflows/android-perf.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
# so let's just sed it
113113
sed -i -e 's,{{ model_path }},'"${MODEL_PATH}"',g' android-llm-device-farm-test-spec.yml.j2
114114
115-
BENCHMARK_CONFIG_ID="${{ matrix.model }}_${{ matrix.config }}"
115+
BENCHMARK_CONFIG_ID=$(echo "${{ matrix.model }}_${{ matrix.config }}" | sed -e 's/[^A-Za-z0-9._-]/_/g')
116116
# The config for this benchmark runs, we save it in the test spec so that it can be fetched
117117
# later by the upload script
118118
sed -i -e 's,{{ benchmark_config_id }},'"${BENCHMARK_CONFIG_ID}"',g' android-llm-device-farm-test-spec.yml.j2
@@ -121,10 +121,9 @@ jobs:
121121
# Just print the test spec for debugging
122122
cat android-llm-device-farm-test-spec.yml
123123
124-
BENCHMARK_CONFIG_FILENAME=$(echo "${BENCHMARK_CONFIG_ID}" | sed -e 's/[^A-Za-z0-9._-]/_/g')
125124
# Save the benchmark configs so that we can use it later in the dashboard
126-
echo "${BENCHMARK_CONFIG}" > "${BENCHMARK_CONFIG_FILENAME}.json"
127-
echo "benchmark-config-filename=${BENCHMARK_CONFIG_FILENAME}" >> $GITHUB_OUTPUT
125+
echo "${BENCHMARK_CONFIG}" > "${BENCHMARK_CONFIG_ID}.json"
126+
echo "benchmark-config-id=${BENCHMARK_CONFIG_ID}" >> $GITHUB_OUTPUT
128127
129128
- name: Upload the spec
130129
uses: seemethere/upload-artifact-s3@v5
@@ -144,7 +143,7 @@ jobs:
144143
${{ github.repository }}/${{ github.run_id }}/artifacts/benchmark-configs/
145144
retention-days: 1
146145
if-no-files-found: error
147-
path: extension/benchmark/android/benchmark/${{ steps.prepare.outputs.benchmark-config-filename }}.json
146+
path: extension/benchmark/android/benchmark/${{ steps.prepare.outputs.benchmark-config-id }}.json
148147

149148
export-models:
150149
name: export-models

.github/workflows/apple-perf.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
# so let's just sed it
115115
sed -i -e 's,{{ model_path }},'"${MODEL_PATH}"',g' default-ios-device-farm-appium-test-spec.yml.j2
116116
117-
BENCHMARK_CONFIG_ID="${{ matrix.model }}_${{ matrix.config }}"
117+
BENCHMARK_CONFIG_ID=$(echo "${{ matrix.model }}_${{ matrix.config }}" | sed -e 's/[^A-Za-z0-9._-]/_/g')
118118
# The config for this benchmark runs, we save it in the test spec so that it can be fetched
119119
# later by the upload script
120120
sed -i -e 's,{{ benchmark_config_id }},'"${BENCHMARK_CONFIG_ID}"',g' default-ios-device-farm-appium-test-spec.yml.j2
@@ -123,10 +123,9 @@ jobs:
123123
# Just print the test spec for debugging
124124
cat default-ios-device-farm-appium-test-spec.yml
125125
126-
BENCHMARK_CONFIG_FILENAME=$(echo "${BENCHMARK_CONFIG_ID}" | sed -e 's/[^A-Za-z0-9._-]/_/g')
127126
# Save the benchmark configs so that we can use it later in the dashboard
128-
echo "${BENCHMARK_CONFIG}" > "${BENCHMARK_CONFIG_FILENAME}.json"
129-
echo "benchmark-config-filename=${BENCHMARK_CONFIG_FILENAME}" >> $GITHUB_OUTPUT
127+
echo "${BENCHMARK_CONFIG}" > "${BENCHMARK_CONFIG_ID}.json"
128+
echo "benchmark-config-id=${BENCHMARK_CONFIG_ID}" >> $GITHUB_OUTPUT
130129
131130
- name: Upload the spec
132131
uses: seemethere/upload-artifact-s3@v5
@@ -146,7 +145,7 @@ jobs:
146145
${{ github.repository }}/${{ github.run_id }}/artifacts/benchmark-configs/
147146
retention-days: 1
148147
if-no-files-found: error
149-
path: extension/benchmark/apple/Benchmark/${{ steps.prepare.outputs.benchmark-config-filename }}.json
148+
path: extension/benchmark/apple/Benchmark/${{ steps.prepare.outputs.benchmark-config-id }}.json
150149

151150
export-models:
152151
name: export-models

0 commit comments

Comments
 (0)