Star921
1845
代码
代码
Issues229
Pull Requests355
Actions
项目讨论
Wiki
分析
Star921
1845
已合并
修复aclnn文档 #3638
陈赵旻熠创建于 4月9日
修复aclnn文档 #3638
已合并
陈赵旻熠创建于 4月9日
从zerosaki_admin/ops-nntopktoppv2-9.0.0合入到cann/ops-nn9.0.0
共 4 个文件变更+10-10
Mindex/top_k_top_p_sample/docs/aclnnTopKTopPSample.md+1-1
@@ -539,7 +539,7 @@ aclnnStatus aclnnTopKTopPSample(
539 // 创建q aclTensor539 // 创建q aclTensor
540 ret = CreateAclTensor(qHostData, logitsShape, &qDeviceAddr, aclDataType::ACL_FLOAT, &q);540 ret = CreateAclTensor(qHostData, logitsShape, &qDeviceAddr, aclDataType::ACL_FLOAT, &q);
541 CHECK_RET(ret == ACL_SUCCESS, return ret);541 CHECK_RET(ret == ACL_SUCCESS, return ret);
542- // 创建logtisSelected aclTensor542+ // 创建logitsSelected aclTensor
543 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);543 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);
544 CHECK_RET(ret == ACL_SUCCESS, return ret);544 CHECK_RET(ret == ACL_SUCCESS, return ret);
545 // 创建logitsTopKPSelect aclTensor545 // 创建logitsTopKPSelect aclTensor
Mindex/top_k_top_p_sample/examples/test_aclnn_top_k_top_p_sample.cpp+1-1
@@ -121,7 +121,7 @@ int main() {
121 // 创建q aclTensor121 // 创建q aclTensor
122 ret = CreateAclTensor(qHostData, logitsShape, &qDeviceAddr, aclDataType::ACL_FLOAT, &q);122 ret = CreateAclTensor(qHostData, logitsShape, &qDeviceAddr, aclDataType::ACL_FLOAT, &q);
123 CHECK_RET(ret == ACL_SUCCESS, return ret);123 CHECK_RET(ret == ACL_SUCCESS, return ret);
124- // 创建logtisSelected aclTensor124+ // 创建logitsSelected aclTensor
125 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);125 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);
126 CHECK_RET(ret == ACL_SUCCESS, return ret);126 CHECK_RET(ret == ACL_SUCCESS, return ret);
127 // 创建logitsTopKPSelect aclTensor127 // 创建logitsTopKPSelect aclTensor
Mindex/top_k_top_p_sample_v2/docs/aclnnTopKTopPSampleV2.md+5-5
@@ -193,7 +193,7 @@ logits中的每一行logits[batch][:]根据相应的topK[batch]、topP[batch]、
193 193 
194 后继处理194 后继处理
195 * 此阶段输入为前序对前序topK-topP-minP采样的联合结果logitsSortMasked。195 * 此阶段输入为前序对前序topK-topP-minP采样的联合结果logitsSortMasked。
196- * 此处输入须要确保logitsSortMasked∈(0,1)，根据输入Logits的实际情况，配置入参约束属性inputIsLogits，即：196+ * 此处输入需要确保logitsSortMasked∈(0,1)，根据输入Logits的实际情况，配置入参约束属性inputIsLogits，即：
197 $$197 $$
198 \text{inputIsLogits} = 198 \text{inputIsLogits} =
199 \begin{cases}199 \begin{cases}
@@ -362,7 +362,7 @@ aclnnStatus aclnnTopKTopPSampleV2(
362 <tr>362 <tr>
363 <td>isNeedLogits</td>363 <td>isNeedLogits</td>
364 <td>输入</td>364 <td>输入</td>
365- <td>表示控制logitsTopKPselect的输出条件，建议设置为0。</td>365+ <td>表示控制logitsTopKPSelect的输出条件，建议设置为0。</td>
366 <td>-</td>366 <td>-</td>
367 <td>BOOL</td>367 <td>BOOL</td>
368 <td>-</td>368 <td>-</td>
@@ -676,7 +676,7 @@ int main() {
676 std::vector<int64_t> logitsSelectedIdxHostData(48, 0);676 std::vector<int64_t> logitsSelectedIdxHostData(48, 0);
677 std::vector<float> logitsTopKPSelectHostData(48 * 131072, 0);677 std::vector<float> logitsTopKPSelectHostData(48 * 131072, 0);
678 std::vector<int64_t> logitsIdxHostData(48 * 131072, 0);678 std::vector<int64_t> logitsIdxHostData(48 * 131072, 0);
679- std::vector<float> logitsSortMaskedtHostData(48 * 131072, 0);679+ std::vector<float> logitsSortMaskedHostData(48 * 131072, 0);
680 680 
681 float eps = 1e-8;681 float eps = 1e-8;
682 int64_t isNeedLogits = 0;682 int64_t isNeedLogits = 0;
@@ -700,7 +700,7 @@ int main() {
700 // 创建minps aclTensor700 // 创建minps aclTensor
701 ret = CreateAclTensor(minPsHostData, topKPShape, &minPsDeviceAddr, aclDataType::ACL_BF16, &minPs);701 ret = CreateAclTensor(minPsHostData, topKPShape, &minPsDeviceAddr, aclDataType::ACL_BF16, &minPs);
702 CHECK_RET(ret == ACL_SUCCESS, return ret);702 CHECK_RET(ret == ACL_SUCCESS, return ret);
703- // 创建logtisSelected aclTensor703+ // 创建logitsSelected aclTensor
704 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);704 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);
705 CHECK_RET(ret == ACL_SUCCESS, return ret);705 CHECK_RET(ret == ACL_SUCCESS, return ret);
706 // 创建logitsTopKPSelect aclTensor706 // 创建logitsTopKPSelect aclTensor
@@ -710,7 +710,7 @@ int main() {
710 ret = CreateAclTensor(logitsIdxHostData, logitsShape, &logitsIdxDeviceAddr, aclDataType::ACL_INT64, &logitsIdx);710 ret = CreateAclTensor(logitsIdxHostData, logitsShape, &logitsIdxDeviceAddr, aclDataType::ACL_INT64, &logitsIdx);
711 CHECK_RET(ret == ACL_SUCCESS, return ret);711 CHECK_RET(ret == ACL_SUCCESS, return ret);
712 // 创建logitsSortMasked aclTensor712 // 创建logitsSortMasked aclTensor
713- ret = CreateAclTensor(logitsSortMaskedtHostData, logitsShape, &logitsSortMaskedDeviceAddr, aclDataType::ACL_FLOAT, &logitsSortMasked);713+ ret = CreateAclTensor(logitsSortMaskedHostData, logitsShape, &logitsSortMaskedDeviceAddr, aclDataType::ACL_FLOAT, &logitsSortMasked);
714 CHECK_RET(ret == ACL_SUCCESS, return ret);714 CHECK_RET(ret == ACL_SUCCESS, return ret);
715 715 
716 // 3. 调用CANN算子库API，需要修改为具体的Api名称716 // 3. 调用CANN算子库API，需要修改为具体的Api名称
Mindex/top_k_top_p_sample_v2/examples/test_aclnn_top_k_top_p_sample_v2.cpp+3-3
@@ -113,7 +113,7 @@ int main() {
113 std::vector<int64_t> logitsSelectedIdxHostData(48, 0);113 std::vector<int64_t> logitsSelectedIdxHostData(48, 0);
114 std::vector<float> logitsTopKPSelectHostData(48 * 131072, 0);114 std::vector<float> logitsTopKPSelectHostData(48 * 131072, 0);
115 std::vector<int64_t> logitsIdxHostData(48 * 131072, 0);115 std::vector<int64_t> logitsIdxHostData(48 * 131072, 0);
116- std::vector<float> logitsSortMaskedtHostData(48 * 131072, 0);116+ std::vector<float> logitsSortMaskedHostData(48 * 131072, 0);
117 117 
118 float eps = 1e-8;118 float eps = 1e-8;
119 int64_t isNeedLogits = 0;119 int64_t isNeedLogits = 0;
@@ -137,7 +137,7 @@ int main() {
137 // 创建minps aclTensor137 // 创建minps aclTensor
138 ret = CreateAclTensor(minPsHostData, topKPShape, &minPsDeviceAddr, aclDataType::ACL_BF16, &minPs);138 ret = CreateAclTensor(minPsHostData, topKPShape, &minPsDeviceAddr, aclDataType::ACL_BF16, &minPs);
139 CHECK_RET(ret == ACL_SUCCESS, return ret);139 CHECK_RET(ret == ACL_SUCCESS, return ret);
140- // 创建logtisSelected aclTensor140+ // 创建logitsSelected aclTensor
141 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);141 ret = CreateAclTensor(logitsSelectedIdxHostData, topKPShape, &logitsSelectedIdxDeviceAddr, aclDataType::ACL_INT64, &logitsSelectedIdx);
142 CHECK_RET(ret == ACL_SUCCESS, return ret);142 CHECK_RET(ret == ACL_SUCCESS, return ret);
143 // 创建logitsTopKPSelect aclTensor143 // 创建logitsTopKPSelect aclTensor
@@ -147,7 +147,7 @@ int main() {
147 ret = CreateAclTensor(logitsIdxHostData, logitsShape, &logitsIdxDeviceAddr, aclDataType::ACL_INT64, &logitsIdx);147 ret = CreateAclTensor(logitsIdxHostData, logitsShape, &logitsIdxDeviceAddr, aclDataType::ACL_INT64, &logitsIdx);
148 CHECK_RET(ret == ACL_SUCCESS, return ret);148 CHECK_RET(ret == ACL_SUCCESS, return ret);
149 // 创建logitsSortMasked aclTensor149 // 创建logitsSortMasked aclTensor
150- ret = CreateAclTensor(logitsSortMaskedtHostData, logitsShape, &logitsSortMaskedDeviceAddr, aclDataType::ACL_FLOAT, &logitsSortMasked);150+ ret = CreateAclTensor(logitsSortMaskedHostData, logitsShape, &logitsSortMaskedDeviceAddr, aclDataType::ACL_FLOAT, &logitsSortMasked);
151 CHECK_RET(ret == ACL_SUCCESS, return ret);151 CHECK_RET(ret == ACL_SUCCESS, return ret);
152 152 
153 // 3. 调用CANN算子库API，需要修改为具体的Api名称153 // 3. 调用CANN算子库API，需要修改为具体的Api名称