[ROCm][CI] Fix test repo-root assumptions (#39053)
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
This commit is contained in:
@@ -15,8 +15,9 @@
|
|||||||
|
|
||||||
# set -xe
|
# set -xe
|
||||||
|
|
||||||
# Find the git repository root directory
|
# Resolve the repository root from the script location instead of `.git`.
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
|
|
||||||
# Model to test
|
# Model to test
|
||||||
MODEL="${MODEL:-Qwen/Qwen2.5-VL-3B-Instruct}"
|
MODEL="${MODEL:-Qwen/Qwen2.5-VL-3B-Instruct}"
|
||||||
|
|||||||
@@ -85,8 +85,11 @@ DECODE_BLOCK_SIZE=${DECODE_BLOCK_SIZE:-128}
|
|||||||
# Comma-separated extra args for vllm serve (e.g. --max-model-len,2048)
|
# Comma-separated extra args for vllm serve (e.g. --max-model-len,2048)
|
||||||
VLLM_SERVE_EXTRA_ARGS=${VLLM_SERVE_EXTRA_ARGS:-}
|
VLLM_SERVE_EXTRA_ARGS=${VLLM_SERVE_EXTRA_ARGS:-}
|
||||||
|
|
||||||
# Find the git repository root directory
|
# Resolve the repository root from the script location instead of `.git`.
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
# The ROCm CI image copies `/vllm-workspace` without the Git metadata, so
|
||||||
|
# `git rev-parse --show-toplevel` is not reliable at runtime.
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
|
|
||||||
SMI_BIN=$(which nvidia-smi || which rocm-smi || echo "")
|
SMI_BIN=$(which nvidia-smi || which rocm-smi || echo "")
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,9 @@ MODELS=(
|
|||||||
"Qwen/Qwen3-0.6B"
|
"Qwen/Qwen3-0.6B"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Find the git repository root directory
|
# Resolve the repository root from the script location instead of `.git`.
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
|
|
||||||
# Trap the SIGINT signal (triggered by Ctrl+C)
|
# Trap the SIGINT signal (triggered by Ctrl+C)
|
||||||
trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT
|
trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ BLOCK_SIZE=${BLOCK_SIZE:-32}
|
|||||||
|
|
||||||
|
|
||||||
# execution env
|
# execution env
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
||||||
CONDA_PATH=${CONDA_PATH:-"/home/${USER}/anaconda3"}
|
CONDA_PATH=${CONDA_PATH:-"/home/${USER}/anaconda3"}
|
||||||
CONDA_ENV_NAME=${CONDA_ENV_NAME:-"nixl"}
|
CONDA_ENV_NAME=${CONDA_ENV_NAME:-"nixl"}
|
||||||
@@ -153,4 +154,4 @@ echo "-----P/D success----"
|
|||||||
rm "${OUTPUT_FILE}"
|
rm "${OUTPUT_FILE}"
|
||||||
cleanup
|
cleanup
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ BLOCK_SIZE=${BLOCK_SIZE:-32}
|
|||||||
|
|
||||||
|
|
||||||
# execution env
|
# execution env
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
||||||
CONDA_PATH=${CONDA_PATH:-"/home/${USER}/anaconda3"}
|
CONDA_PATH=${CONDA_PATH:-"/home/${USER}/anaconda3"}
|
||||||
CONDA_ENV_NAME=${CONDA_ENV_NAME:-"nixl"}
|
CONDA_ENV_NAME=${CONDA_ENV_NAME:-"nixl"}
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ DECODER_ZE_AFFINITY_MASK=${DECODER_ZE_AFFINITY_MASK:-$(generate_affinity_mask "$
|
|||||||
|
|
||||||
|
|
||||||
# execution env
|
# execution env
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
EXP_ROOT="${GIT_ROOT}/tests/v1/kv_connector/nixl_integration"
|
||||||
|
|
||||||
OUTPUT_FILE=${OUTPUT_FILE:-"${EXP_ROOT}/.xpu_accuracy_test_outputs.txt"}
|
OUTPUT_FILE=${OUTPUT_FILE:-"${EXP_ROOT}/.xpu_accuracy_test_outputs.txt"}
|
||||||
|
|||||||
@@ -52,7 +52,9 @@ DECODER_TP_SIZE=${DECODER_TP_SIZE:-1}
|
|||||||
GPU_MEMORY_UTILIZATION=${GPU_MEMORY_UTILIZATION:-0.7}
|
GPU_MEMORY_UTILIZATION=${GPU_MEMORY_UTILIZATION:-0.7}
|
||||||
BLOCK_SIZE=${BLOCK_SIZE:-16}
|
BLOCK_SIZE=${BLOCK_SIZE:-16}
|
||||||
|
|
||||||
GIT_ROOT=$(git rev-parse --show-toplevel)
|
# Resolve the repository root from the script location instead of `.git`.
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
GIT_ROOT="${GIT_ROOT:-$(cd -- "${SCRIPT_DIR}/../../../.." && pwd -P)}"
|
||||||
|
|
||||||
SMI_BIN=$(which nvidia-smi || which rocm-smi || echo "")
|
SMI_BIN=$(which nvidia-smi || which rocm-smi || echo "")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user