[CI] Resolve transformers-neuronx version conflict (#12925)
This commit is contained in:
parent
011e612d92
commit
c45d398e6f
@ -29,9 +29,6 @@ if [ -f /tmp/neuron-docker-build-timestamp ]; then
|
|||||||
docker image prune -f
|
docker image prune -f
|
||||||
# Remove unused volumes / force the system prune for old images as well.
|
# Remove unused volumes / force the system prune for old images as well.
|
||||||
docker volume prune -f && docker system prune -f
|
docker volume prune -f && docker system prune -f
|
||||||
# Remove huggingface model artifacts and compiler cache
|
|
||||||
rm -rf "${HF_MOUNT:?}/*"
|
|
||||||
rm -rf "${NEURON_COMPILE_CACHE_MOUNT:?}/*"
|
|
||||||
echo "$current_time" > /tmp/neuron-docker-build-timestamp
|
echo "$current_time" > /tmp/neuron-docker-build-timestamp
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -23,10 +23,12 @@ WORKDIR ${APP_MOUNT}/vllm
|
|||||||
RUN python3 -m pip install --upgrade pip
|
RUN python3 -m pip install --upgrade pip
|
||||||
RUN python3 -m pip install --no-cache-dir fastapi ninja tokenizers pandas
|
RUN python3 -m pip install --no-cache-dir fastapi ninja tokenizers pandas
|
||||||
RUN python3 -m pip install sentencepiece transformers==4.45.2 -U
|
RUN python3 -m pip install sentencepiece transformers==4.45.2 -U
|
||||||
RUN python3 -m pip install transformers-neuronx --extra-index-url=https://pip.repos.neuron.amazonaws.com -U
|
|
||||||
RUN python3 -m pip install neuronx-cc==2.16.345.0 --extra-index-url=https://pip.repos.neuron.amazonaws.com -U
|
RUN python3 -m pip install neuronx-cc==2.16.345.0 --extra-index-url=https://pip.repos.neuron.amazonaws.com -U
|
||||||
RUN python3 -m pip install pytest
|
RUN python3 -m pip install pytest
|
||||||
|
|
||||||
|
# uninstall transformers-neuronx package explicitly to avoid version conflict
|
||||||
|
RUN python3 -m pip uninstall -y transformers-neuronx
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
ARG GIT_REPO_CHECK=0
|
ARG GIT_REPO_CHECK=0
|
||||||
RUN --mount=type=bind,source=.git,target=.git \
|
RUN --mount=type=bind,source=.git,target=.git \
|
||||||
@ -43,6 +45,10 @@ RUN --mount=type=bind,source=.git,target=.git \
|
|||||||
# install development dependencies (for testing)
|
# install development dependencies (for testing)
|
||||||
RUN python3 -m pip install -e tests/vllm_test_utils
|
RUN python3 -m pip install -e tests/vllm_test_utils
|
||||||
|
|
||||||
|
# install transformers-neuronx package as an optional dependencies (for V0)
|
||||||
|
# FIXME: `--no-deps` argument is temporarily added to resolve transformers package version conflict
|
||||||
|
RUN python3 -m pip install transformers-neuronx==0.13.* --extra-index-url=https://pip.repos.neuron.amazonaws.com -U --no-deps
|
||||||
|
|
||||||
# overwrite entrypoint to run bash script
|
# overwrite entrypoint to run bash script
|
||||||
RUN echo "import subprocess; import sys; subprocess.check_call(sys.argv[1:])" > /usr/local/bin/dockerd-entrypoint.py
|
RUN echo "import subprocess; import sys; subprocess.check_call(sys.argv[1:])" > /usr/local/bin/dockerd-entrypoint.py
|
||||||
|
|
||||||
|
@ -2,6 +2,5 @@
|
|||||||
-r requirements-common.txt
|
-r requirements-common.txt
|
||||||
|
|
||||||
# Dependencies for Neuron devices
|
# Dependencies for Neuron devices
|
||||||
transformers-neuronx >= 0.13.0
|
|
||||||
torch-neuronx >= 2.5.0
|
torch-neuronx >= 2.5.0
|
||||||
neuronx-cc
|
neuronx-cc
|
||||||
|
7
setup.py
7
setup.py
@ -374,12 +374,7 @@ def _is_hip() -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def _is_neuron() -> bool:
|
def _is_neuron() -> bool:
|
||||||
torch_neuronx_installed = True
|
return VLLM_TARGET_DEVICE == "neuron"
|
||||||
try:
|
|
||||||
subprocess.run(["neuron-ls"], capture_output=True, check=True)
|
|
||||||
except (FileNotFoundError, PermissionError, subprocess.CalledProcessError):
|
|
||||||
torch_neuronx_installed = False
|
|
||||||
return torch_neuronx_installed or VLLM_TARGET_DEVICE == "neuron"
|
|
||||||
|
|
||||||
|
|
||||||
def _is_tpu() -> bool:
|
def _is_tpu() -> bool:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user