Skip to content

Commit 9e0d88f

Browse files
author
Guang Yang
committed
Fix reporting backends and dtyep to benchmark results
1 parent 2435364 commit 9e0d88f

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.ci/scripts/test_llama.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ else
171171
fi
172172

173173
# Check dtype.
174-
EXPORTED_MODEL_NAME="llama2"
174+
EXPORTED_MODEL_NAME="tinyllama_${MODE}_${DTYPE}"
175175
if [[ "${DTYPE}" == "fp16" ]]; then
176176
EXPORTED_MODEL_NAME="${EXPORTED_MODEL_NAME}_h"
177177
elif [[ "${DTYPE}" == "bf16" ]]; then

.ci/scripts/test_model.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,33 +152,35 @@ test_model_with_qnn() {
152152

153153
export LD_LIBRARY_PATH=$QNN_SDK_ROOT/lib/x86_64-linux-clang/
154154
export PYTHONPATH=$EXECUTORCH_ROOT/..
155+
# QNN support fp16 only
156+
DTYPE=fp16
155157

156158
if [[ "${MODEL_NAME}" == "dl3" ]]; then
157159
EXPORT_SCRIPT=deeplab_v3
158-
EXPORTED_MODEL_NAME=dlv3_qnn.pte
160+
EXPORTED_MODEL_NAME=deeplab-v3_qnn_${DTYPE}.pte
159161
elif [[ "${MODEL_NAME}" == "mv3" ]]; then
160162
EXPORT_SCRIPT=mobilenet_v3
161-
EXPORTED_MODEL_NAME=mv3_qnn.pte
163+
EXPORTED_MODEL_NAME=mobilenet-v3_qnn_${DTYPE}.pte
162164
elif [[ "${MODEL_NAME}" == "mv2" ]]; then
163165
EXPORT_SCRIPT=mobilenet_v2
164-
EXPORTED_MODEL_NAME=mv2_qnn.pte
166+
EXPORTED_MODEL_NAME=mobilenet-v2_qnn_${DTYPE}.pte
165167
elif [[ "${MODEL_NAME}" == "ic4" ]]; then
166168
EXPORT_SCRIPT=inception_v4
167-
EXPORTED_MODEL_NAME=ic4_qnn.pte
169+
EXPORTED_MODEL_NAME=inception-v4_qnn_${DTYPE}.pte
168170
elif [[ "${MODEL_NAME}" == "ic3" ]]; then
169171
EXPORT_SCRIPT=inception_v3
170-
EXPORTED_MODEL_NAME=ic3_qnn.pte
172+
EXPORTED_MODEL_NAME=inception-v3_qnn_${DTYPE}.pte
171173
elif [[ "${MODEL_NAME}" == "vit" ]]; then
172174
EXPORT_SCRIPT=torchvision_vit
173-
EXPORTED_MODEL_NAME=vit_qnn.pte
175+
EXPORTED_MODEL_NAME=torchvision-vit_qnn_${DTYPE}.pte
174176
fi
175177

176178
# Use SM8450 for S22, SM8550 for S23, and SM8560 for S24
177179
# TODO(guangyang): Make QNN chipset matches the target device
178180
QNN_CHIPSET=SM8450
179181

180-
"${PYTHON_EXECUTABLE}" -m examples.qualcomm.scripts.${EXPORT_SCRIPT} -b ${CMAKE_OUTPUT_DIR} -m ${QNN_CHIPSET} --compile_only
181-
EXPORTED_MODEL=./${EXPORT_SCRIPT}/${EXPORTED_MODEL_NAME}
182+
"${PYTHON_EXECUTABLE}" -m examples.qualcomm.scripts.${EXPORT_SCRIPT} -b ${CMAKE_OUTPUT_DIR} -m ${QNN_CHIPSET} -a ${EXPORTED_MODEL_NAME} --compile_only
183+
EXPORTED_MODEL=./${EXPORTED_MODEL_NAME}
182184
}
183185

184186
test_model_with_coreml() {

examples/apple/coreml/scripts/export.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ def export_lowered_module_to_executorch_program(lowered_module, example_inputs):
110110
return exec_prog
111111

112112

113-
def save_executorch_program(exec_prog, model_name, compute_unit):
113+
def save_executorch_program(exec_prog, model_name, compute_unit, precision):
114114
buffer = exec_prog.buffer
115-
filename = f"{model_name}_coreml_{compute_unit}.pte"
115+
filename = f"{model_name}_coreml_{compute_unit}_{precision}.pte"
116116
print(f"Saving exported program to {filename}")
117117
with open(filename, "wb") as file:
118118
file.write(buffer)
@@ -189,7 +189,9 @@ def main():
189189
example_inputs,
190190
)
191191

192-
save_executorch_program(exec_program, args.model_name, args.compute_unit)
192+
save_executorch_program(
193+
exec_program, args.model_name, args.compute_unit, args.compute_precision
194+
)
193195
generate_etrecord(f"{args.model_name}_coreml_etrecord.bin", edge_copy, exec_program)
194196

195197
if args.save_processed_bytes and lowered_module is not None:

0 commit comments

Comments
 (0)