Commit 6e9fabb
authored
[BugFix] Fix duplicate symbol for custom QuantLightningIndexer operator (vllm-project#10744)
### What this PR does / why we need it?
This PR fixes a duplicate symbol conflict between the custom AscendC
operator and the torch-level ACLNN operator for
`AclNNQuantLightningIndexer`.
**Problem:**
The custom operator defined in `csrc/attention/quant_lightning_indexer/`
shared the same symbol name `AclNNQuantLightningIndexer` with the ACLNN
operator invoked via `EXEC_NPU_CMD` in `csrc/torch_binding.cpp`. This
caused a symbol duplication conflict during linking/compilation,
preventing the custom operator from being registered and loaded
correctly.
**Solution:**
Rename all custom operator symbols from `AclNNQuantLightningIndexer` →
`AclNNQuantLightningIndexerCustom` to disambiguate from the torch-layer
`aclnnQuantLightningIndexer`. The changes include:
- **OpDef class**: `QuantLightningIndexer` →
`QuantLightningIndexerCustom`
- **Tiling class**: `QuantLightningIndexerTiling` →
`QuantLightningIndexerCustomTiling`
- **Kernel function**: `quant_lightning_indexer` →
`quant_lightning_indexer_custom`
- **CMake registration**: `OP_NAME` and `OPTYPE` updated to
`QuantLightningIndexerCustom` / `quant_lightning_indexer_custom`
- **File rename**: `quant_lightning_indexer_def.cpp` →
`quant_lightning_indexer_custom_def.cpp`
- **Template tiling key**: `ASCENDC_TPL_ARGS_DECL(QuantLightningIndexer`
→ `ASCENDC_TPL_ARGS_DECL(QuantLightningIndexerCustom`
- **Torch binding**: `aclnnQuantLightningIndexer` →
`aclnnQuantLightningIndexerCustom`
All `OP_LOGD`/`OP_LOGE` log tags are also updated accordingly for
consistent debugging.
### Does this PR introduce _any_ user-facing change?
No. This is a purely internal renaming of operator symbols. The external
API and behavior remain unchanged.
### How was this patch tested?
- vLLM version: v0.22.1
- vLLM main:
vllm-project/vllm@967c5c3
Signed-off-by: Li Jiahang <216526138+lijiahang226@users.noreply.github.com>1 parent 07aedaa commit 6e9fabb
28 files changed
Lines changed: 43 additions & 43 deletions
File tree
- csrc
- attention
- quant_lightning_indexer_custom
- op_host
- op_kernel
- arch32
- arch35
- vf
- quant_lightning_indexer_metadata
- op_host
- op_kernel_aicpu
File renamed without changes.
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
152 | | - | |
| 152 | + | |
153 | 153 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
| 99 | + | |
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
88 | | - | |
| 88 | + | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
| |||
849 | 849 | | |
850 | 850 | | |
851 | 851 | | |
852 | | - | |
853 | | - | |
| 852 | + | |
| 853 | + | |
854 | 854 | | |
855 | 855 | | |
856 | 856 | | |
| |||
929 | 929 | | |
930 | 930 | | |
931 | 931 | | |
932 | | - | |
| 932 | + | |
933 | 933 | | |
934 | 934 | | |
935 | 935 | | |
936 | 936 | | |
937 | 937 | | |
938 | 938 | | |
939 | | - | |
| 939 | + | |
940 | 940 | | |
941 | 941 | | |
942 | 942 | | |
943 | 943 | | |
944 | | - | |
| 944 | + | |
945 | 945 | | |
946 | 946 | | |
947 | 947 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| |||
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
252 | | - | |
| 252 | + | |
253 | 253 | | |
254 | | - | |
| 254 | + | |
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
| |||
0 commit comments