[None][chore] Adjust the current disagg cases

jenkins/scripts/perf/local/submit.py

@@ -286,8 +286,6 @@ def generate_sbatch_params(args, hardware_config, work_dir):
         f"#SBATCH --segment={total_nodes}",
         f"#SBATCH --ntasks={total_gpus}",
         f"#SBATCH --ntasks-per-node={gpus_per_node}",
-        f"#SBATCH --gpus-per-node={gpus_per_node}",
-        f"#SBATCH --gres=gpu:{gpus_per_node}",
         f"#SBATCH --partition={args.partition}",
         f"#SBATCH --time={args.time}",
         f"#SBATCH --account={args.account}",

tests/integration/defs/perf/test_perf_sanity.py

@@ -1384,9 +1384,13 @@ def _parse_disagg_config_file(self, config_file_path: str, config_file: str):
         for concurrency in concurrency_values:
             client_config_data = {
                 "concurrency": concurrency,
+<<<<<<< HEAD
+                "iterations": 1 if benchmark_mode == "gen_only" else benchmark.get("multi_round", 1),
+=======
                 "iterations": 1
                 if benchmark_mode == "gen_only"
                 else benchmark.get("multi_round", 1),
+>>>>>>> upstream/main
                 "isl": benchmark.get("input_length", 1024),
                 "osl": osl,
                 "random_range_ratio": benchmark.get("benchmark_ratio", 0.0),

tests/integration/test_lists/waives.txt

@@ -311,6 +311,11 @@ accuracy/test_llm_api_pytorch.py::TestDeepSeekV3Lite::test_bfloat16_4gpus[pp4-mt
 disaggregated/test_disaggregated.py::test_disaggregated_overlap_gen_first[ctx_pp1-TinyLlama-1.1B-Chat-v1.0] SKIP (https://nvbugs/6057459)
 disaggregated/test_disaggregated.py::test_disaggregated_overlap_gen_first[ctx_pp4-TinyLlama-1.1B-Chat-v1.0] SKIP (https://nvbugs/6057460)
 perf/test_perf_sanity.py::test_e2e[disagg_upload-gen_only-gb200_deepseek-v32-fp4_32k4k_con2048_ctx1_dep4_gen1_dep32_eplb288_mtp1_ccb-UCX] SKIP (https://nvbugs/6085022)
+<<<<<<< HEAD
+perf/test_perf_sanity.py::test_e2e[disagg_upload-gen_only-gb200_deepseek-r1-fp4_128k8k_con128_ctx1_pp8_gen1_dep16_eplb0_mtp2_ccb-UCX] SKIP (https://nvbugs/6060119)
+perf/test_perf_sanity.py::test_e2e[disagg_upload-gen_only-gb200_deepseek-r1-fp4_128k8k_con64_ctx1_pp8_gen1_dep32_eplb0_mtp3_ccb-UCX] SKIP (https://nvbugs/6060119)
+=======
+>>>>>>> upstream/main
 full:sm89/accuracy/test_llm_api_pytorch.py::TestGemma3_1BInstruct::test_fp8_prequantized[torch_compile=False] SKIP (https://nvbugs/6070878)
 full:sm89/accuracy/test_llm_api_pytorch.py::TestGemma3_1BInstruct::test_fp8_prequantized[torch_compile=True] SKIP (https://nvbugs/6070878)
 accuracy/test_llm_api_pytorch.py::TestGPTOSS::test_w4_1gpu[v1_kv_cache-True-True-triton-auto] SKIP (https://nvbugs/6026676)

tests/scripts/perf/aggregated/deepseek-r1-fp4_128k8k_ctx_pp4_fp4_bs1.yaml

@@ -0,0 +1,69 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+  model_name: deepseek_r1_0528_fp4_v2
+  precision: fp4
+  model_dir_name: DeepSeek-R1-0528-FP4-v2
+  supported_gpus:
+  - GB300
+  benchmark_type: 128k8k
+slurm:
+  partition: <partition>
+  account: <account>
+  job_time: 01:00:00
+  job_name: agg-ctx-only
+  extra_args: --gres=gpu:4
+  numa_bind: true
+hardware:
+  gpus_per_node: 4
+environment:
+  container_mount: <container_mount>
+  container_image: <container_image>
+  model_path: <model_path>
+  trtllm_repo: ''
+  build_wheel: false
+  work_dir: <full_path_to_work_dir>
+  worker_env_var: TLLM_LOG_LEVEL=INFO TRTLLM_SERVER_DISABLE_GC=1 TRTLLM_WORKER_DISABLE_GC=1
+    TRTLLM_ENABLE_PDL=1 ENROOT_ALLOW_DEV=yes MIMALLOC_PURGE_DELAY=0
+  server_env_var: TRTLLM_SERVER_DISABLE_GC=1
+profiling:
+  nsys_on: false
+accuracy:
+  enable_accuracy_test: false
+server_configs:
+- name: deepseek-r1-fp4_128k8k_ctx_pp4_fp4_bs1
+  tensor_parallel_size: 1
+  pipeline_parallel_size: 4
+  context_parallel_size: 1
+  moe_expert_parallel_size: 1
+  enable_attention_dp: false
+  max_batch_size: 1
+  max_num_tokens: 131104
+  max_seq_len: 131104
+  kv_cache_config:
+    enable_block_reuse: false
+    free_gpu_memory_fraction: 0.4
+    dtype: fp8
+  print_iter_log: true
+  disable_overlap_scheduler: true
+  moe_config:
+    backend: TRTLLM
+client_configs:
+- name: deepseek-r1-fp4_128k8k_ctx_pp4_fp4_bs1_client
+  concurrency_list: '1'
+  input_length: 131072
+  output_length: 8192
+  dataset_file: <dataset_file>

tests/scripts/perf/aggregated/deepseek-r1-fp4_128k8k_ctx_pp8_fp4_bs1.yaml

@@ -0,0 +1,70 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+  model_name: deepseek_r1_0528_fp4_v2
+  precision: fp4
+  model_dir_name: DeepSeek-R1-0528-FP4-v2
+  supported_gpus:
+  - GB200
+  - GB300
+  benchmark_type: 128k8k
+slurm:
+  partition: <partition>
+  account: <account>
+  job_time: 01:00:00
+  job_name: agg-ctx-only
+  extra_args: --gres=gpu:4
+  numa_bind: true
+hardware:
+  gpus_per_node: 4
+environment:
+  container_mount: <container_mount>
+  container_image: <container_image>
+  model_path: <model_path>
+  trtllm_repo: ''
+  build_wheel: false
+  work_dir: <full_path_to_work_dir>
+  worker_env_var: TLLM_LOG_LEVEL=INFO TRTLLM_SERVER_DISABLE_GC=1 TRTLLM_WORKER_DISABLE_GC=1
+    TRTLLM_ENABLE_PDL=1 ENROOT_ALLOW_DEV=yes MIMALLOC_PURGE_DELAY=0
+  server_env_var: TRTLLM_SERVER_DISABLE_GC=1
+profiling:
+  nsys_on: false
+accuracy:
+  enable_accuracy_test: false
+server_configs:
+- name: deepseek-r1-fp4_128k8k_ctx_pp8_fp4_bs1
+  tensor_parallel_size: 1
+  pipeline_parallel_size: 8
+  context_parallel_size: 1
+  moe_expert_parallel_size: 1
+  enable_attention_dp: false
+  max_batch_size: 1
+  max_num_tokens: 131104
+  max_seq_len: 131104
+  kv_cache_config:
+    enable_block_reuse: false
+    free_gpu_memory_fraction: 0.4
+    dtype: fp8
+  print_iter_log: true
+  disable_overlap_scheduler: true
+  moe_config:
+    backend: TRTLLM
+client_configs:
+- name: deepseek-r1-fp4_128k8k_ctx_pp8_fp4_bs1_client
+  concurrency_list: '1'
+  input_length: 131072
+  output_length: 8192
+  dataset_file: <dataset_file>

tests/scripts/perf/aggregated/deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4.yaml

@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+  model_name: deepseek_r1_0528_fp4_v2
+  precision: fp4
+  model_dir_name: DeepSeek-R1-0528-FP4-v2
+  supported_gpus:
+  - GB200
+  - GB300
+  benchmark_type: 1k1k
+slurm:
+  partition: <partition>
+  account: <account>
+  job_time: 01:00:00
+  job_name: agg-ctx-only
+  extra_args: --gres=gpu:4
+  numa_bind: true
+hardware:
+  gpus_per_node: 4
+environment:
+  container_mount: <container_mount>
+  container_image: <container_image>
+  model_path: <model_path>
+  trtllm_repo: ''
+  build_wheel: false
+  work_dir: <full_path_to_work_dir>
+  worker_env_var: TLLM_LOG_LEVEL=INFO TRTLLM_SERVER_DISABLE_GC=1 TRTLLM_WORKER_DISABLE_GC=1
+    TRTLLM_ENABLE_PDL=1 ENROOT_ALLOW_DEV=yes MIMALLOC_PURGE_DELAY=0
+  server_env_var: TRTLLM_SERVER_DISABLE_GC=1
+profiling:
+  nsys_on: false
+accuracy:
+  enable_accuracy_test: false
+server_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4
+  tensor_parallel_size: 4
+  pipeline_parallel_size: 1
+  context_parallel_size: 1
+  moe_expert_parallel_size: 4
+  enable_attention_dp: true
+  max_batch_size: 4
+  max_num_tokens: 4608
+  max_seq_len: 2251
+  kv_cache_config:
+    enable_block_reuse: false
+    free_gpu_memory_fraction: 0.85
+    dtype: fp8
+  print_iter_log: true
+  disable_overlap_scheduler: true
+client_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_client
+  concurrency_list: '1'
+  input_length: 1024
+  output_length: 1024
+  dataset_file: <dataset_file>

tests/scripts/perf/aggregated/deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v1.yaml

@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+  model_name: deepseek_r1_0528_fp4_v2
+  precision: fp4
+  model_dir_name: DeepSeek-R1-0528-FP4-v2
+  supported_gpus:
+  - GB200
+  - GB300
+  benchmark_type: 1k1k
+slurm:
+  partition: <partition>
+  account: <account>
+  job_time: 01:00:00
+  job_name: agg-ctx-only
+  extra_args: --gres=gpu:4
+  numa_bind: true
+hardware:
+  gpus_per_node: 4
+environment:
+  container_mount: <container_mount>
+  container_image: <container_image>
+  model_path: <model_path>
+  trtllm_repo: ''
+  build_wheel: false
+  work_dir: <full_path_to_work_dir>
+  worker_env_var: TLLM_LOG_LEVEL=INFO TRTLLM_SERVER_DISABLE_GC=1 TRTLLM_WORKER_DISABLE_GC=1
+    TRTLLM_ENABLE_PDL=1 ENROOT_ALLOW_DEV=yes MIMALLOC_PURGE_DELAY=0
+  server_env_var: TRTLLM_SERVER_DISABLE_GC=1
+profiling:
+  nsys_on: false
+accuracy:
+  enable_accuracy_test: false
+server_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v1
+  tensor_parallel_size: 4
+  pipeline_parallel_size: 1
+  context_parallel_size: 1
+  moe_expert_parallel_size: 4
+  enable_attention_dp: true
+  max_batch_size: 4
+  max_num_tokens: 4608
+  max_seq_len: 2251
+  kv_cache_config:
+    enable_block_reuse: true
+    free_gpu_memory_fraction: 0.85
+    dtype: fp8
+  print_iter_log: true
+  disable_overlap_scheduler: true
+client_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v1_client
+  concurrency_list: '1'
+  input_length: 1024
+  output_length: 1024
+  dataset_file: <dataset_file>

tests/scripts/perf/aggregated/deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v2.yaml

@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+  model_name: deepseek_r1_0528_fp4_v2
+  precision: fp4
+  model_dir_name: DeepSeek-R1-0528-FP4-v2
+  supported_gpus:
+  - GB200
+  - GB300
+  benchmark_type: 1k1k
+slurm:
+  partition: <partition>
+  account: <account>
+  job_time: 01:00:00
+  job_name: agg-ctx-only
+  extra_args: --gres=gpu:4
+  numa_bind: true
+hardware:
+  gpus_per_node: 4
+environment:
+  container_mount: <container_mount>
+  container_image: <container_image>
+  model_path: <model_path>
+  trtllm_repo: ''
+  build_wheel: false
+  work_dir: <full_path_to_work_dir>
+  worker_env_var: TLLM_LOG_LEVEL=INFO TRTLLM_SERVER_DISABLE_GC=1 TRTLLM_WORKER_DISABLE_GC=1
+    TRTLLM_ENABLE_PDL=1 ENROOT_ALLOW_DEV=yes MIMALLOC_PURGE_DELAY=0
+  server_env_var: TRTLLM_SERVER_DISABLE_GC=1
+profiling:
+  nsys_on: false
+accuracy:
+  enable_accuracy_test: false
+server_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v2
+  tensor_parallel_size: 4
+  pipeline_parallel_size: 1
+  context_parallel_size: 1
+  moe_expert_parallel_size: 4
+  enable_attention_dp: true
+  max_batch_size: 4
+  max_num_tokens: 4480
+  max_seq_len: 2176
+  kv_cache_config:
+    enable_block_reuse: false
+    free_gpu_memory_fraction: 0.85
+    dtype: fp8
+  print_iter_log: true
+  disable_overlap_scheduler: true
+client_configs:
+- name: deepseek-r1-fp4_1k1k_ctx_tp4_ep4_fp4_attndp_bs4_v2_client
+  concurrency_list: '1'
+  input_length: 1024
+  output_length: 1024
+  dataset_file: <dataset_file>