update

flexflow · Oct 29, 2024 · 84836b3 · 84836b3
1 parent c052e06
commit 84836b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/suffix_decoding/benchmark_specinfer.sh b/suffix_decoding/benchmark_specinfer.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-# set -x
+set -x
 set -e
 
 # Cd into directory holding this script
@@ -54,11 +54,10 @@ python ../inference/utils/download_hf_model.py --half-precision-only $model_name
 export LEGION_BACKTRACE=1
 
 for i in "${!partitions[@]}"; do
-    partition_name=${partitions[$i]}
-    rm /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}.csv || true
     for j in "${!batch_sizes[@]}"; do
     for k in "${!max_tree_depths[@]}"; do
     for l in "${!expansion_degrees[@]}"; do
+        partition_name=${partitions[$i]}
         batch_size=${batch_sizes[$j]}
         max_tree_depth=${max_tree_depths[$k]}
         expansion_degree=${expansion_degrees[$l]}
@@ -67,6 +66,7 @@ for i in "${!partitions[@]}"; do
         # create model name version where "/" is replaced with "-"
         model_name_=$(echo $model_name | tr / -)
         small_model_name_=$(echo $small_model_name | tr / -)
+        rm /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}_${model_name_}_${small_model_name_}_${batch_size}_${max_tree_depth}_${expansion_degree}.csv || true
         rm /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}_${model_name_}_${small_model_name_}_${batch_size}_${max_tree_depth}_${expansion_degree}.out || true
 
         time ./inference/suffix_decoding/specinfer \
@@ -85,7 +85,7 @@ for i in "${!partitions[@]}"; do
             -trace /home/yak/goliaro/suffix-tree-decoding/trace/llama70b/cortex.json \
             -trace-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_ff_speciner_${partition_name}.json \
             -output-file /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}_${model_name_}_${small_model_name_}_${batch_size}_${max_tree_depth}_${expansion_degree}.out \
-            -csv-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}.csv \
+            -csv-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_specinfer_${partition_name}_${model_name_}_${small_model_name_}_${batch_size}_${max_tree_depth}_${expansion_degree}.csv \
             -target-partition ${partition_name}
     done
     done

diff --git a/suffix_decoding/benchmark_suffix_tree.sh b/suffix_decoding/benchmark_suffix_tree.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-# set -x
+set -x
 set -e
 
 # Cd into directory holding this script
@@ -61,12 +61,11 @@ python ../inference/utils/download_hf_model.py --half-precision-only $model_name
 export LEGION_BACKTRACE=1
 
 for i in "${!partitions[@]}"; do
-    partition_name=${partitions[$i]}
-    rm /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}.csv || true
     for j in "${!batch_sizes[@]}"; do
     for k in "${!matching_strategies[@]}"; do
     for l in "${!online_tree_update[@]}"; do
     for td in "${!max_tree_depths[@]}"; do
+        partition_name=${partitions[$i]}
         batch_size=${batch_sizes[$j]}
         matching_strategy=${matching_strategies[$k]}
         otu=${online_tree_update[$k]}
@@ -75,6 +74,7 @@ for i in "${!partitions[@]}"; do
         echo "Running partition ${partition_name} with model ${model_name}, batch size ${batch_size}, and tokens per batch ${tokens_per_batch} with matching strategy ${matching_strategy}, online tree update ${otu}, and max tree depth ${max_tree_depth}"
         # create model name version where "/" is replaced with "-"
         model_name_=$(echo $model_name | tr / -)
+        rm /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}_${model_name_}_${batch_size}_${batch_size}_${matching_strategy}_otu-${otu}_max_tree_depth-${max_tree_depth}.csv || true
         rm /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}_${model_name_}_${batch_size}_${batch_size}_${matching_strategy}_otu-${otu}_max_tree_depth-${max_tree_depth}.out || true
 
         otu_arg=""
@@ -98,7 +98,7 @@ for i in "${!partitions[@]}"; do
             -trace /home/yak/goliaro/suffix-tree-decoding/trace/llama70b/cortex.json \
             -trace-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_ff_${partition_name}.json \
             -output-file /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}_${model_name_}_${batch_size}_${matching_strategy}_otu-${otu}_max_tree_depth-${max_tree_depth}.out \
-            -csv-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}.csv \
+            -csv-output-path /home/yak/goliaro/FlexFlow/inference/output/cortex_${partition_name}_${model_name_}_${batch_size}_${batch_size}_${matching_strategy}_otu-${otu}_max_tree_depth-${max_tree_depth}.csv \
             -target-partition ${partition_name}
     done
     done