restored correct benchmark behaviour
This commit is contained in:
+20
-12
@@ -69,7 +69,7 @@ for MODEL_PATH in "${MODEL_PATHS[@]}"; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# run twice: baseline and with flash attention
|
# run twice: baseline and with flash attention
|
||||||
for FA in 0 1; do
|
for FA in 1; do
|
||||||
SUFFIX="$BASE_SUFFIX"
|
SUFFIX="$BASE_SUFFIX"
|
||||||
EXTRA_ARGS=()
|
EXTRA_ARGS=()
|
||||||
if (( FA == 1 )); then
|
if (( FA == 1 )); then
|
||||||
@@ -84,26 +84,34 @@ for MODEL_PATH in "${MODEL_PATHS[@]}"; do
|
|||||||
EXTRA_ARGS+=( -ub 2048 )
|
EXTRA_ARGS+=( -ub 2048 )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OUT="$RESULTDIR/${MODEL_NAME}__${ENV}${SUFFIX}.log"
|
for CTX in default longctx32768; do
|
||||||
|
CTX_SUFFIX=""
|
||||||
|
CTX_ARGS=()
|
||||||
|
if [[ "$CTX" == longctx32768 ]]; then
|
||||||
|
CTX_SUFFIX="__longctx32768"
|
||||||
|
# shellcheck disable=SC2206 # intentional word splitting into array
|
||||||
|
CTX_ARGS=( -p 2048 -n 32 -d 32768 )
|
||||||
|
fi
|
||||||
|
|
||||||
|
OUT="$RESULTDIR/${MODEL_NAME}__${ENV}${SUFFIX}${CTX_SUFFIX}.log"
|
||||||
|
|
||||||
# skip if we already have a non-empty log
|
|
||||||
if [[ -s "$OUT" ]]; then
|
if [[ -s "$OUT" ]]; then
|
||||||
echo "⏩ Skipping [${ENV}] ${MODEL_NAME}${SUFFIX:+ ($SUFFIX)}, log already exists at $OUT"
|
echo "⏩ Skipping [${ENV}] ${MODEL_NAME}${SUFFIX}${CTX_SUFFIX:+ ($CTX_SUFFIX)}, log already exists at $OUT"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build command array
|
FULL_CMD=( $CMD_EFFECTIVE -ngl 99 -mmp 0 -m "$MODEL_PATH" "${EXTRA_ARGS[@]}" "${CTX_ARGS[@]}" -r 3 )
|
||||||
FULL_CMD=( $CMD_EFFECTIVE -ngl 99 -mmp 0 -m "$MODEL_PATH" "${EXTRA_ARGS[@]}" -d 512,32768 -r 3 )
|
|
||||||
|
|
||||||
printf "\n▶ [%s] %s%s\n" "$ENV" "$MODEL_NAME" "${SUFFIX:+ $SUFFIX}"
|
printf "\n▶ [%s] %s%s%s\n" "$ENV" "$MODEL_NAME" "${SUFFIX:+ $SUFFIX}" "${CTX_SUFFIX:+ $CTX_SUFFIX}"
|
||||||
printf " → log: %s\n" "$OUT"
|
printf " → log: %s\n" "$OUT"
|
||||||
printf " → cmd: %s\n\n" "${FULL_CMD[*]}"
|
printf " → cmd: %s\n\n" "${FULL_CMD[*]}"
|
||||||
|
|
||||||
# execute
|
if ! "${FULL_CMD[@]}" >"$OUT" 2>&1; then
|
||||||
"${FULL_CMD[@]}" >"$OUT" 2>&1 || {
|
status=$?
|
||||||
echo "✖ ! [${ENV}] ${MODEL_NAME}${SUFFIX:+ $SUFFIX} failed (exit $?)" >>"$OUT"
|
echo "✖ ! [${ENV}] ${MODEL_NAME}${SUFFIX}${CTX_SUFFIX:+ $CTX_SUFFIX} failed (exit ${status})" >>"$OUT"
|
||||||
echo " * [${ENV}] ${MODEL_NAME}${SUFFIX:+ $SUFFIX} : FAILED"
|
echo " * [${ENV}] ${MODEL_NAME}${SUFFIX}${CTX_SUFFIX:+ $CTX_SUFFIX} : FAILED"
|
||||||
}
|
fi
|
||||||
|
done
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user