Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4b46e00

Browse files
Source-RocSource-Roc
authored
Finish cleaning up usage of VERSION_GE_1_1/1_3/1_5 macros (#1937)
1 parent 5c8860f commit 4b46e00

3 files changed

Lines changed: 0 additions & 98 deletions

File tree

‎csrc/layer_norm_cuda.cpp‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
namespace {
77
void compute_n1_n2(
88
at::Tensor input,
9-
#ifdef VERSION_GE_1_1
109
at::IntArrayRef normalized_shape,
11-
#else
12-
at::IntList normalized_shape,
13-
#endif
1410
int& n1,
1511
int& n2)
1612
{
@@ -27,11 +23,7 @@ void compute_n1_n2(
2723
}
2824

2925
void check_args(
30-
#ifdef VERSION_GE_1_1
3126
at::IntArrayRef normalized_shape,
32-
#else
33-
at::IntList normalized_shape,
34-
#endif
3527
at::Tensor gamma,
3628
at::Tensor beta
3729
)
@@ -41,11 +33,7 @@ void check_args(
4133
}
4234

4335
void check_args(
44-
#ifdef VERSION_GE_1_1
4536
at::IntArrayRef normalized_shape,
46-
#else
47-
at::IntList normalized_shape,
48-
#endif
4937
at::Tensor gamma
5038
)
5139
{
@@ -55,11 +43,7 @@ void check_args(
5543

5644
void check_args(
5745
at::Tensor input,
58-
#ifdef VERSION_GE_1_1
5946
at::IntArrayRef normalized_shape,
60-
#else
61-
at::IntList normalized_shape,
62-
#endif
6347
int& n1,
6448
int& n2
6549
)
@@ -94,11 +78,7 @@ void check_args(
9478

9579
void check_args(
9680
at::Tensor input,
97-
#ifdef VERSION_GE_1_1
9881
at::IntArrayRef normalized_shape,
99-
#else
100-
at::IntList normalized_shape,
101-
#endif
10282
at::Tensor gamma,
10383
at::Tensor beta,
10484
int& n1,
@@ -111,11 +91,7 @@ void check_args(
11191

11292
void check_args(
11393
at::Tensor input,
114-
#ifdef VERSION_GE_1_1
11594
at::IntArrayRef normalized_shape,
116-
#else
117-
at::IntList normalized_shape,
118-
#endif
11995
at::Tensor gamma,
12096
int& n1,
12197
int& n2
@@ -133,11 +109,7 @@ void cuda_layer_norm(
133109
at::Tensor* input,
134110
int n1,
135111
int n2,
136-
#ifdef VERSION_GE_1_1
137112
at::IntArrayRef normalized_shape,
138-
#else
139-
at::IntList normalized_shape,
140-
#endif
141113
at::Tensor* gamma,
142114
at::Tensor* beta,
143115
double epsilon);
@@ -148,11 +120,7 @@ void cuda_layer_norm(
148120

149121
std::vector<at::Tensor> layer_norm(
150122
at::Tensor input,
151-
#ifdef VERSION_GE_1_1
152123
at::IntArrayRef normalized_shape,
153-
#else
154-
at::IntList normalized_shape,
155-
#endif
156124
double epsilon) {
157125
CHECK_INPUT(input);
158126
int n1,n2;
@@ -167,11 +135,7 @@ std::vector<at::Tensor> layer_norm(
167135

168136
std::vector<at::Tensor> layer_norm_affine(
169137
at::Tensor input,
170-
#ifdef VERSION_GE_1_1
171138
at::IntArrayRef normalized_shape,
172-
#else
173-
at::IntList normalized_shape,
174-
#endif
175139
at::Tensor gamma,
176140
at::Tensor beta,
177141
double epsilon) {
@@ -191,11 +155,7 @@ std::vector<at::Tensor> layer_norm_affine(
191155

192156
std::vector<at::Tensor> layer_norm_affine_mixed_dtypes(
193157
at::Tensor input,
194-
#ifdef VERSION_GE_1_1
195158
at::IntArrayRef normalized_shape,
196-
#else
197-
at::IntList normalized_shape,
198-
#endif
199159
at::Tensor gamma,
200160
at::Tensor beta,
201161
double epsilon) {
@@ -217,11 +177,7 @@ void cuda_layer_norm_gradient(
217177
at::Tensor* input_or_output,
218178
int n1,
219179
int n2,
220-
#ifdef VERSION_GE_1_1
221180
at::IntArrayRef normalized_shape,
222-
#else
223-
at::IntList normalized_shape,
224-
#endif
225181
at::Tensor* gamma,
226182
at::Tensor* beta,
227183
double epsilon,
@@ -236,11 +192,7 @@ at::Tensor layer_norm_gradient(
236192
c10::optional<at::Tensor> mean_,
237193
at::Tensor invvar,
238194
at::Tensor input_or_output,
239-
#ifdef VERSION_GE_1_1
240195
at::IntArrayRef normalized_shape,
241-
#else
242-
at::IntList normalized_shape,
243-
#endif
244196
double epsilon,
245197
bool memory_efficient) {
246198
CHECK_INPUT(dout);
@@ -266,11 +218,7 @@ std::vector<at::Tensor> layer_norm_gradient_affine(
266218
c10::optional<at::Tensor> mean_,
267219
at::Tensor invvar,
268220
at::Tensor input_or_output,
269-
#ifdef VERSION_GE_1_1
270221
at::IntArrayRef normalized_shape,
271-
#else
272-
at::IntList normalized_shape,
273-
#endif
274222
at::Tensor gamma,
275223
at::Tensor beta,
276224
double epsilon,
@@ -304,11 +252,7 @@ void cuda_rms_norm(
304252
at::Tensor* input,
305253
int n1,
306254
int n2,
307-
#ifdef VERSION_GE_1_1
308255
at::IntArrayRef normalized_shape,
309-
#else
310-
at::IntList normalized_shape,
311-
#endif
312256
at::Tensor* gamma,
313257
double epsilon);
314258

@@ -318,11 +262,7 @@ void cuda_rms_norm(
318262

319263
std::vector<at::Tensor> rms_norm(
320264
at::Tensor input,
321-
#ifdef VERSION_GE_1_1
322265
at::IntArrayRef normalized_shape,
323-
#else
324-
at::IntList normalized_shape,
325-
#endif
326266
double epsilon) {
327267
CHECK_INPUT(input);
328268
int n1,n2;
@@ -336,11 +276,7 @@ std::vector<at::Tensor> rms_norm(
336276

337277
std::vector<at::Tensor> rms_norm_affine(
338278
at::Tensor input,
339-
#ifdef VERSION_GE_1_1
340279
at::IntArrayRef normalized_shape,
341-
#else
342-
at::IntList normalized_shape,
343-
#endif
344280
at::Tensor gamma,
345281
double epsilon) {
346282
CHECK_INPUT(input);
@@ -357,11 +293,7 @@ std::vector<at::Tensor> rms_norm_affine(
357293

358294
std::vector<at::Tensor> rms_norm_affine_mixed_dtypes(
359295
at::Tensor input,
360-
#ifdef VERSION_GE_1_1
361296
at::IntArrayRef normalized_shape,
362-
#else
363-
at::IntList normalized_shape,
364-
#endif
365297
at::Tensor gamma,
366298
double epsilon) {
367299
CHECK_INPUT(input);
@@ -381,11 +313,7 @@ void cuda_rms_norm_gradient(
381313
at::Tensor* input_or_output,
382314
int n1,
383315
int n2,
384-
#ifdef VERSION_GE_1_1
385316
at::IntArrayRef normalized_shape,
386-
#else
387-
at::IntList normalized_shape,
388-
#endif
389317
at::Tensor* gamma,
390318
double epsilon,
391319
at::Tensor* grad_input,
@@ -396,11 +324,7 @@ at::Tensor rms_norm_gradient(
396324
at::Tensor dout,
397325
at::Tensor invvar,
398326
at::Tensor input_or_output,
399-
#ifdef VERSION_GE_1_1
400327
at::IntArrayRef normalized_shape,
401-
#else
402-
at::IntList normalized_shape,
403-
#endif
404328
double epsilon,
405329
bool memory_efficient) {
406330
CHECK_INPUT(dout);
@@ -419,11 +343,7 @@ std::vector<at::Tensor> rms_norm_gradient_affine(
419343
at::Tensor dout,
420344
at::Tensor invvar,
421345
at::Tensor input_or_output,
422-
#ifdef VERSION_GE_1_1
423346
at::IntArrayRef normalized_shape,
424-
#else
425-
at::IntList normalized_shape,
426-
#endif
427347
at::Tensor gamma,
428348
double epsilon,
429349
bool memory_efficient) {

‎csrc/layer_norm_cuda_kernel.cu‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -975,11 +975,7 @@ void cuda_layer_norm(
975975
at::Tensor* input,
976976
int n1,
977977
int n2,
978-
#ifdef VERSION_GE_1_1
979978
at::IntArrayRef normalized_shape,
980-
#else
981-
at::IntList normalized_shape,
982-
#endif
983979
at::Tensor* gamma,
984980
at::Tensor* beta,
985981
double epsilon)
@@ -1006,11 +1002,7 @@ void cuda_rms_norm(
10061002
at::Tensor* input,
10071003
int n1,
10081004
int n2,
1009-
#ifdef VERSION_GE_1_1
10101005
at::IntArrayRef normalized_shape,
1011-
#else
1012-
at::IntList normalized_shape,
1013-
#endif
10141006
at::Tensor* gamma,
10151007
double epsilon)
10161008
{
@@ -1211,11 +1203,7 @@ void cuda_layer_norm_gradient(
12111203
at::Tensor* input_or_output,
12121204
int n1,
12131205
int n2,
1214-
#ifdef VERSION_GE_1_1
12151206
at::IntArrayRef normalized_shape,
1216-
#else
1217-
at::IntList normalized_shape,
1218-
#endif
12191207
at::Tensor* gamma,
12201208
at::Tensor* beta,
12211209
double epsilon,
@@ -1253,11 +1241,7 @@ void cuda_rms_norm_gradient(
12531241
at::Tensor* input_or_output,
12541242
int n1,
12551243
int n2,
1256-
#ifdef VERSION_GE_1_1
12571244
at::IntArrayRef normalized_shape,
1258-
#else
1259-
at::IntList normalized_shape,
1260-
#endif
12611245
at::Tensor* gamma,
12621246
double epsilon,
12631247
at::Tensor* grad_input,

‎csrc/multi_tensor_apply.cuh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ void multi_tensor_apply(
5959
{
6060
// TODO: Print which tensor fails.
6161
bool contiguous_memory = tensor_lists[l][t].is_contiguous();
62-
#ifdef VERSION_GE_1_5
6362
contiguous_memory = (contiguous_memory || tensor_lists[l][t].is_contiguous(at::MemoryFormat::ChannelsLast) || tensor_lists[l][t].is_contiguous(at::MemoryFormat::ChannelsLast3d));
64-
#endif
6563
TORCH_CHECK(contiguous_memory, "A tensor was not contiguous.");
6664
TORCH_CHECK(tensor_lists[l][t].device() == ref_device, "A tensor was not on the same device as the first tensor");
6765
TORCH_CHECK(tensor_lists[l][t].numel() == tensor_lists[0][t].numel(), "Size mismatch");

0 commit comments

Comments
 (0)