Skip to content

Commit b36abf8

Browse files
Merge branch 'main' into cc_perf_fixes
2 parents 2f21cf1 + 5df907b commit b36abf8

File tree

395 files changed

+6915
-2991
lines changed

Some content is hidden

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

395 files changed

+6915
-2991
lines changed

.github/workflows/label_issue.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ jobs:
1515
- name: Checkout private action repository
1616
uses: actions/checkout@v4
1717
with:
18-
repository: poweiw/goggles_action
18+
repository: NVIDIA/goggles_action
1919
path: ./.github/actions/goggles_action # local path to store the action
20-
token: ${{ secrets.GOGGLES_ACTION_REPO_TOKEN}} # token to access poweiw/goggles_action
21-
ref: v1.2.1
20+
ref: v1.3.0
2221

2322
- name: AI Label Issue
2423
uses: ./.github/actions/goggles_action/actions/llm_label

.gitmodules

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +0,0 @@
1-
[submodule "3rdparty/cutlass"]
2-
path = 3rdparty/cutlass
3-
url = https://github.com/NVIDIA/cutlass.git
4-
[submodule "3rdparty/json"]
5-
path = 3rdparty/json
6-
url = https://github.com/nlohmann/json.git
7-
[submodule "3rdparty/cxxopts"]
8-
path = 3rdparty/cxxopts
9-
url = https://github.com/jarro2783/cxxopts
10-
branch = v3.1.1
11-
[submodule "3rdparty/NVTX"]
12-
path = 3rdparty/NVTX
13-
url = https://github.com/NVIDIA/NVTX.git
14-
[submodule "3rdparty/ucxx"]
15-
path = 3rdparty/ucxx
16-
url = https://github.com/rapidsai/ucxx.git
17-
[submodule "3rdparty/pybind11"]
18-
path = 3rdparty/pybind11
19-
url = https://github.com/pybind/pybind11.git
20-
[submodule "3rdparty/xgrammar"]
21-
path = 3rdparty/xgrammar
22-
url = https://github.com/mlc-ai/xgrammar.git
23-
[submodule "3rdparty/nanobind"]
24-
path = 3rdparty/nanobind
25-
url = https://github.com/wjakob/nanobind
26-
[submodule "3rdparty/cppzmq"]
27-
path = 3rdparty/cppzmq
28-
url = https://github.com/zeromq/cppzmq.git
29-
[submodule "3rdparty/DeepGEMM"]
30-
path = 3rdparty/DeepGEMM
31-
url = https://github.com/ruoqianguo/DeepGEMM.git
32-
branch = swapab_sm100
33-
[submodule "3rdparty/flash-mla"]
34-
path = 3rdparty/flash-mla
35-
url = https://github.com/deepseek-ai/FlashMLA.git

.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

3rdparty/CMakeLists.txt

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
include(ExternalProject)
2+
include(FetchContent)
3+
4+
if(DEFINED ENV{GITHUB_MIRROR} AND NOT "$ENV{GITHUB_MIRROR}" STREQUAL "")
5+
set(github_base_url "$ENV{GITHUB_MIRROR}")
6+
else()
7+
set(github_base_url "https://github.com")
8+
endif()
9+
10+
FetchContent_Declare(
11+
cppzmq
12+
GIT_REPOSITORY https://github.com/zeromq/cppzmq
13+
GIT_TAG v4.10.0 # c94c20743ed7d4aa37835a5c46567ab0790d4acc
14+
GIT_SHALLOW TRUE
15+
# NOTE: TensorRT-LLM only uses the headers
16+
SOURCE_SUBDIR
17+
dont-add-this-project-with-add-subdirectory)
18+
19+
FetchContent_Declare(
20+
cutlass
21+
GIT_REPOSITORY https://github.com/NVIDIA/cutlass
22+
GIT_TAG v4.2.1 # f3fde58372d33e9a5650ba7b80fc48b3b49d40c8
23+
GIT_SHALLOW TRUE
24+
SOURCE_SUBDIR
25+
dont-add-this-project-with-add-subdirectory)
26+
27+
FetchContent_Declare(
28+
cxxopts
29+
GIT_REPOSITORY https://github.com/jarro2783/cxxopts
30+
GIT_TAG v3.1.1 # eb787304d67ec22f7c3a184ee8b4c481d04357fd
31+
GIT_SHALLOW TRUE)
32+
33+
set(deep_ep_commit 5be51b228a7c82dbdb213ea58e77bffd12b38af8)
34+
set_property(GLOBAL PROPERTY DEEP_EP_COMMIT "${deep_ep_commit}")
35+
FetchContent_Declare(
36+
deep_ep_download
37+
URL ${github_base_url}/deepseek-ai/DeepEP/archive/${deep_ep_commit}.tar.gz)
38+
39+
FetchContent_Declare(
40+
deepgemm
41+
GIT_REPOSITORY https://github.com/ruoqianguo/DeepGEMM
42+
GIT_TAG 9fa5965e265e27995f539e0dd73a06351a8a9eaf
43+
SOURCE_SUBDIR
44+
dont-add-this-project-with-add-subdirectory)
45+
46+
FetchContent_Declare(
47+
eigen
48+
GIT_REPOSITORY https://github.com/libeigen/eigen
49+
GIT_TAG 3.4.0
50+
GIT_SHALLOW TRUE)
51+
52+
FetchContent_Declare(
53+
flashmla
54+
GIT_REPOSITORY https://github.com/deepseek-ai/FlashMLA.git
55+
GIT_TAG 1408756a88e52a25196b759eaf8db89d2b51b5a1
56+
SOURCE_SUBDIR
57+
dont-add-this-project-with-add-subdirectory)
58+
59+
FetchContent_Declare(
60+
googlebenchmark
61+
GIT_REPOSITORY https://github.com/google/benchmark
62+
GIT_TAG v1.8.3
63+
GIT_SHALLOW TRUE)
64+
65+
FetchContent_Declare(
66+
googletest
67+
GIT_REPOSITORY https://github.com/google/googletest
68+
GIT_TAG v1.15.2
69+
GIT_SHALLOW TRUE)
70+
71+
FetchContent_Declare(
72+
json
73+
GIT_REPOSITORY https://github.com/nlohmann/json
74+
GIT_TAG v3.12.0 # 55f93686c01528224f448c19128836e7df245f72
75+
GIT_SHALLOW TRUE
76+
SOURCE_SUBDIR
77+
dont-add-this-project-with-add-subdirectory)
78+
79+
FetchContent_Declare(
80+
nanobind
81+
GIT_REPOSITORY https://github.com/wjakob/nanobind
82+
GIT_TAG a0ed2587f1089ef7657e2ed49ad6756b01c74e9f)
83+
84+
FetchContent_Declare(
85+
nvtx
86+
GIT_REPOSITORY https://github.com/NVIDIA/NVTX
87+
GIT_TAG v3.1.0-c-cpp # a1ceb0677f67371ed29a2b1c022794f077db5fe7
88+
GIT_SHALLOW TRUE
89+
# NOTE: TensorRT-LLM only uses the headers
90+
SOURCE_SUBDIR
91+
dont-add-this-project-with-add-subdirectory)
92+
93+
FetchContent_Declare(
94+
pybind11
95+
GIT_REPOSITORY https://github.com/pybind/pybind11
96+
GIT_TAG f99ffd7e03001810a3e722bf48ad1a9e08415d7d)
97+
98+
FetchContent_Declare(
99+
ucxx
100+
GIT_REPOSITORY https://github.com/rapidsai/ucxx
101+
GIT_TAG 16eaa57c8d98c8ef54d666a2d2b11e76cfa565f5
102+
# NOTE: See the notes in cpp/CMakeList.txt where this project is build at
103+
# configure time and then included via find_package
104+
SOURCE_SUBDIR
105+
dont-add-this-project-with-add-subdirectory)
106+
107+
FetchContent_Declare(
108+
xgrammar
109+
GIT_REPOSITORY https://github.com/mlc-ai/xgrammar
110+
GIT_TAG v0.1.25 # e4e816f5f0fe39f5b1601a17a4552307fa3b70ff
111+
GIT_SHALLOW TRUE
112+
# NOTE: TensorRT-LLM only uses the headers
113+
SOURCE_SUBDIR
114+
dont-add-this-project-with-add-subdirectory)

3rdparty/DeepGEMM

Lines changed: 0 additions & 1 deletion
This file was deleted.

3rdparty/NVTX

Lines changed: 0 additions & 1 deletion
This file was deleted.

3rdparty/cppzmq

Lines changed: 0 additions & 1 deletion
This file was deleted.

3rdparty/cutlass

Lines changed: 0 additions & 1 deletion
This file was deleted.

3rdparty/cxxopts

Lines changed: 0 additions & 1 deletion
This file was deleted.

3rdparty/flash-mla

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)