More refactor

Signed-off-by: jthomson04 <[email protected]>

Author: jthomson04

components/backends/trtllm/performance_sweeps/submit_disagg.sh

@@ -102,171 +102,6 @@ run_single() {
     set +x
 }
 
-# MTP0 Configuration (gen_mtp_size=0)
-run_4_gpus_mtp0() {
-    echo "Running 4 GPUs MTP0 combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 5 4 128 128 false "0.9" 0 0 "1 2 4 8 16 32 64 128 192"
-        run_single 1 5 4 64 64 true "0.85" 0 0 "256 384"
-        run_single 1 4 4 128 128 true "0.85" 0 0 "512 768"
-        run_single 2 5 4 256 256 true "0.85" 0 0 "1024 1536"
-        run_single 1 2 4 512 512 true "0.85" 0 0 "2048 3072"
-        run_single 2 3 4 768 768 true "0.85" 0 0 "3072 4096"
-    else
-        run_single 1 5 4 16 16 false "0.9" 0 0 "1 2 4 8 16 24"
-        run_single 1 4 4 32 32 false "0.9" 0 0 "32 48"
-        run_single 2 5 4 64 64 false "0.9" 0 0 "64 96"
-        run_single 1 2 4 128 128 false "0.9" 0 0 "128 192"
-        run_single 1 1 4 64 64 true "0.8" 0 0 "256 384"
-        run_single 3 2 4 128 128 true "0.8" 0 0 "512 768"
-    fi
-}
-
-run_8_gpus_mtp0() {
-    echo "Running 8 GPUs MTP0 combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 4 8 128 128 false "0.9" 0 0 "1 2 4 8 16 32 64 128 192 256"
-        run_single 1 4 8 32 32 true "0.8" 0 0 "256 384"
-        run_single 1 3 8 64 64 true "0.8" 0 0 "512 768"
-        run_single 1 2 8 128 128 true "0.8" 0 0 "1024 1536"
-        run_single 1 1 8 256 256 true "0.8" 0 0 "2048 3072"
-        run_single 1 1 8 512 512 true "0.8" 0 0 "4096 6144"
-        run_single 3 2 8 768 768 true "0.8" 0 0 "6144 8192"
-        run_single 3 2 8 1024 1024 true "0.8" 0 0 "8192 12288"
-    else
-        run_single 1 4 8 16 16 false "0.9" 0 0 "1 2 4 8 16 24"
-        run_single 1 3 8 32 32 false "0.9" 0 0 "32 48"
-        run_single 1 2 8 64 64 false "0.9" 0 0 "64 96"
-        run_single 1 1 8 128 128 false "0.9" 0 0 "128 192"
-        run_single 3 2 8 32 32 true "0.8" 0 0 "256 384"
-        run_single 5 2 8 64 64 true "0.8" 0 0 "512 768"
-        run_single 4 1 8 128 128 true "0.8" 0 0 "1024 1536"
-        run_single 5 1 8 256 256 true "0.8" 0 0 "2048 3072"
-    fi
-}
-
-run_16_gpus_mtp0() {
-    echo "Running 16 GPUs MTP0 combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 1 16 64 64 true "0.75" 0 0 "16 32 64 128 256 512 1024 1536"
-        run_single 2 1 16 128 128 true "0.75" 0 256 "2048 3072"
-        run_single 2 1 16 256 256 true "0.75" 0 256 "4096 6144"
-        run_single 3 1 16 512 512 true "0.75" 0 256 "8192 12288"
-        run_single 3 1 16 768 768 true "0.75" 0 256 "12288 16384"
-        run_single 3 1 16 1024 1024 true "0.75" 0 288 "16384 20480"
-    else
-        run_single 1 1 16 8 8 true "0.8" 0 0 "16 32 64 128 192" # 5
-        run_single 2 1 16 16 16 true "0.8" 0 0 "256 384"        # 6
-        run_single 3 1 16 32 32 true "0.8" 0 0 "512 768"       # 7
-        run_single 6 1 16 64 64 true "0.8" 0 0 "1024 1536"     # 10
-        run_single 8 1 16 128 128 true "0.8" 0 256 "2048 3072"   # 12
-        run_single 10 1 16 256 256 true "0.8" 0 256 "4096 6144" # 14
-    fi
-}
-
-run_32_gpus_mtp0() {
-    echo "Running 32 GPUs MTP0 combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 1 32 32 32 true "0.7" 0 0 "32 64 128 256 512 1024 1536"
-        run_single 2 1 32 64 64 true "0.7" 0 256 "2048 3072"
-        run_single 3 1 32 128 128 true "0.7" 0 288 "4096 6144"
-        run_single 4 1 32 256 256 true "0.7" 0 288 "8192 12288"
-        run_single 5 1 32 512 512 true "0.7" 0 288 "16384 20480"
-    else
-        run_single 1 1 32 4 4 true "0.7" 0 0 "32 64 128 192"  # 9
-        run_single 2 1 32 8 8 true "0.7" 0 0 "256 384"          # 10
-        run_single 4 1 32 16 16 true "0.7" 0 0 "512 768"       # 12
-        run_single 7 1 32 32 32 true "0.7" 0 0 "1024 1536"     # 15
-    fi
-}
-
-# MTP Configuration (gen_mtp_size=1,2,3)
-run_4_gpus_mtp() {
-    echo "Running 4 GPUs MTP combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 5 4 32 128 false "0.9" 3 0 "1 2 4 8 16 32 48"
-        run_single 1 5 4 32 128 true "0.9" 3 0 "64 128 192"
-        run_single 1 4 4 64 256 true "0.9" 3 0 "256 384"
-        run_single 1 3 4 128 512 true "0.9" 3 0 "512 768"
-        run_single 1 2 4 256 768 true "0.9" 2 0 "1024 1536"
-        run_single 2 3 4 512 1024 true "0.9" 1 0 "2048 3072"
-        run_single 1 1 4 768 1536 true "0.9" 1 0 "3072 4096"
-    else
-        run_single 1 5 4 8 32 false "0.9" 3 0 "1 2 4 8 12"
-        run_single 1 4 4 16 64 false "0.9" 3 0 "16 24"
-        run_single 1 3 4 32 128 false "0.9" 3 0 "32 48"
-        run_single 2 3 4 16 64 true "0.8" 3 0 "64 96"
-        run_single 1 1 4 32 128 true "0.8" 3 0 "128 192"
-        run_single 2 1 4 64 256 true "0.8" 2 0 "256 384"
-        run_single 5 2 4 128 512 true "0.8" 1 0 "512 768"
-    fi
-}
-
-run_8_gpus_mtp() {
-    echo "Running 8 GPUs MTP combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 4 8 32 128 false "0.9" 3 0 "1 2 4 8 16 32 48"
-        run_single 1 4 8 16 64 true "0.8" 3 0 "64 128 192"
-        run_single 1 3 8 32 128 true "0.8" 3 0 "256 384"
-        run_single 1 2 8 64 256 true "0.8" 3 0 "512 768"
-        run_single 1 1 8 128 512 true "0.8" 3 0 "1024 1536"
-        run_single 1 1 8 256 512 true "0.8" 1 0 "2048 3072"
-        run_single 3 2 8 512 1024 true "0.8" 1 0 "4096 6144"
-        run_single 3 2 8 768 1536 true "0.8" 1 0 "6144 8192"
-        run_single 3 2 8 1024 2048 true "0.8" 1 0 "8192 12288"
-    else
-        run_single 1 4 8 8 32 false "0.9" 3 0 "1 2 4 8 12"
-        run_single 1 3 8 16 64 false "0.9" 3 0 "16 24"
-        run_single 1 2 8 32 128 false "0.9" 3 0 "32 48"
-        run_single 1 1 8 8 32 true "0.8" 3 0 "64 96"
-        run_single 3 2 8 16 64 true "0.8" 3 0 "128 192"
-        run_single 5 2 8 32 128 true "0.8" 3 0 "256 384"
-        run_single 7 2 8 64 256 true "0.8" 2 0 "512 768"
-        run_single 5 1 8 128 256 true "0.8" 1 0 "1024 1536"
-        run_single 6 1 8 256 512 true "0.8" 1 0 "2048 3072"
-    fi
-}
-
-run_16_gpus_mtp() {
-    echo "Running 16 GPUs MTP combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 1 16 32 128 true "0.7" 3 0 "16 32 64 128 256 512 768"
-        run_single 1 1 16 64 256 true "0.7" 3 256 "1024 1536"
-        run_single 2 1 16 128 256 true "0.7" 1 288 "2048 3072"
-        run_single 2 1 16 256 512 true "0.7" 1 288 "4096 6144"
-        run_single 3 1 16 512 1024 true "0.7" 1 288 "8192 12288"
-        run_single 3 1 16 768 1536 true "0.7" 1 288 "12288 16384"
-        run_single 3 1 16 1024 1024 true "0.75" 0 288 "16384 20480"
-    else
-        run_single 1 1 16 4 16 true "0.8" 3 0 "16 32 64 96" # 5
-        run_single 2 1 16 8 32 true "0.8" 3 0 "128 192"       # 6
-        run_single 4 1 16 16 64 true "0.8" 3 0 "256 384"      # 8
-        run_single 6 1 16 32 128 true "0.8" 3 0 "512 768"    # 10
-        run_single 8 1 16 64 256 true "0.8" 2 256 "1024 1536" # 13
-        run_single 10 1 16 128 256 true "0.8" 1 256 "2048 3072" # 15
-        run_single 12 1 16 256 512 true "0.8" 1 256 "4096 6144" # 16
-    fi
-
-}
-
-run_32_gpus_mtp() {
-    echo "Running 32 GPUs MTP combinations..."
-    if (( ISL == OSL )); then
-        run_single 1 1 32 16 64 true "0.6" 3 0 "32 64 128 256 512 768"
-        run_single 2 1 32 32 128 true "0.6" 3 288 "1024 1536"
-        run_single 3 1 32 64 256 true "0.6" 3 288 "2048 3072"
-        run_single 3 1 32 128 256 true "0.6" 1 288 "4096 6144"
-        run_single 4 1 32 256 512 true "0.6" 1 288 "8192 12288"
-        run_single 5 1 32 512 1024 true "0.6" 1 288 "16384 20480"
-    else
-        run_single 1 1 32 1 4 true "0.7" 3 0 "32 48" # 9
-        run_single 2 1 32 2 8 true "0.7" 3 0 "64 96" # 10
-        run_single 3 1 32 4 16 true "0.7" 3 0 "128 192" # 11
-        run_single 5 1 32 8 32 true "0.7" 3 0 "256 384" # 13
-        run_single 8 1 32 16 64 true "0.7" 3 256 "512 768" # 16
-    fi
-}
-
 # Main function
 main() {
     local mtp_mode=$1
@@ -279,99 +114,6 @@ main() {
     fi
 
     case $mode in
-        "all")
-            echo "Running all GPU configurations for $mtp_mode mode..."
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                run_4_gpus_mtp0
-                run_8_gpus_mtp0
-                run_16_gpus_mtp0
-                run_32_gpus_mtp0
-            else
-                run_4_gpus_mtp
-                run_8_gpus_mtp
-                run_16_gpus_mtp
-                run_32_gpus_mtp
-            fi
-            ;;
-        "pareto")
-            # 1k/1k
-            export ISL=1024
-            export OSL=1024
-            export CACHE_TRANSCEIVER_MAX_NUM_TOKENS=4608
-
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                # 1k/1k mtp=off
-                run_single 1 4 8 128 128 false "0.9" 0 0 "1 2 4 8 16 32 64 141"
-                run_single 1 1 32 32 32 true "0.7" 0 0 "1075"
-                run_single 1 1 16 64 64 true "0.75" 0 0 "1075"
-                run_single 2 1 16 256 256 true "0.75" 0 0 "2048 4300"
-                run_single 1 1 8 512 512 true "0.8" 0 0 "4300"
-
-            else
-                # 1k/1k mtp=on
-                run_single 1 4 8 32 128 false "0.9" 3 0 "1 2 4 8 16 36"
-                run_single 1 1 16 64 256 true "0.7" 3 0 "512 1075"
-                run_single 2 1 16 128 256 true "0.7" 1 0 "2150"
-                run_single 1 1 32 16 64 true "0.6" 3 0 "512"
-                run_single 1 1 8 256 512 true "0.8" 1 0 "2252"
-            fi
-
-            # 8k/1k
-            export ISL=8192
-            export OSL=1024
-            export CACHE_TRANSCEIVER_MAX_NUM_TOKENS=8448
-
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                # 8k/1k mtp=off
-                run_single 1 3 8 32 32 false "0.9" 0 0 "1 2 4 8 16 34"
-                run_single 4 1 32 16 16 true "0.7" 0 0 "256 538"
-                run_single 7 1 32 32 32 true "0.7" 0 0 "1075" # remove if need 5 cofigs
-                run_single 6 1 16 64 64 true "0.75" 0 0 "1075"
-                run_single 8 1 16 128 128 true "0.75" 0 0 "2150"
-                run_single 5 1 8 256 256 true "0.8" 0 0 "2150"
-            else
-                # 8k/1k mtp=on
-                run_single 1 3 8 16 64 false "0.9" 3 0 "1 2 4 8 18"
-                run_single 5 1 32 8 32 true "0.7" 3 0 "128 269"
-                run_single 8 1 32 16 64 true "0.7" 3 0 "538"
-                run_single 6 1 16 32 128 true "0.75" 3 0 "538" # remove if need 5 configs
-                run_single 8 1 16 64 256 true "0.75" 2 0 "1075"
-                run_single 5 1 8 128 256 true "0.8" 1 0 "1075" # remove if need 5 configs
-                run_single 6 1 8 256 512 true "0.8" 1 0 "2150"
-            fi
-            ;;
-        "4GPU")
-            echo "Running 4 GPUs combinations for $mtp_mode mode..."
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                run_4_gpus_mtp0
-            else
-                run_4_gpus_mtp
-            fi
-            ;;
-        "8GPU")
-            echo "Running 8 GPUs combinations for $mtp_mode mode..."
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                run_8_gpus_mtp0
-            else
-                run_8_gpus_mtp
-            fi
-            ;;
-        "16GPU")
-            echo "Running 16 GPUs combinations for $mtp_mode mode..."
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                run_16_gpus_mtp0
-            else
-                run_16_gpus_mtp
-            fi
-            ;;
-        "32GPU")
-            echo "Running 32 GPUs combinations for $mtp_mode mode..."
-            if [[ "$mtp_mode" == "mtp=off" ]]; then
-                run_32_gpus_mtp0
-            else
-                run_32_gpus_mtp
-            fi
-            ;;
         "tep")
             if [ $# -ne 14 ]; then
                 echo "Error: TEP mode requires 14 additional parameters (including mtp_mode)"
@@ -417,7 +159,7 @@ main() {
 
             echo "Running DEP mode ($mtp_mode) with ctx_num=$ctx_num, ctx_tp_size=$ctx_tp_size, ctx_enable_attention_dp=$ctx_enable_attention_dp, gen_num=$gen_num, gen_tp_size=$gen_tp_size, gen_ep_size=$gen_tp_size, gen_batch_size=$gen_batch_size, gen_max_num_tokens=$gen_max_num_tokens, gen_gpu_memory_fraction=$gen_gpu_memory_fraction, gen_mtp_size=$gen_mtp_size, gen_eplb_num_slots=$gen_eplb_num_slots, gen_concurrency_list=\"$gen_concurrency_list\""
 
-            run_single $ctx_num $ctx_tp_size $ctx_ep_size $ctx_enable_attention_dp $gen_num $gen_tp_size $gen_tp_size $gen_batch_size $gen_max_num_tokens $gen_gpu_memory_fraction $gen_mtp_size $gen_eplb_num_slots "$gen_concurrency_list"
+            run_single $ctx_num $ctx_tp_size $ctx_ep_size $ctx_enable_attention_dp $gen_num $gen_tp_size $gen_tp_size $gen_batch_size $gen_max_num_tokens true $gen_gpu_memory_fraction $gen_mtp_size $gen_eplb_num_slots "$gen_concurrency_list"
             ;;
         "tp")
             if [ $# -ne 14 ]; then