Skip to content

Commit ea5a6df

Browse files
devrealdevreal
committed
op/cuda: cleanup and remove short float remnants
Signed-off-by: Joseph Schuchart <[email protected]>
1 parent dbda4bd commit ea5a6df

File tree

2 files changed

+3
-193
lines changed

2 files changed

+3
-193
lines changed

‎ompi/mca/op/cuda/op_cuda_functions.c

Lines changed: 3 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,6 @@ FORT_INT_FUNC(max, fortran_integer8, ompi_fortran_integer8_t)
344344
FORT_INT_FUNC(max, fortran_integer16, ompi_fortran_integer16_t)
345345
#endif
346346

347-
#if 0
348-
/* Floating point */
349-
#if defined(HAVE_SHORT_FLOAT)
350-
FUNC_FUNC(max, short_float, short float)
351-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
352-
FUNC_FUNC(max, short_float, opal_short_float_t)
353-
#endif
354-
#endif // 0
355347
FUNC_FUNC(max, float, float)
356348
FUNC_FUNC(max, double, double)
357349
FUNC_FUNC(max, long_double, long double)
@@ -411,15 +403,6 @@ FORT_INT_FUNC(min, fortran_integer8, ompi_fortran_integer8_t)
411403
FORT_INT_FUNC(min, fortran_integer16, ompi_fortran_integer16_t)
412404
#endif
413405

414-
#if 0
415-
/* Floating point */
416-
#if defined(HAVE_SHORT_FLOAT)
417-
FUNC_FUNC(min, short_float, short float)
418-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
419-
FUNC_FUNC(min, short_float, opal_short_float_t)
420-
#endif
421-
#endif // 0
422-
423406
FUNC_FUNC(min, float, float)
424407
FUNC_FUNC(min, double, double)
425408
FUNC_FUNC(min, long_double, long double)
@@ -478,15 +461,6 @@ FORT_INT_FUNC(sum, fortran_integer8, ompi_fortran_integer8_t)
478461
FORT_INT_FUNC(sum, fortran_integer16, ompi_fortran_integer16_t)
479462
#endif
480463

481-
#if 0
482-
/* Floating point */
483-
#if defined(HAVE_SHORT_FLOAT)
484-
OP_FUNC(sum, short_float, short float)
485-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
486-
OP_FUNC(sum, short_float, opal_short_float_t)
487-
#endif
488-
#endif // 0
489-
490464
OP_FUNC(sum, float, float)
491465
OP_FUNC(sum, double, double)
492466
OP_FUNC(sum, long_double, long double)
@@ -508,16 +482,8 @@ FORT_FLOAT_FUNC(sum, fortran_real8, ompi_fortran_real8_t)
508482
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
509483
FORT_FLOAT_FUNC(sum, fortran_real16, ompi_fortran_real16_t)
510484
#endif
511-
/* Complex */
512-
#if 0
513-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
514-
OP_FUNC(sum, c_short_float_complex, short float _Complex)
515-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
516-
COMPLEX_SUM_FUNC(c_short_float_complex, opal_short_float_t)
517-
#endif
518-
OP_FUNC(sum, c_long_double_complex, long double _Complex)
519-
#endif // 0
520485

486+
/* Complex */
521487
FUNC_FUNC(sum, c_float_complex, cuFloatComplex)
522488
FUNC_FUNC(sum, c_double_complex, cuDoubleComplex)
523489

@@ -556,16 +522,8 @@ FORT_INT_FUNC(prod, fortran_integer8, ompi_fortran_integer8_t)
556522
#if OMPI_HAVE_FORTRAN_INTEGER16
557523
FORT_INT_FUNC(prod, fortran_integer16, ompi_fortran_integer16_t)
558524
#endif
559-
/* Floating point */
560-
561-
#if 0
562-
#if defined(HAVE_SHORT_FLOAT)
563-
OP_FUNC(prod, short_float, short float)
564-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
565-
OP_FUNC(prod, short_float, opal_short_float_t)
566-
#endif
567-
#endif // 0
568525

526+
/* Floating point */
569527
OP_FUNC(prod, float, float)
570528
OP_FUNC(prod, double, double)
571529
OP_FUNC(prod, long_double, long double)
@@ -587,16 +545,8 @@ FORT_FLOAT_FUNC(prod, fortran_real8, ompi_fortran_real8_t)
587545
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
588546
FORT_FLOAT_FUNC(prod, fortran_real16, ompi_fortran_real16_t)
589547
#endif
590-
/* Complex */
591-
#if 0
592-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
593-
OP_FUNC(prod, c_short_float_complex, short float _Complex)
594-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
595-
COMPLEX_PROD_FUNC(c_short_float_complex, opal_short_float_t)
596-
#endif
597-
OP_FUNC(prod, c_long_double_complex, long double _Complex)
598-
#endif // 0
599548

549+
/* Complex */
600550
FUNC_FUNC(prod, c_float_complex, cuFloatComplex)
601551
FUNC_FUNC(prod, c_double_complex, cuDoubleComplex)
602552

@@ -1016,13 +966,6 @@ FORT_INT_FUNC_3BUF(max, fortran_integer4, ompi_fortran_integer4_t)
1016966
FORT_INT_FUNC_3BUF(max, fortran_integer8, ompi_fortran_integer8_t)
1017967
#endif
1018968
/* Floating point */
1019-
#if 0
1020-
#if defined(HAVE_SHORT_FLOAT)
1021-
FUNC_FUNC_3BUF(max, short_float, short float)
1022-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
1023-
FUNC_FUNC_3BUF(max, short_float, opal_short_float_t)
1024-
#endif
1025-
#endif // 0
1026969
FUNC_FUNC_3BUF(max, float, float)
1027970
FUNC_FUNC_3BUF(max, double, double)
1028971
FUNC_FUNC_3BUF(max, long_double, long double)
@@ -1082,13 +1025,6 @@ FORT_INT_FUNC_3BUF(min, fortran_integer8, ompi_fortran_integer8_t)
10821025
FORT_INT_FUNC_3BUF(min, fortran_integer16, ompi_fortran_integer16_t)
10831026
#endif
10841027
/* Floating point */
1085-
#if 0
1086-
#if defined(HAVE_SHORT_FLOAT)
1087-
FUNC_FUNC_3BUF(min, short_float, short float)
1088-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
1089-
FUNC_FUNC_3BUF(min, short_float, opal_short_float_t)
1090-
#endif
1091-
#endif // 0
10921028
FUNC_FUNC_3BUF(min, float, float)
10931029
FUNC_FUNC_3BUF(min, double, double)
10941030
FUNC_FUNC_3BUF(min, long_double, long double)
@@ -1147,13 +1083,6 @@ FORT_INT_FUNC_3BUF(sum, fortran_integer8, ompi_fortran_integer8_t)
11471083
FORT_INT_FUNC_3BUF(sum, fortran_integer16, ompi_fortran_integer16_t)
11481084
#endif
11491085
/* Floating point */
1150-
#if 0
1151-
#if defined(HAVE_SHORT_FLOAT)
1152-
OP_FUNC_3BUF(sum, short_float, short float)
1153-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
1154-
OP_FUNC_3BUF(sum, short_float, opal_short_float_t)
1155-
#endif
1156-
#endif // 0
11571086
OP_FUNC_3BUF(sum, float, float)
11581087
OP_FUNC_3BUF(sum, double, double)
11591088
OP_FUNC_3BUF(sum, long_double, long double)
@@ -1176,17 +1105,6 @@ FORT_FLOAT_FUNC_3BUF(sum, fortran_real8, ompi_fortran_real8_t)
11761105
FORT_FLOAT_FUNC_3BUF(sum, fortran_real16, ompi_fortran_real16_t)
11771106
#endif
11781107
/* Complex */
1179-
#if 0
1180-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
1181-
OP_FUNC_3BUF(sum, c_short_float_complex, short float _Complex)
1182-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
1183-
COMPLEX_SUM_FUNC_3BUF(c_short_float_complex, opal_short_float_t)
1184-
#endif
1185-
OP_FUNC_3BUF(sum, c_float_complex, float _Complex)
1186-
OP_FUNC_3BUF(sum, c_double_complex, double _Complex)
1187-
OP_FUNC_3BUF(sum, c_long_double_complex, long double _Complex)
1188-
#endif // 0
1189-
11901108
FUNC_FUNC_3BUF(sum, c_float_complex, cuFloatComplex)
11911109
FUNC_FUNC_3BUF(sum, c_double_complex, cuDoubleComplex)
11921110

@@ -1226,13 +1144,6 @@ FORT_INT_FUNC_3BUF(prod, fortran_integer8, ompi_fortran_integer8_t)
12261144
FORT_INT_FUNC_3BUF(prod, fortran_integer16, ompi_fortran_integer16_t)
12271145
#endif
12281146
/* Floating point */
1229-
#if 0
1230-
#if defined(HAVE_SHORT_FLOAT)
1231-
FORT_FLOAT_FUNC_3BUF(prod, short_float, short float)
1232-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
1233-
FORT_FLOAT_FUNC_3BUF(prod, short_float, opal_short_float_t)
1234-
#endif
1235-
#endif // 0
12361147
OP_FUNC_3BUF(prod, float, float)
12371148
OP_FUNC_3BUF(prod, double, double)
12381149
OP_FUNC_3BUF(prod, long_double, long double)
@@ -1255,15 +1166,6 @@ FORT_FLOAT_FUNC_3BUF(prod, fortran_real8, ompi_fortran_real8_t)
12551166
FORT_FLOAT_FUNC_3BUF(prod, fortran_real16, ompi_fortran_real16_t)
12561167
#endif
12571168
/* Complex */
1258-
#if 0
1259-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
1260-
OP_FUNC_3BUF(prod, c_short_float_complex, short float _Complex)
1261-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
1262-
COMPLEX_PROD_FUNC_3BUF(c_short_float_complex, opal_short_float_t)
1263-
#endif
1264-
OP_FUNC_3BUF(prod, c_long_double_complex, long double _Complex)
1265-
#endif // 0
1266-
12671169
FUNC_FUNC_3BUF(prod, c_float_complex, cuFloatComplex)
12681170
FUNC_FUNC_3BUF(prod, c_double_complex, cuDoubleComplex)
12691171

‎ompi/mca/op/cuda/op_cuda_impl.h

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,7 @@ FUNC_FUNC_SIG(max, uint64_t, uint64_t)
8282
FUNC_FUNC_SIG(max, long, long)
8383
FUNC_FUNC_SIG(max, ulong, unsigned long)
8484

85-
#if 0
8685
/* Floating point */
87-
#if defined(HAVE_SHORT_FLOAT)
88-
FUNC_FUNC_SIG(max, short_float, short float)
89-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
90-
FUNC_FUNC_SIG(max, short_float, opal_short_float_t)
91-
#endif
92-
#endif // 0
93-
9486
FUNC_FUNC_SIG(max, float, float)
9587
FUNC_FUNC_SIG(max, double, double)
9688
FUNC_FUNC_SIG(max, long_double, long double)
@@ -111,15 +103,7 @@ FUNC_FUNC_SIG(min, uint64_t, uint64_t)
111103
FUNC_FUNC_SIG(min, long, long)
112104
FUNC_FUNC_SIG(min, ulong, unsigned long)
113105

114-
#if 0
115106
/* Floating point */
116-
#if defined(HAVE_SHORT_FLOAT)
117-
FUNC_FUNC_SIG(min, short_float, short float)
118-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
119-
FUNC_FUNC_SIG(min, short_float, opal_short_float_t)
120-
#endif
121-
#endif // 0
122-
123107
FUNC_FUNC_SIG(min, float, float)
124108
FUNC_FUNC_SIG(min, double, double)
125109
FUNC_FUNC_SIG(min, long_double, long double)
@@ -140,32 +124,13 @@ OP_FUNC_SIG(sum, uint64_t, uint64_t)
140124
OP_FUNC_SIG(sum, long, long)
141125
OP_FUNC_SIG(sum, ulong, unsigned long)
142126

143-
//#if __CUDA_ARCH__ >= 530
144-
//OP_FUNC_SIG(sum, half, half)
145-
//#endif // __CUDA_ARCH__
146127

147-
#if 0
148128
/* Floating point */
149-
#if defined(HAVE_SHORT_FLOAT)
150-
OP_FUNC_SIG(sum, short_float, short float)
151-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
152-
OP_FUNC_SIG(sum, short_float, opal_short_float_t)
153-
#endif
154-
#endif // 0
155-
156129
OP_FUNC_SIG(sum, float, float)
157130
OP_FUNC_SIG(sum, double, double)
158131
OP_FUNC_SIG(sum, long_double, long double)
159132

160133
/* Complex */
161-
#if 0
162-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
163-
OP_FUNC_SIG(sum, c_short_float_complex, short float _Complex)
164-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
165-
COMPLEX_SUM_FUNC(c_short_float_complex, opal_short_float_t)
166-
OP_FUNC_SIG(sum, c_long_double_complex, long double _Complex)
167-
#endif
168-
#endif // 0
169134
FUNC_FUNC_SIG(sum, c_float_complex, cuFloatComplex)
170135
FUNC_FUNC_SIG(sum, c_double_complex, cuDoubleComplex)
171136

@@ -185,30 +150,11 @@ OP_FUNC_SIG(prod, uint64_t, uint64_t)
185150
OP_FUNC_SIG(prod, long, long)
186151
OP_FUNC_SIG(prod, ulong, unsigned long)
187152

188-
#if 0
189153
/* Floating point */
190-
#if defined(HAVE_SHORT_FLOAT)
191-
OP_FUNC_SIG(prod, short_float, short float)
192-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
193-
OP_FUNC_SIG(prod, short_float, opal_short_float_t)
194-
#endif
195-
#endif // 0
196-
197-
OP_FUNC_SIG(prod, float, float)
198154
OP_FUNC_SIG(prod, float, float)
199155
OP_FUNC_SIG(prod, double, double)
200156
OP_FUNC_SIG(prod, long_double, long double)
201157

202-
/* Complex */
203-
#if 0
204-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
205-
OP_FUNC_SIG(prod, c_short_float_complex, short float _Complex)
206-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
207-
COMPLEX_PROD_FUNC(c_short_float_complex, opal_short_float_t)
208-
#endif
209-
OP_FUNC_SIG(prod, c_long_double_complex, long double _Complex)
210-
#endif // 0
211-
212158
FUNC_FUNC_SIG(prod, c_float_complex, cuFloatComplex)
213159
FUNC_FUNC_SIG(prod, c_double_complex, cuDoubleComplex)
214160

@@ -428,11 +374,6 @@ FUNC_FUNC_3BUF_SIG(max, long, long)
428374
FUNC_FUNC_3BUF_SIG(max, ulong, unsigned long)
429375

430376
/* Floating point */
431-
#if defined(HAVE_SHORT_FLOAT)
432-
FUNC_FUNC_3BUF_SIG(max, short_float, short float)
433-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
434-
FUNC_FUNC_3BUF_SIG(max, short_float, opal_short_float_t)
435-
#endif
436377
FUNC_FUNC_3BUF_SIG(max, float, float)
437378
FUNC_FUNC_3BUF_SIG(max, double, double)
438379
FUNC_FUNC_3BUF_SIG(max, long_double, long double)
@@ -454,11 +395,6 @@ FUNC_FUNC_3BUF_SIG(min, long, long)
454395
FUNC_FUNC_3BUF_SIG(min, ulong, unsigned long)
455396

456397
/* Floating point */
457-
#if defined(HAVE_SHORT_FLOAT)
458-
FUNC_FUNC_3BUF_SIG(min, short_float, short float)
459-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
460-
FUNC_FUNC_3BUF_SIG(min, short_float, opal_short_float_t)
461-
#endif
462398
FUNC_FUNC_3BUF_SIG(min, float, float)
463399
FUNC_FUNC_3BUF_SIG(min, double, double)
464400
FUNC_FUNC_3BUF_SIG(min, long_double, long double)
@@ -480,24 +416,11 @@ OP_FUNC_3BUF_SIG(sum, long, long)
480416
OP_FUNC_3BUF_SIG(sum, ulong, unsigned long)
481417

482418
/* Floating point */
483-
#if defined(HAVE_SHORT_FLOAT)
484-
OP_FUNC_3BUF_SIG(sum, short_float, short float)
485-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
486-
OP_FUNC_3BUF_SIG(sum, short_float, opal_short_float_t)
487-
#endif
488419
OP_FUNC_3BUF_SIG(sum, float, float)
489420
OP_FUNC_3BUF_SIG(sum, double, double)
490421
OP_FUNC_3BUF_SIG(sum, long_double, long double)
491422

492423
/* Complex */
493-
#if 0
494-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
495-
OP_FUNC_3BUF_SIG(sum, c_short_float_complex, short float _Complex)
496-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
497-
COMPLEX_SUM_FUNC_3BUF(c_short_float_complex, opal_short_float_t)
498-
#endif
499-
OP_FUNC_3BUF_SIG(sum, c_long_double_complex, long double _Complex)
500-
#endif // 0
501424
FUNC_FUNC_3BUF_SIG(sum, c_float_complex, cuFloatComplex)
502425
FUNC_FUNC_3BUF_SIG(sum, c_double_complex, cuDoubleComplex)
503426

@@ -518,26 +441,11 @@ OP_FUNC_3BUF_SIG(prod, long, long)
518441
OP_FUNC_3BUF_SIG(prod, ulong, unsigned long)
519442

520443
/* Floating point */
521-
#if defined(HAVE_SHORT_FLOAT)
522-
OP_FUNC_3BUF_SIG(prod, short_float, short float)
523-
#elif defined(HAVE_OPAL_SHORT_FLOAT_T)
524-
OP_FUNC_3BUF_SIG(prod, short_float, opal_short_float_t)
525-
#endif
526444
OP_FUNC_3BUF_SIG(prod, float, float)
527445
OP_FUNC_3BUF_SIG(prod, double, double)
528446
OP_FUNC_3BUF_SIG(prod, long_double, long double)
529447

530448
/* Complex */
531-
#if 0
532-
#if defined(HAVE_SHORT_FLOAT__COMPLEX)
533-
OP_FUNC_3BUF_SIG(prod, c_short_float_complex, short float _Complex)
534-
#elif defined(HAVE_OPAL_SHORT_FLOAT_COMPLEX_T)
535-
COMPLEX_PROD_FUNC_3BUF(c_short_float_complex, opal_short_float_t)
536-
#endif
537-
OP_FUNC_3BUF_SIG(prod, c_float_complex, float _Complex)
538-
OP_FUNC_3BUF_SIG(prod, c_double_complex, double _Complex)
539-
OP_FUNC_3BUF_SIG(prod, c_long_double_complex, long double _Complex)
540-
#endif // 0
541449
FUNC_FUNC_3BUF_SIG(prod, c_float_complex, cuFloatComplex)
542450
FUNC_FUNC_3BUF_SIG(prod, c_double_complex, cuDoubleComplex)
543451

0 commit comments

Comments
 (0)