fix mergedcolumnlinear with diff quant type
Co-authored-by: Katrina-CXY<chenxinyi20@huawei.com>
# message auto-generated for no-merge-commit merge:
!551 merge aclgraph into dev
fix mergedcolumnlinear with diff quant type
Created-by: Katrina-CXY
Commit-by: cxy-katrina;Katrina-CXY
Merged-by: ascend-robot
Description: <!--
PR描述模板更新日期:20251225
-->
# 合入背景
> 请描述为什么要做这个PR内的改动。\
> 如涉及,请关联前序PR或同特性/需求下的其他PR。\
> 如果是修复之前PR引入的问题,请关联引入问题的PR。\
> 注意:Fixes #ISSUE ID会自动关闭issue,如问题部分解决请不要使用Fixes,可以用Fix part of #ISSUE ID替代.
# 修改内容
- Aclgraph场景 MergeColumnLinear模块支持gate和up量化方式不一样
- Atbgraph场景 MergeColumnLinearAdapter模块支持gate和up量化方式不一样
# 资料变更
不涉及
# 接口变更
- 不涉及对外接口
- 仅涉及框架侧修改,模型迁移适配接口不涉及修改
# 测试结果
- 环境配置
```
source /usr/local/lib/python3.11/site-packages/mindie_llm/set_env.sh
export MASTER_IP="127.0.0.1"
export MASTER_PORT=7897 # 同一台环境不能重复
export MINDIE_LOG_TO_STDOUT=1 # 可选:日志输出到屏幕
source /usr/local/Ascend/ascend-toolkit/set_env.sh
```
- Aclgraph场景,gate up linear量化方式相同
- 配置方式
服务化配置 backendType设置为torch
- 结果
```
curl 127.0.0.1:10255/generate -d '
> {
> "prompt": "My name is Olivier and I",
> "max_tokens": 30,
> "temperature": 0
> }'
{"text":["My name is Olivier and I am a 32-year-old man from France. I am currently living in the UK. I am a software developer by trade, but I am"]}
```
- Aclgraph场景,gate up linear量化方式不同
- 配置方式
服务化配置 backendType设置为torch
- 结果
```
curl 127.0.0.1:10255/generate -d '
> {
> "prompt": "My name is Olivier and I",
> "max_tokens": 30,
> "temperature": 0
> }'
{"text":["My name is Olivier and I am a French citizen. I am currently working in the UK and I have a UK bank account. I would like to open a French bank account to"]}
```
- Atbgraph场景,gate up linear量化方式相同
- 配置方式
服务化配置 backendType设置为atb
- 结果
```
curl 127.0.0.1:10255/generate -d '
> {
> "prompt": "My name is Olivier and I",
> "max_tokens": 30,
> "temperature": 0
> }'
{"text":["My name is Olivier and I am a 30-year-old man from France. I am currently living in the UK. I am a software developer by profession, but I am"]}
```
- Atbgraph场景,gate up linear量化方式不同
- 配置方式
服务化配置 backendType设置为atb
- 结果
```
curl 127.0.0.1:10255/generate -d '
> {
> "prompt": "My name is Olivier and I",
> "max_tokens": 30,
> "temperature": 0
> }'
{"text":["My name is Olivier and I am a French citizen. I am currently in the UK on a Tier 1 (General) visa. I have been here for 3 years and"]}
```
# CheckList
> PR提交人对以下CheckList自检项进行全量自检,自检通过或不涉及,均修改 [ ] 为 [x]。
- [x] 代码注释完备
- [x] 正确记录错误日志
- [x] 进行了返回值校验 (禁止使用void屏蔽安全函数、自研函数返回值;考虑接口的异常场景;调用底层组件接口时,需要进行返回值校验)
- [x] 进行了空指针校验
- [x] 若存在资源申请,使用后资源被正确的释放了
- [x] 若涉及多线程场景,考虑了并发场景,不存在死锁问题
- [x] 按照[代码仓中提供的格式模板](https://gitcode.com/Ascend/MindIE-LLM/blob/master/.clang-format),使用clang-format工具格式化代码
- [x] 符合Ascend社区的编码规范。[C++ 语言编程指导](https://gitcode.com/Ascend/community/blob/master/docs/contributor/Ascend-cpp-coding-style-guide.md) | [C++ 语言安全编程指导](https://gitcode.com/Ascend/community/blob/master/docs/contributor/Ascend-cpp-secure-coding-guide.md)
See merge request: Ascend/MindIE-LLM!551