Skip to content

Commit a67a9d6

Browse files
yinggehyinggeh
authored
Merge branch 'NVIDIA:main' into yinggeh/tri-332-2511-l0_backend_trtllm-base
2 parents a3add11 + 69b4e52 commit a67a9d6

File tree

298 files changed

+4019
-2540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+4019
-2540
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,6 @@ common-files: &common_files |
10591059
tests/unittest/_torch/thop/parallel/test_logits_bitmask_op.py |
10601060
tests/unittest/_torch/thop/parallel/test_mamba_conv1d_op.py |
10611061
tests/unittest/_torch/thop/parallel/test_mamba2_chunk_ss_update.py |
1062-
tests/unittest/_torch/thop/parallel/test_moe.py |
10631062
tests/unittest/_torch/thop/parallel/test_noaux_tc.py |
10641063
tests/unittest/_torch/thop/parallel/test_scaled_mm.py |
10651064
tests/unittest/_torch/thop/parallel/test_selective_scan_op.py |
@@ -1071,6 +1070,7 @@ common-files: &common_files |
10711070
tests/unittest/_torch/thop/parallel/test_weight_only_quant_gemm.py |
10721071
tests/unittest/_torch/thop/parallel/test_weight_only_quant_linear.py |
10731072
tests/unittest/_torch/thop/serial/test_moe_alltoall.py |
1073+
tests/unittest/_torch/thop/serial/test_moe.py |
10741074
tests/unittest/api_stability/api_stability_core.py |
10751075
tests/unittest/api_stability/test_llm_api.py |
10761076
tests/unittest/bindings/binding_test_utils.py |
@@ -1460,6 +1460,11 @@ repos:
14601460
entry: ./scripts/format_test_list.py
14611461
language: script
14621462
files: tests/integration/test_lists/.*\.txt$
1463+
- id: waive list check
1464+
name: Checks for duplicated test items in waives.txt
1465+
entry: ./scripts/check_test_list.py --check-duplicate-waives
1466+
language: script
1467+
pass_filenames: false
14631468
- id: DCO check
14641469
name: Checks the commit message for a developer certificate of origin signature
14651470
entry: ./scripts/dco_check.py

‎cpp/kernels/fmha_v2/NVIDIA TensorRT Source Code License Agreement.pdf‎

-180 KB
Binary file not shown.

‎cpp/kernels/fmha_v2/conftest.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2-
# SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
1+
# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
33
#
4-
# NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
5-
# property and proprietary rights in and to this material, related
6-
# documentation and any modifications thereto. Any use, reproduction,
7-
# disclosure or distribution of this material and related documentation
8-
# without an express license agreement from NVIDIA CORPORATION or
9-
# its affiliates is strictly prohibited.
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
1015

1116
import subprocess
1217

‎cpp/kernels/fmha_v2/setup.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2-
# SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
1+
# SPDX-FileCopyrightText: Copyright (c) 2020-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
33
#
4-
# NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
5-
# property and proprietary rights in and to this material, related
6-
# documentation and any modifications thereto. Any use, reproduction,
7-
# disclosure or distribution of this material and related documentation
8-
# without an express license agreement from NVIDIA CORPORATION or
9-
# its affiliates is strictly prohibited.
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
1015

1116
import os
1217
import subprocess

‎cpp/kernels/fmha_v2/src/convert.cu‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#include <fmha/numeric_types.h>

‎cpp/kernels/fmha_v2/src/fmha/alibi_params.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#pragma once

‎cpp/kernels/fmha_v2/src/fmha/fragment.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#pragma once

‎cpp/kernels/fmha_v2/src/fmha/gemm.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#pragma once

‎cpp/kernels/fmha_v2/src/fmha/gmem_tile_o.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#pragma once

‎cpp/kernels/fmha_v2/src/fmha/gmem_tile_o_packed.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* SPDX-License-Identifier: NVIDIA TensorRT Source Code License Agreement
2+
* SPDX-FileCopyrightText: Copyright (c) 2011-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*
5-
* NVIDIA CORPORATION, its affiliates and licensors retain all intellectual
6-
* property and proprietary rights in and to this material, related
7-
* documentation and any modifications thereto. Any use, reproduction,
8-
* disclosure or distribution of this material and related documentation
9-
* without an express license agreement from NVIDIA CORPORATION or
10-
* its affiliates is strictly prohibited.
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1116
*/
1217

1318
#pragma once

0 commit comments

Comments
 (0)