[AMD] support gfx1250 on ROCM 10 (#36871)
Co-authored-by: HAI <hixiao@gmail.com> Co-authored-by: Kao <akao@amd.com> Co-authored-by: wunhuang <wunhuang@amd.com> Co-authored-by: Thomas Wang <1am9trash@gmail.com> Co-authored-by: Xinyi Song <86638975+RolaoDenthu@users.noreply.github.com> Co-authored-by: Lin, Soga <soga.lin@amd.com> Co-authored-by: kk <43161300+kkHuang-amd@users.noreply.github.com> Co-authored-by: Bingxu Chen <bingxche@amd.com> Co-authored-by: sogalin_codegen <39478626+sogalin@users.noreply.github.com> Co-authored-by: Thomas Wang <thomawan@amd.com>
This commit is contained in:
co-authored by
HAI
Kao
wunhuang
Thomas Wang
Xinyi Song
Lin, Soga
kk
Bingxu Chen
sogalin_codegen
Thomas Wang
parent
712a720c8a
commit
3865efc9f7
@@ -50,7 +50,7 @@ fi
|
||||
IMAGE_TORCH_VERSION=$(docker exec ci_sglang python3 -c 'import torch; print(torch.__version__)')
|
||||
IMAGE_HIP_VERSION=$(docker exec ci_sglang python3 -c 'import torch; print(torch.version.hip or "")')
|
||||
IMAGE_GPU_ARCH=$(docker exec ci_sglang printenv GPU_ARCH 2>/dev/null || true)
|
||||
if [[ "${IMAGE_GPU_ARCH}" =~ ^(gfx942|gfx950)(-rocm720|-rocm724|-rocm1000)?$ ]]; then
|
||||
if [[ "${IMAGE_GPU_ARCH}" =~ ^(gfx942|gfx950|gfx1250)(-rocm720|-rocm724|-rocm1000)?$ ]]; then
|
||||
echo "[CI-IMAGE] Image GPU_ARCH=${IMAGE_GPU_ARCH}"
|
||||
case "${IMAGE_GPU_ARCH}" in
|
||||
*-rocm724) IMAGE_BASE_ARG_SUFFIX="_ROCM724"; IMAGE_STAGE_SUFFIX="-rocm724" ;;
|
||||
@@ -259,6 +259,11 @@ if docker exec ci_sglang test -d /sgl-workspace/mori; then
|
||||
MORI_REPO=$(grep -E '^[[:space:]]*ARG[[:space:]]+MORI_REPO=' docker/rocm.Dockerfile | head -n1 | sed 's/.*MORI_REPO="\([^"]*\)".*/\1/')
|
||||
MORI_COMMIT=$(grep -E '^[[:space:]]*ARG[[:space:]]+MORI_COMMIT=' docker/rocm.Dockerfile | head -n1 | sed 's/.*MORI_COMMIT="\([^"]*\)".*/\1/')
|
||||
|
||||
if [[ -z "${MORI_COMMIT}" ]]; then
|
||||
echo "[MORI] ERROR: Failed to extract MORI_COMMIT from Dockerfile"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${GPU_ARCH}" == "mi35x" ]]; then
|
||||
MORI_GPU_ARCHS="gfx950"
|
||||
else
|
||||
@@ -290,8 +295,18 @@ if docker exec ci_sglang test -d /sgl-workspace/mori; then
|
||||
fi
|
||||
# The pip ROCm SDK vendors NUMA and libdrm under rocm_sysdeps, outside the
|
||||
# default compiler, CMake, and linker search paths used by MORI.
|
||||
# gfx1250 additionally needs the SDK's own cmake trees on the prefix path:
|
||||
# that is what lets hsakmt-config.cmake resolve find_dependency(NUMA)
|
||||
# without patching MORI's CMakeLists. Same split as docker/rocm.Dockerfile.
|
||||
ROCM_SYSDEPS="\${ROCM_HOME:-/opt/rocm}/lib/rocm_sysdeps"
|
||||
if [ '${IMAGE_STAGE_SUFFIX}' = '-rocm1000' ] && [ -d "\${ROCM_SYSDEPS}" ]; then
|
||||
if [ '${IMAGE_GFX}' = 'gfx1250' ] && [ -d "\${ROCM_SYSDEPS}" ]; then
|
||||
export PATH="\${ROCM_HOME}/bin:\${PATH}"
|
||||
export CMAKE_PREFIX_PATH="\${ROCM_SYSDEPS}/lib/cmake:\${ROCM_SYSDEPS}:\${ROCM_HOME}/lib/cmake:\${ROCM_HOME}\${CMAKE_PREFIX_PATH:+:\${CMAKE_PREFIX_PATH}}"
|
||||
export CPATH="\${ROCM_SYSDEPS}/include\${CPATH:+:\${CPATH}}"
|
||||
export LIBRARY_PATH="\${ROCM_SYSDEPS}/lib\${LIBRARY_PATH:+:\${LIBRARY_PATH}}"
|
||||
echo "\${ROCM_SYSDEPS}/lib" > /etc/ld.so.conf.d/rocm-sysdeps.conf
|
||||
ldconfig
|
||||
elif [ '${IMAGE_STAGE_SUFFIX}' = '-rocm1000' ] && [ -d "\${ROCM_SYSDEPS}" ]; then
|
||||
export CMAKE_PREFIX_PATH="\${ROCM_SYSDEPS}\${CMAKE_PREFIX_PATH:+:\${CMAKE_PREFIX_PATH}}"
|
||||
export CPATH="\${ROCM_SYSDEPS}/include\${CPATH:+:\${CPATH}}"
|
||||
export LIBRARY_PATH="\${ROCM_SYSDEPS}/lib\${LIBRARY_PATH:+:\${LIBRARY_PATH}}"
|
||||
@@ -331,11 +346,11 @@ echo "[CI-AITER-CHECK] Runner GPU_ARCH=${GPU_ARCH}"
|
||||
# 1. Extract AITER_COMMIT from the Dockerfile stage that built this image, as
|
||||
# identified near the top of this script.
|
||||
#############################################
|
||||
if [[ "${IMAGE_GFX}" == "gfx950" ]]; then
|
||||
_from_line="FROM \$BASE_IMAGE_950${IMAGE_BASE_ARG_SUFFIX} AS gfx950${IMAGE_STAGE_SUFFIX}"
|
||||
else
|
||||
_from_line="FROM \$BASE_IMAGE_942${IMAGE_BASE_ARG_SUFFIX} AS gfx942${IMAGE_STAGE_SUFFIX}"
|
||||
fi
|
||||
case "${IMAGE_GFX}" in
|
||||
gfx950) _from_line="FROM \$BASE_IMAGE_950${IMAGE_BASE_ARG_SUFFIX} AS gfx950${IMAGE_STAGE_SUFFIX}" ;;
|
||||
gfx1250) _from_line="FROM \$BASE_IMAGE_1250${IMAGE_BASE_ARG_SUFFIX} AS gfx1250${IMAGE_STAGE_SUFFIX}" ;;
|
||||
*) _from_line="FROM \$BASE_IMAGE_942${IMAGE_BASE_ARG_SUFFIX} AS gfx942${IMAGE_STAGE_SUFFIX}" ;;
|
||||
esac
|
||||
echo "[CI-AITER-CHECK] Using ${_from_line} from Dockerfile..."
|
||||
REPO_AITER_COMMIT=$(grep -F -A20 "${_from_line}" docker/rocm.Dockerfile \
|
||||
| grep 'AITER_COMMIT_DEFAULT=' \
|
||||
|
||||
Reference in New Issue
Block a user