diff --git a/docs/source/getting_started/amd-installation.rst b/docs/source/getting_started/amd-installation.rst index 14ece960cd233..6fb072a0c3c9f 100644 --- a/docs/source/getting_started/amd-installation.rst +++ b/docs/source/getting_started/amd-installation.rst @@ -75,7 +75,7 @@ You can build and install vLLM from source: .. code-block:: console $ pip install xformers==0.0.23 --no-deps - $ bash patch_xformers-0.0.23.rocm.sh + $ bash patch_xformers.rocm.sh 3. Build vLLM. @@ -132,7 +132,7 @@ Alternatively, if you plan to install vLLM-ROCm on a local machine or start from .. code-block:: console $ pip install xformers==0.0.23 --no-deps - $ bash patch_xformers-0.0.23.rocm.sh + $ bash patch_xformers.rocm.sh 3. Build vLLM. diff --git a/patch_xformers-0.0.23.rocm.sh b/patch_xformers.rocm.sh similarity index 56% rename from patch_xformers-0.0.23.rocm.sh rename to patch_xformers.rocm.sh index 4ba3a00fdd719..de427b24d306f 100644 --- a/patch_xformers-0.0.23.rocm.sh +++ b/patch_xformers.rocm.sh @@ -1,21 +1,32 @@ #!/bin/bash +set -e + +XFORMERS_VERSION="0.0.23" + +export XFORMERS_INSTALLED_VERSION=$(python -c 'import xformers; print(xformers.__version__)') + +if [ "$XFORMERS_INSTALLED_VERSION" != "$XFORMERS_VERSION" ]; then + echo "ERROR: xformers version must be ${XFORMERS_VERSION}. ${XFORMERS_INSTALLED_VERSION} is installed" + exit 1 +fi + export XFORMERS_FMHA_FLASH_PATH=$(python -c 'from xformers import ops as xops; print(xops.fmha.flash.__file__)') export XFORMERS_FMHA_COMMON_PATH=$(python -c 'from xformers import ops as xops; print(xops.fmha.common.__file__)') -echo $XFORMERS_FMHA_FLASH_PATH -echo $XFORMERS_FMHA_COMMON_PATH +echo "XFORMERS_FMHA_FLASH_PATH = ${XFORMERS_FMHA_FLASH_PATH}" +echo "XFORMERS_FMHA_COMMON_PATH = ${XFORMERS_FMHA_COMMON_PATH}" -if ! patch -R -p0 -s -f --dry-run $XFORMERS_FMHA_FLASH_PATH "./rocm_patch/flashpy_xformers-0.0.23.rocm.patch"; then +if ! patch -R -p0 -s -f --dry-run $XFORMERS_FMHA_FLASH_PATH "./rocm_patch/flashpy_xformers-${XFORMERS_VERSION}.rocm.patch"; then echo "Applying patch to ${XFORMERS_FMHA_FLASH_PATH}" - patch -p0 $XFORMERS_FMHA_FLASH_PATH "./rocm_patch/flashpy_xformers-0.0.23.rocm.patch" + patch -p0 $XFORMERS_FMHA_FLASH_PATH "./rocm_patch/flashpy_xformers-${XFORMERS_VERSION}.rocm.patch" echo "Successfully patch ${XFORMERS_FMHA_FLASH_PATH}" else echo "${XFORMERS_FMHA_FLASH_PATH} was patched before" fi -if ! patch -R -p0 -s -f --dry-run $XFORMERS_FMHA_COMMON_PATH "./rocm_patch/commonpy_xformers-0.0.23.rocm.patch"; then +if ! patch -R -p0 -s -f --dry-run $XFORMERS_FMHA_COMMON_PATH "./rocm_patch/commonpy_xformers-${XFORMERS_VERSION}.rocm.patch"; then echo "Applying patch to ${XFORMERS_FMHA_COMMON_PATH}" - patch -p0 $XFORMERS_FMHA_COMMON_PATH "./rocm_patch/commonpy_xformers-0.0.23.rocm.patch" + patch -p0 $XFORMERS_FMHA_COMMON_PATH "./rocm_patch/commonpy_xformers-${XFORMERS_VERSION}.rocm.patch" echo "Successfully patch ${XFORMERS_FMHA_COMMON_PATH}" else echo "${XFORMERS_FMHA_COMMON_PATH} was patched before"