Skip to content

Commit

Permalink
scripts : update to new build system
Browse files Browse the repository at this point in the history
  • Loading branch information
ggerganov committed Dec 9, 2024
1 parent 5980b1a commit ed733e8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# Audio samples
#

.PHONY: build
build:
cmake -B build
cmake --build build --config Release

# download a few audio samples into folder "./samples":
.PHONY: samples
samples:
Expand Down
8 changes: 4 additions & 4 deletions scripts/bench-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Helper script to run the bench tool on all models and print the results in share-able format

printf "Usage: ./bench.sh [n_threads] [encoder-only] [flash-attn]\n"
printf "Usage: ./scripts/bench-all.sh [n_threads] [encoder-only] [flash-attn]\n"

if [ -z "$1" ]; then
n_threads=4
Expand Down Expand Up @@ -38,13 +38,13 @@ if [ "$encoder_only" -eq 0 ]; then
printf "Running memcpy benchmark\n"
printf "\n"

./bench -w 1 -t $n_threads 2>&1
./build/bin/bench -w 1 -t $n_threads 2>&1

printf "\n"
printf "Running ggml_mul_mat benchmark with $n_threads threads\n"
printf "\n"

./bench -w 2 -t $n_threads 2>&1
./build/bin/bench -w 2 -t $n_threads 2>&1

printf "\n"
printf "Running benchmark for all models\n"
Expand All @@ -64,7 +64,7 @@ printf "| %6s | %6s | %16s | %13s | %3s | %3s | %7s | %7s | %7s | %7s | %7s |\n"
for model in "${models[@]}"; do
# actual run
# store stderr output in a variable in order to parse it later
output=$(./bench -m ./models/ggml-$model.bin -t $n_threads $fattn 2>&1)
output=$(./build/bin/bench -m ./models/ggml-$model.bin -t $n_threads $fattn 2>&1)
ret=$?

# parse the output:
Expand Down
2 changes: 1 addition & 1 deletion tests/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if [ $# -eq 0 ]; then
fi

model=$1
main="../main"
main="../build/bin/main"

threads=""
if [ $# -eq 2 ]; then
Expand Down

0 comments on commit ed733e8

Please sign in to comment.