Skip to content

Commit f694274

Browse files
committed
fix by CR bot's comments
Signed-off-by: Lizhi Zhou <[email protected]>
1 parent a8c8005 commit f694274

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

docker/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ RUN_CMD ?=
138138
CONTAINER_NAME ?= tensorrt_llm
139139
WORK_DIR ?= $(CODE_DIR)
140140
DOCKER_PULL ?= 0
141+
BASE_DIR=`echo $PWD | sed 's/\//-/g'`
142+
GPU_OPTS=--gpus='"device=0,1,2,3,4,5,6"'
141143

142144
%_run:
143145
ifeq ($(IS_ROOTLESS),1)
@@ -153,13 +155,12 @@ endif
153155
$(GPU_OPTS) \
154156
--volume $(SOURCE_DIR):$(CODE_DIR) \
155157
$(EXTRA_VOLUMES) \
156-
$(if $(and $(filter 1,$(LOCAL_USER)),$(shell [ -w "$(USER_CACHE_DIR)" ] && echo 1)),--volume $(USER_CACHE_DIR):/home/$(USER_NAME)/.cache:rw) \
157158
--env "CCACHE_DIR=$(CCACHE_DIR)" \
158159
--env "CCACHE_BASEDIR=$(CODE_DIR)" \
159160
--env "CONAN_HOME=$(CONAN_DIR)" \
160161
--workdir $(WORK_DIR) \
161162
--hostname $(shell hostname)-$* \
162-
--name $(CONTAINER_NAME)-$*-$(USER_NAME) \
163+
--name $(CONTAINER_NAME)-$*-$(USER_NAME)-$(BASE_DIR) \
163164
--tmpfs /tmp:exec \
164165
$(IMAGE_WITH_TAG)$(IMAGE_TAG_SUFFIX) $(RUN_CMD)
165166

tests/integration/defs/accuracy/test_disaggregated_serving.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -727,19 +727,20 @@ def test_auto_dtype(self, overlap_scheduler):
727727
@skip_pre_blackwell
728728
@pytest.mark.timeout(3600)
729729
class TestQwen3_30B_A3B(LlmapiAccuracyTestHarness):
730-
fp4_model = f"{llm_models_root()}/Qwen3/saved_models_Qwen3-30B-A3B_nvfp4_hf"
731-
fp8_model = f"{llm_models_root()}/Qwen3/saved_models_Qwen3-30B-A3B_fp8_hf"
732-
733-
@pytest.mark.parametrize("ctxpp,gentp", [(2, 2)], ids=["ctxpp2gentp2"])
734-
def test_mixed_ctx_gen_model(self, ctxpp, gentp):
735-
ctx_model = self.fp4_model
736-
gen_model = self.fp8_model
730+
FP4_MODEL = f"{llm_models_root()}/Qwen3/saved_models_Qwen3-30B-A3B_nvfp4_hf"
731+
FP8_MODEL = f"{llm_models_root()}/Qwen3/saved_models_Qwen3-30B-A3B_fp8_hf"
732+
733+
@pytest.mark.skip_less_device(4)
734+
@pytest.mark.parametrize("ctx_pp,gen_tp", [(2, 2)], ids=["ctxpp2gentp2"])
735+
def test_mixed_ctx_gen_model(self, ctx_pp, gen_tp):
736+
ctx_model = self.FP4_MODEL
737+
gen_model = self.FP8_MODEL
737738
return run_parallel_test("Qwen3/Qwen3-30B-A3B",
738739
ctx_model,
739-
ctx_pp=ctxpp,
740+
ctx_pp=ctx_pp,
740741
ctx_tp=1,
741742
gen_pp=1,
742-
gen_tp=gentp,
743+
gen_tp=gen_tp,
743744
test_sets=[GSM8K, MMLU],
744745
ctx_model=ctx_model,
745746
gen_model=gen_model)

0 commit comments

Comments
 (0)