Skip to content

Commit 857b11e

Browse files
committed
fix(ascend): preserve inference base contract
1 parent 47f4420 commit 857b11e

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

docker/ascend/Dockerfile.inference

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,21 @@ ENV FLAGSCALE_VLLM_PLUGIN_REF=${VLLM_PLUGIN_FL_REF}
3333
COPY tools/install /workspace/tools/install
3434
COPY requirements /workspace/requirements
3535

36+
# The immutable vendor base contains unrelated package metadata findings.
37+
# Installing the pinned plugin must not introduce any additional conflicts.
38+
RUN python -m pip check 2>&1 | sort > /tmp/pip-check.before || true
39+
3640
RUN chmod +x /workspace/tools/install/*.sh \
3741
/workspace/tools/install/utils/*.sh \
3842
/workspace/tools/install/ascend/*.sh && \
3943
/workspace/tools/install/install.sh --platform ascend --task inference \
40-
--pkg-mgr pip --no-system --no-dev --no-base && \
41-
python -m pip check && \
44+
--pkg-mgr pip --no-system --no-dev --no-base
45+
46+
RUN python -m pip check 2>&1 | sort > /tmp/pip-check.after || true
47+
48+
RUN diff -u /tmp/pip-check.before /tmp/pip-check.after && \
49+
cat /tmp/pip-check.after && \
50+
rm -f /tmp/pip-check.before /tmp/pip-check.after && \
4251
rm -rf /opt/flagscale/deps /workspace/tools /workspace/requirements
4352

4453
WORKDIR /workspace

requirements/ascend/inference.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# install_inference.sh installs the matching vllm-plugin-FL from a fixed commit
1111
# without replacing those core runtime packages.
1212

13-
# Resolve metadata conflicts in the candidate base without changing its
14-
# torch/torch-npu/vLLM stack.
15-
pandas==2.2.3
16-
opencv-python-headless==4.11.0.86
13+
# No additional Python packages are installed here. The immutable base owns
14+
# the complete torch/torch-npu/vLLM/FlagGems runtime; replacing any of those
15+
# transitive dependencies would invalidate the vendor-tested stack.

tools/install/ascend/install_inference.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import importlib.metadata as metadata
6767
6868
vllm_version = metadata.version("vllm")
6969
plugin_version = metadata.version("vllm-plugin-fl")
70-
flaggems_version = metadata.version("flaggems")
70+
flaggems_version = metadata.version("flag_gems")
7171
platform_plugins = {
7272
entry.name: entry.value
7373
for entry in metadata.entry_points(group="vllm.platform_plugins")

0 commit comments

Comments
 (0)