Skip to content

Commit 05dc1ba

Browse files
wooway777wooway777
authored
Merge pull request #1084 from InfiniTensor/issue/1031_fix
删除算子比赛未支持的平台的相关代码
2 parents 86d00fb + 14d751f commit 05dc1ba

File tree

12 files changed

+3
-333
lines changed

12 files changed

+3
-333
lines changed

‎src/infiniop/ops/addcmul/operator.cc‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
#ifdef ENABLE_METAX_API
1212
#include "metax/addcmul_metax.h"
1313
#endif
14-
#ifdef ENABLE_KUNLUN_API
15-
#include "kunlun/addcmul_kunlun.h"
16-
#endif
17-
#ifdef ENABLE_CAMBRICON_API
18-
#include "bang/addcmul_bang.h"
19-
#endif
2014
#ifdef ENABLE_MOORE_API
2115
#include "moore/addcmul_moore.h"
2216
#endif
@@ -58,12 +52,6 @@ __INFINI_C infiniStatus_t infiniopCreateAddcmulDescriptor(
5852
#ifdef ENABLE_METAX_API
5953
CREATE(INFINI_DEVICE_METAX, metax);
6054
#endif
61-
#ifdef ENABLE_KUNLUN_API
62-
CREATE(INFINI_DEVICE_KUNLUN, kunlun);
63-
#endif
64-
#ifdef ENABLE_CAMBRICON_API
65-
CREATE(INFINI_DEVICE_CAMBRICON, bang);
66-
#endif
6755
#ifdef ENABLE_MOORE_API
6856
CREATE(INFINI_DEVICE_MOORE, moore);
6957
#endif
@@ -99,12 +87,6 @@ __INFINI_C infiniStatus_t infiniopGetAddcmulWorkspaceSize(infiniopAddcmulDescrip
9987
#ifdef ENABLE_METAX_API
10088
GET(INFINI_DEVICE_METAX, metax);
10189
#endif
102-
#ifdef ENABLE_KUNLUN_API
103-
GET(INFINI_DEVICE_KUNLUN, kunlun);
104-
#endif
105-
#ifdef ENABLE_CAMBRICON_API
106-
GET(INFINI_DEVICE_CAMBRICON, bang);
107-
#endif
10890
#ifdef ENABLE_MOORE_API
10991
GET(INFINI_DEVICE_MOORE, moore);
11092
#endif
@@ -148,12 +130,6 @@ __INFINI_C infiniStatus_t infiniopAddcmul(
148130
#ifdef ENABLE_METAX_API
149131
CALCULATE(INFINI_DEVICE_METAX, metax);
150132
#endif
151-
#ifdef ENABLE_KUNLUN_API
152-
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun);
153-
#endif
154-
#ifdef ENABLE_CAMBRICON_API
155-
CALCULATE(INFINI_DEVICE_CAMBRICON, bang);
156-
#endif
157133
#ifdef ENABLE_MOORE_API
158134
CALCULATE(INFINI_DEVICE_MOORE, moore);
159135
#endif
@@ -189,12 +165,6 @@ __INFINI_C infiniStatus_t infiniopDestroyAddcmulDescriptor(infiniopAddcmulDescri
189165
#ifdef ENABLE_METAX_API
190166
DELETE(INFINI_DEVICE_METAX, metax);
191167
#endif
192-
#ifdef ENABLE_KUNLUN_API
193-
DELETE(INFINI_DEVICE_KUNLUN, kunlun);
194-
#endif
195-
#ifdef ENABLE_CAMBRICON_API
196-
DELETE(INFINI_DEVICE_CAMBRICON, bang);
197-
#endif
198168
#ifdef ENABLE_MOORE_API
199169
DELETE(INFINI_DEVICE_MOORE, moore);
200170
#endif

‎src/infiniop/ops/all/operator.cc‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
#ifdef ENABLE_METAX_API
1313
#include "metax/all_metax.h"
1414
#endif
15-
#ifdef ENABLE_KUNLUN_API
16-
#include "kunlun/all_kunlun.h"
17-
#endif
1815
#ifdef ENABLE_MOORE_API
1916
#include "moore/all_moore.h"
2017
#endif
@@ -59,9 +56,6 @@ __INFINI_C infiniStatus_t infiniopCreateAllDescriptor(
5956
#ifdef ENABLE_METAX_API
6057
CREATE(INFINI_DEVICE_METAX, metax);
6158
#endif
62-
#ifdef ENABLE_KUNLUN_API
63-
CREATE(INFINI_DEVICE_KUNLUN, kunlun);
64-
#endif
6559
#ifdef ENABLE_MOORE_API
6660
CREATE(INFINI_DEVICE_MOORE, moore);
6761
#endif
@@ -99,9 +93,6 @@ __INFINI_C infiniStatus_t infiniopGetAllWorkspaceSize(infiniopAllDescriptor_t de
9993
#ifdef ENABLE_METAX_API
10094
GET(INFINI_DEVICE_METAX, metax);
10195
#endif
102-
#ifdef ENABLE_KUNLUN_API
103-
GET(INFINI_DEVICE_KUNLUN, kunlun);
104-
#endif
10596
#ifdef ENABLE_MOORE_API
10697
GET(INFINI_DEVICE_MOORE, moore);
10798
#endif
@@ -150,9 +141,6 @@ __INFINI_C infiniStatus_t infiniopAll(
150141
#ifdef ENABLE_METAX_API
151142
CALCULATE(INFINI_DEVICE_METAX, metax);
152143
#endif
153-
#ifdef ENABLE_KUNLUN_API
154-
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun);
155-
#endif
156144
#ifdef ENABLE_MOORE_API
157145
CALCULATE(INFINI_DEVICE_MOORE, moore);
158146
#endif
@@ -192,9 +180,6 @@ infiniopDestroyAllDescriptor(infiniopAllDescriptor_t desc) {
192180
#ifdef ENABLE_METAX_API
193181
DELETE(INFINI_DEVICE_METAX, metax);
194182
#endif
195-
#ifdef ENABLE_KUNLUN_API
196-
DELETE(INFINI_DEVICE_KUNLUN, kunlun);
197-
#endif
198183
#ifdef ENABLE_MOORE_API
199184
DELETE(INFINI_DEVICE_MOORE, moore);
200185
#endif

‎src/infiniop/ops/atanh/operator.cc‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
#ifdef ENABLE_METAX_API
1212
#include "metax/atanh_metax.h"
1313
#endif
14-
#ifdef ENABLE_KUNLUN_API
15-
#include "kunlun/atanh_kunlun.h"
16-
#endif
17-
#ifdef ENABLE_CAMBRICON_API
18-
#include "bang/atanh_bang.h"
19-
#endif
2014
#ifdef ENABLE_MOORE_API
2115
#include "moore/atanh_moore.h"
2216
#endif
@@ -55,12 +49,6 @@ __INFINI_C infiniStatus_t infiniopCreateAtanhDescriptor(
5549
#ifdef ENABLE_METAX_API
5650
CREATE(INFINI_DEVICE_METAX, metax);
5751
#endif
58-
#ifdef ENABLE_KUNLUN_API
59-
CREATE(INFINI_DEVICE_KUNLUN, kunlun);
60-
#endif
61-
#ifdef ENABLE_CAMBRICON_API
62-
CREATE(INFINI_DEVICE_CAMBRICON, bang);
63-
#endif
6452
#ifdef ENABLE_MOORE_API
6553
CREATE(INFINI_DEVICE_MOORE, moore);
6654
#endif
@@ -98,12 +86,6 @@ __INFINI_C infiniStatus_t infiniopGetAtanhWorkspaceSize(infiniopAtanhDescriptor_
9886
#ifdef ENABLE_METAX_API
9987
GET(INFINI_DEVICE_METAX, metax);
10088
#endif
101-
#ifdef ENABLE_KUNLUN_API
102-
GET(INFINI_DEVICE_KUNLUN, kunlun);
103-
#endif
104-
#ifdef ENABLE_CAMBRICON_API
105-
GET(INFINI_DEVICE_CAMBRICON, bang);
106-
#endif
10789
#ifdef ENABLE_MOORE_API
10890
GET(INFINI_DEVICE_MOORE, moore);
10991
#endif
@@ -146,12 +128,6 @@ __INFINI_C infiniStatus_t infiniopAtanh(
146128
#ifdef ENABLE_METAX_API
147129
CALCULATE(INFINI_DEVICE_METAX, metax);
148130
#endif
149-
#ifdef ENABLE_KUNLUN_API
150-
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun);
151-
#endif
152-
#ifdef ENABLE_CAMBRICON_API
153-
CALCULATE(INFINI_DEVICE_CAMBRICON, bang);
154-
#endif
155131
#ifdef ENABLE_MOORE_API
156132
CALCULATE(INFINI_DEVICE_MOORE, moore);
157133
#endif
@@ -191,12 +167,6 @@ infiniopDestroyAtanhDescriptor(infiniopAtanhDescriptor_t desc) {
191167
#ifdef ENABLE_METAX_API
192168
DELETE(INFINI_DEVICE_METAX, metax);
193169
#endif
194-
#ifdef ENABLE_KUNLUN_API
195-
DELETE(INFINI_DEVICE_KUNLUN, kunlun);
196-
#endif
197-
#ifdef ENABLE_CAMBRICON_API
198-
DELETE(INFINI_DEVICE_CAMBRICON, bang);
199-
#endif
200170
#ifdef ENABLE_MOORE_API
201171
DELETE(INFINI_DEVICE_MOORE, moore);
202172
#endif

‎src/infiniop/ops/avg_pool1d/operator.cc‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,9 @@
88
#if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API) || defined(ENABLE_QY_API) || defined(ENABLE_HYGON_API)
99
#include "nvidia/avg_pool1d_nvidia.cuh"
1010
#endif
11-
#ifdef ENABLE_ASCEND_API
12-
#include "ascend/avg_pool1d_ascend.h"
13-
#endif
14-
#ifdef ENABLE_CAMBRICON_API
15-
#include "bang/avg_pool1d_bang.h"
16-
#endif
1711
#ifdef ENABLE_METAX_API
1812
#include "metax/avg_pool1d_metax.h"
1913
#endif
20-
#ifdef ENABLE_KUNLUN_API
21-
#include "kunlun/avg_pool1d_kunlun.h"
22-
#endif
2314
#ifdef ENABLE_MOORE_API
2415
#include "moore/avg_pool1d_moore.h"
2516
#endif
@@ -65,15 +56,6 @@ __INFINI_C infiniStatus_t infiniopCreateAvgPool1dDescriptor(
6556
#endif
6657
#ifdef ENABLE_METAX_API
6758
CREATE(INFINI_DEVICE_METAX, metax);
68-
#endif
69-
#ifdef ENABLE_ASCEND_API
70-
CREATE(INFINI_DEVICE_ASCEND, ascend);
71-
#endif
72-
#ifdef ENABLE_KUNLUN_API
73-
CREATE(INFINI_DEVICE_KUNLUN, kunlun);
74-
#endif
75-
#ifdef ENABLE_CAMBRICON_API
76-
CREATE(INFINI_DEVICE_CAMBRICON, bang);
7759
#endif
7860
default:
7961
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -110,15 +92,6 @@ __INFINI_C infiniStatus_t infiniopGetAvgPool1dWorkspaceSize(infiniopAvgPool1dDes
11092
#endif
11193
#ifdef ENABLE_METAX_API
11294
GET(INFINI_DEVICE_METAX, metax);
113-
#endif
114-
#ifdef ENABLE_KUNLUN_API
115-
GET(INFINI_DEVICE_KUNLUN, kunlun);
116-
#endif
117-
#ifdef ENABLE_CAMBRICON_API
118-
GET(INFINI_DEVICE_CAMBRICON, bang);
119-
#endif
120-
#ifdef ENABLE_ASCEND_API
121-
GET(INFINI_DEVICE_ASCEND, ascend);
12295
#endif
12396
default:
12497
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -161,15 +134,6 @@ __INFINI_C infiniStatus_t infiniopAvgPool1d(
161134
#endif
162135
#ifdef ENABLE_METAX_API
163136
CALCULATE(INFINI_DEVICE_METAX, metax);
164-
#endif
165-
#ifdef ENABLE_KUNLUN_API
166-
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun);
167-
#endif
168-
#ifdef ENABLE_CAMBRICON_API
169-
CALCULATE(INFINI_DEVICE_CAMBRICON, bang);
170-
#endif
171-
#ifdef ENABLE_ASCEND_API
172-
CALCULATE(INFINI_DEVICE_ASCEND, ascend);
173137
#endif
174138
default:
175139
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -207,15 +171,6 @@ infiniopDestroyAvgPool1dDescriptor(infiniopAvgPool1dDescriptor_t desc) {
207171
#endif
208172
#ifdef ENABLE_METAX_API
209173
DELETE(INFINI_DEVICE_METAX, metax);
210-
#endif
211-
#ifdef ENABLE_KUNLUN_API
212-
DELETE(INFINI_DEVICE_KUNLUN, kunlun);
213-
#endif
214-
#ifdef ENABLE_CAMBRICON_API
215-
DELETE(INFINI_DEVICE_CAMBRICON, bang);
216-
#endif
217-
#ifdef ENABLE_ASCEND_API
218-
DELETE(INFINI_DEVICE_ASCEND, ascend);
219174
#endif
220175
default:
221176
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;

‎src/infiniop/ops/binary_cross_entropy_with_logits/operator.cc‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,12 @@
99
#if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API) || defined(ENABLE_QY_API) || defined(ENABLE_HYGON_API)
1010
#include "nvidia/binary_cross_entropy_with_logits_nvidia.cuh"
1111
#endif
12-
#ifdef ENABLE_CAMBRICON_API
13-
#include "bang/binary_cross_entropy_with_logits_bang.h"
14-
#endif
15-
#ifdef ENABLE_ASCEND_API
16-
#include "ascend/binary_cross_entropy_with_logits_ascend.h"
17-
#endif
1812
#ifdef ENABLE_METAX_API
1913
#include "metax/binary_cross_entropy_with_logits_metax.h"
2014
#endif
2115
#ifdef ENABLE_MOORE_API
2216
#include "moore/binary_cross_entropy_with_logits_moore.h"
2317
#endif
24-
#ifdef ENABLE_KUNLUN_API
25-
#include "kunlun/binary_cross_entropy_with_logits_kunlun.h"
26-
#endif
2718

2819
// -----------------------------------------------------------------------------
2920
// 1. 创建描述符
@@ -60,20 +51,11 @@ __INFINI_C infiniStatus_t infiniopCreateBCEWithLogitsDescriptor(
6051
#ifdef ENABLE_HYGON_API
6152
CREATE(INFINI_DEVICE_HYGON, nvidia);
6253
#endif
63-
#ifdef ENABLE_CAMBRICON_API
64-
CREATE(INFINI_DEVICE_CAMBRICON, bang);
65-
#endif
66-
#ifdef ENABLE_ASCEND_API
67-
CREATE(INFINI_DEVICE_ASCEND, ascend);
68-
#endif
6954
#ifdef ENABLE_METAX_API
7055
CREATE(INFINI_DEVICE_METAX, metax);
7156
#endif
7257
#ifdef ENABLE_MOORE_API
7358
CREATE(INFINI_DEVICE_MOORE, moore);
74-
#endif
75-
#ifdef ENABLE_KUNLUN_API
76-
CREATE(INFINI_DEVICE_KUNLUN, kunlun);
7759
#endif
7860
default:
7961
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -109,20 +91,11 @@ __INFINI_C infiniStatus_t infiniopGetBCEWithLogitsWorkspaceSize(
10991
#ifdef ENABLE_HYGON_API
11092
GET(INFINI_DEVICE_HYGON, nvidia);
11193
#endif
112-
#ifdef ENABLE_CAMBRICON_API
113-
GET(INFINI_DEVICE_CAMBRICON, bang);
114-
#endif
115-
#ifdef ENABLE_ASCEND_API
116-
GET(INFINI_DEVICE_ASCEND, ascend);
117-
#endif
11894
#ifdef ENABLE_METAX_API
11995
GET(INFINI_DEVICE_METAX, metax);
12096
#endif
12197
#ifdef ENABLE_MOORE_API
12298
GET(INFINI_DEVICE_MOORE, moore);
123-
#endif
124-
#ifdef ENABLE_KUNLUN_API
125-
GET(INFINI_DEVICE_KUNLUN, kunlun);
12699
#endif
127100
default:
128101
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -164,20 +137,11 @@ __INFINI_C infiniStatus_t infiniopBCEWithLogits(
164137
#ifdef ENABLE_HYGON_API
165138
CALCULATE(INFINI_DEVICE_HYGON, nvidia);
166139
#endif
167-
#ifdef ENABLE_CAMBRICON_API
168-
CALCULATE(INFINI_DEVICE_CAMBRICON, bang);
169-
#endif
170-
#ifdef ENABLE_ASCEND_API
171-
CALCULATE(INFINI_DEVICE_ASCEND, ascend);
172-
#endif
173140
#ifdef ENABLE_METAX_API
174141
CALCULATE(INFINI_DEVICE_METAX, metax);
175142
#endif
176143
#ifdef ENABLE_MOORE_API
177144
CALCULATE(INFINI_DEVICE_MOORE, moore);
178-
#endif
179-
#ifdef ENABLE_KUNLUN_API
180-
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun);
181145
#endif
182146
default:
183147
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -211,20 +175,11 @@ __INFINI_C infiniStatus_t infiniopDestroyBCEWithLogitsDescriptor(infiniopBCEWith
211175
#ifdef ENABLE_HYGON_API
212176
DELETE(INFINI_DEVICE_HYGON, nvidia);
213177
#endif
214-
#ifdef ENABLE_CAMBRICON_API
215-
DELETE(INFINI_DEVICE_CAMBRICON, bang);
216-
#endif
217-
#ifdef ENABLE_ASCEND_API
218-
DELETE(INFINI_DEVICE_ASCEND, ascend);
219-
#endif
220178
#ifdef ENABLE_METAX_API
221179
DELETE(INFINI_DEVICE_METAX, metax);
222180
#endif
223181
#ifdef ENABLE_MOORE_API
224182
DELETE(INFINI_DEVICE_MOORE, moore);
225-
#endif
226-
#ifdef ENABLE_KUNLUN_API
227-
DELETE(INFINI_DEVICE_KUNLUN, kunlun);
228183
#endif
229184
default:
230185
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;

0 commit comments

Comments
 (0)