Skip to content

Commit a14b960

Browse files
authored
model-conversion : use BUILD_DIR variable in all scripts (ggml-org#19015)
This commit modifies all the utility scripts to use an optional BUILD_DIR variable/argument to specify the build directory. The motivation for this is that Commit 3d55846 ("model-conversion : add BUILD_DIR variable to run-converted-model scripts") introduced this variable to the causal and embeddings scripts, but I missed the scripts in the utils directory.
1 parent 091a46c commit a14b960

5 files changed

Lines changed: 36 additions & 11 deletions

File tree

examples/model-conversion/scripts/utils/perplexity-gen.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -e
44

55
CONVERTED_MODEL="${1:-"$CONVERTED_MODEL"}"
6+
BUILD_DIR="${2:-"$BUILD_DIR"}"
67

78
# Final check if we have a model path
89
if [ -z "$CONVERTED_MODEL" ]; then
@@ -25,9 +26,13 @@ mkdir -p ppl
2526
OUTPUTFILE="ppl/$(basename $CONVERTED_MODEL).kld"
2627
echo "Model: $CONVERTED_MODEL"
2728

28-
cmake --build ../../build --target llama-perplexity -j8
29+
if [ -z "$BUILD_DIR" ]; then
30+
BUILD_DIR="../../build"
31+
fi
32+
33+
cmake --build $BUILD_DIR --target llama-perplexity -j8
2934

30-
../.././build/bin/llama-perplexity -m $CONVERTED_MODEL \
35+
${BUILD_DIR}/bin/llama-perplexity -m $CONVERTED_MODEL \
3136
-f ppl/wikitext-2-raw/wiki.test.raw \
3237
--kl-divergence-base $OUTPUTFILE
3338

examples/model-conversion/scripts/utils/perplexity-run-simple.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -e
44

55
QUANTIZED_MODEL="${1:-"$QUANTIZED_MODEL"}"
6+
BUILD_DIR="${2:-"$BUILD_DIR"}"
67

78
if [ -z "$QUANTIZED_MODEL" ]; then
89
echo "Error: Model path must be provided either as:" >&2
@@ -20,8 +21,12 @@ if [ ! -d "ppl/wikitext-2-raw" ]; then
2021
popd
2122
fi
2223

23-
cmake --build ../../build --target llama-perplexity -j8
24+
if [ -z "$BUILD_DIR" ]; then
25+
BUILD_DIR="../../build"
26+
fi
27+
28+
cmake --build $BUILD_DIR --target llama-perplexity -j8
2429

25-
../.././build/bin/llama-perplexity -m $QUANTIZED_MODEL -f ppl/wikitext-2-raw/wiki.test.raw
30+
${BUILD_DIR}/bin/llama-perplexity -m $QUANTIZED_MODEL -f ppl/wikitext-2-raw/wiki.test.raw
2631

2732

examples/model-conversion/scripts/utils/perplexity-run.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set -e
44

55
QUANTIZED_MODEL="${1:-"$QUANTIZED_MODEL"}"
6-
LOGITS_FILE="${1:-"$LOGITS_FILE"}"
6+
LOGITS_FILE="${2:-"$LOGITS_FILE"}"
7+
BUILD_DIR="${3:-"$BUILD_DIR"}"
78

89
if [ -z "$QUANTIZED_MODEL" ]; then
910
echo "Error: Model path must be provided either as:" >&2
@@ -18,11 +19,15 @@ if [ ! -f ${LOGITS_FILE} ]; then
1819
exit 1
1920
fi
2021

22+
if [ -z "$BUILD_DIR" ]; then
23+
BUILD_DIR="../../build"
24+
fi
25+
2126
echo "Model: $QUANTIZED_MODEL"
2227
echo "Data file: $LOGITS_FILE"
2328

24-
cmake --build ../../build --target llama-perplexity -j8
29+
cmake --build $BUILD_DIR --target llama-perplexity -j8
2530

26-
../.././build/bin/llama-perplexity -m $QUANTIZED_MODEL \
31+
${BUILD_DIR}/bin/llama-perplexity -m $QUANTIZED_MODEL \
2732
--kl-divergence-base $LOGITS_FILE \
2833
--kl-divergence

examples/model-conversion/scripts/utils/quantize.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CONVERTED_MODEL="${1:-"$CONVERTED_MODEL"}"
66
QUANTIZED_TYPE="${2:-"$QUANTIZED_TYPE"}"
77
TOKEN_EMBD_TYPE="${3:-"${TOKEN_EMBD_TYPE}"}"
88
OUTPUT_TYPE="${4:-"${OUTPUT_TYPE}"}"
9+
BUILD_DIR="${5:-"$BUILD_DIR"}"
910
QUANTIZED_MODEL=$CONVERTED_MODEL
1011

1112
# Final check if we have a model path
@@ -33,12 +34,16 @@ else
3334
exit 1
3435
fi
3536

36-
cmake --build ../../build --target llama-quantize -j8
37+
if [ -z "$BUILD_DIR" ]; then
38+
BUILD_DIR="../../build"
39+
fi
40+
41+
cmake --build $BUILD_DIR --target llama-quantize -j8
3742

3843
echo $TOKEN_EMBD_TYPE
3944
echo $OUTPUT_TYPE
4045

41-
CMD_ARGS=("../../build/bin/llama-quantize")
46+
CMD_ARGS=("${BUILD_DIR}/bin/llama-quantize")
4247
[[ -n "$TOKEN_EMBD_TYPE" ]] && CMD_ARGS+=("--token-embedding-type" "$TOKEN_EMBD_TYPE")
4348
[[ -n "$OUTPUT_TYPE" ]] && CMD_ARGS+=("--output-tensor-type" "$OUTPUT_TYPE")
4449
CMD_ARGS+=("$CONVERTED_MODEL" "$QUANTIZED_MODEL" "$QUANTIZED_TYPE")

examples/model-conversion/scripts/utils/run-embedding-server.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44
#
55
# First try command line argument, then environment variable, then file
66
CONVERTED_MODEL="${1:-"$CONVERTED_MODEL"}"
7+
BUILD_DIR="${2:-"$BUILD_DIR"}"
78

89
# Final check if we have a model path
910
if [ -z "$CONVERTED_MODEL" ]; then
@@ -13,10 +14,14 @@ if [ -z "$CONVERTED_MODEL" ]; then
1314
exit 1
1415
fi
1516

17+
if [ -z "$BUILD_DIR" ]; then
18+
BUILD_DIR="../../build"
19+
fi
20+
1621
echo $CONVERTED_MODEL
1722

18-
cmake --build ../../build --target llama-server
23+
cmake --build $BUILD_DIR --target llama-server
1924

20-
../../build/bin/llama-server -m $CONVERTED_MODEL \
25+
${BUILD_DIR}/bin/llama-server -m $CONVERTED_MODEL \
2126
--embedding \
2227
--pooling none

0 commit comments

Comments
 (0)