Skip to content

Commit e72c729

Browse files
cyyeverfacebook-github-bot
cyyever
authored and
facebook-github-bot
committed
Remove extra semicolons (#4440)
Summary: X-link: facebookresearch/FBGEMM#1507 Because Pytorch has warnings about semicolons in FBGEMM. Pull Request resolved: #4440 Reviewed By: q10 Differential Revision: D77708523 Pulled By: jianyuh fbshipit-source-id: 95bbb6651fc6ca0bfef5f757f69374a2def42c5e
1 parent 1d7d50e commit e72c729

File tree

4 files changed

+78
-79
lines changed

4 files changed

+78
-79
lines changed

‎include/fbgemm/FloatConversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ inline float16 cpu_float2half_rz(float f) {
226226
/*Src=*/detail::IEEE754Single,
227227
/*Tgt=*/detail::IEEE754Half,
228228
detail::RoundingMode::ToZero>(f_u32);
229-
};
229+
}
230230

231231
// Converts a 16-bit unsigned integer representation of a IEEE754 half-precision
232232
// float into an IEEE754 32-bit single-precision float

‎src/ExecuteKernelU8S8.cc

Lines changed: 74 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -389,27 +389,27 @@ void ExecuteKernel<
389389
ReQuantizeOutput<RELU, Q_GRAN, BIAS_TYPE>>;
390390

391391
#define INSTANTIATE_REQUANT_BIAS_T(PACK_A, ACC_T, RELU, Q_GRAN) \
392-
INSTANTIATE_REQUANT_BASE(PACK_A, ACC_T, RELU, Q_GRAN, float); \
393-
INSTANTIATE_REQUANT_BASE(PACK_A, ACC_T, RELU, Q_GRAN, int32_t);
392+
INSTANTIATE_REQUANT_BASE(PACK_A, ACC_T, RELU, Q_GRAN, float) \
393+
INSTANTIATE_REQUANT_BASE(PACK_A, ACC_T, RELU, Q_GRAN, int32_t)
394394

395-
#define INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, RELU) \
396-
INSTANTIATE_REQUANT_BIAS_T( \
397-
PACK_A, ACC_T, RELU, QuantizationGranularity::TENSOR); \
398-
INSTANTIATE_REQUANT_BIAS_T( \
399-
PACK_A, ACC_T, RELU, QuantizationGranularity::GROUP); \
400-
INSTANTIATE_REQUANT_BIAS_T( \
401-
PACK_A, ACC_T, RELU, QuantizationGranularity::OUT_CHANNEL);
395+
#define INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, RELU) \
396+
INSTANTIATE_REQUANT_BIAS_T( \
397+
PACK_A, ACC_T, RELU, QuantizationGranularity::TENSOR) \
398+
INSTANTIATE_REQUANT_BIAS_T( \
399+
PACK_A, ACC_T, RELU, QuantizationGranularity::GROUP) \
400+
INSTANTIATE_REQUANT_BIAS_T( \
401+
PACK_A, ACC_T, RELU, QuantizationGranularity::OUT_CHANNEL)
402402

403-
#define INSTANTIATE_REQUANT_RELU(PACK_A, ACC_T) \
404-
INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, false); \
405-
INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, true);
403+
#define INSTANTIATE_REQUANT_RELU(PACK_A, ACC_T) \
404+
INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, false) \
405+
INSTANTIATE_REQUANT_Q_GRANS(PACK_A, ACC_T, true)
406406

407-
#define INSTANTIATE_REQUANT_ACC_T(PACK_A) \
408-
INSTANTIATE_REQUANT_RELU(PACK_A, int32_t); \
409-
INSTANTIATE_REQUANT_RELU(PACK_A, int16_t);
407+
#define INSTANTIATE_REQUANT_ACC_T(PACK_A) \
408+
INSTANTIATE_REQUANT_RELU(PACK_A, int32_t) \
409+
INSTANTIATE_REQUANT_RELU(PACK_A, int16_t)
410410

411-
INSTANTIATE_REQUANT_ACC_T(PackAMatrix);
412-
INSTANTIATE_REQUANT_ACC_T(PackAWithRowOffset);
411+
INSTANTIATE_REQUANT_ACC_T(PackAMatrix)
412+
INSTANTIATE_REQUANT_ACC_T(PackAWithRowOffset)
413413

414414
#undef INSTANTIATE_REQUANT_ACC_T
415415
#undef INSTANTIATE_REQUANT_RELU
@@ -426,28 +426,28 @@ INSTANTIATE_REQUANT_ACC_T(PackAWithRowOffset);
426426
ReQuantizeOutput<RELU, Q_GRAN, BIAS_TYPE>>;
427427

428428
#define INSTANTIATE_IM2COL_REQUANT_BIAS_T(ACC_T, RELU, SPATIAL_DIM, Q_GRAN) \
429-
INSTANTIATE_IM2COL_REQUANT_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, float); \
430-
INSTANTIATE_IM2COL_REQUANT_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, int32_t);
429+
INSTANTIATE_IM2COL_REQUANT_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, float) \
430+
INSTANTIATE_IM2COL_REQUANT_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, int32_t)
431431

432432
#define INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, SPATIAL_DIM) \
433433
INSTANTIATE_IM2COL_REQUANT_BIAS_T( \
434-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR); \
434+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR) \
435435
INSTANTIATE_IM2COL_REQUANT_BIAS_T( \
436-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP); \
436+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP) \
437437
INSTANTIATE_IM2COL_REQUANT_BIAS_T( \
438-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL);
438+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL)
439439

440440
#define INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM(ACC_T, RELU) \
441-
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 1); \
442-
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 2); \
443-
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 3);
441+
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 1) \
442+
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 2) \
443+
INSTANTIATE_IM2COL_REQUANT_Q_GRANS(ACC_T, RELU, 3)
444444

445-
#define INSTANTIATE_IM2COL_REQUANT_RELU(ACC_T) \
446-
INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM(ACC_T, false); \
447-
INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM(ACC_T, true);
445+
#define INSTANTIATE_IM2COL_REQUANT_RELU(ACC_T) \
446+
INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM(ACC_T, false) \
447+
INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM(ACC_T, true)
448448

449-
INSTANTIATE_IM2COL_REQUANT_RELU(int32_t);
450-
INSTANTIATE_IM2COL_REQUANT_RELU(int16_t);
449+
INSTANTIATE_IM2COL_REQUANT_RELU(int32_t)
450+
INSTANTIATE_IM2COL_REQUANT_RELU(int16_t)
451451

452452
#undef INSTANTIATE_IM2COL_REQUANT_RELU
453453
#undef INSTANTIATE_IM2COL_REQUANT_SPATIAL_DIM
@@ -464,20 +464,19 @@ INSTANTIATE_IM2COL_REQUANT_RELU(int16_t);
464464
float, \
465465
ReQuantizeForFloat<RELU, Q_GRAN>>;
466466

467-
#define INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, RELU) \
468-
INSTANTIATE_REQUANT_FLOAT_BASE( \
469-
PACK_A, RELU, QuantizationGranularity::TENSOR); \
470-
INSTANTIATE_REQUANT_FLOAT_BASE( \
471-
PACK_A, RELU, QuantizationGranularity::GROUP); \
472-
INSTANTIATE_REQUANT_FLOAT_BASE( \
473-
PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL);
467+
#define INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, RELU) \
468+
INSTANTIATE_REQUANT_FLOAT_BASE( \
469+
PACK_A, RELU, QuantizationGranularity::TENSOR) \
470+
INSTANTIATE_REQUANT_FLOAT_BASE(PACK_A, RELU, QuantizationGranularity::GROUP) \
471+
INSTANTIATE_REQUANT_FLOAT_BASE( \
472+
PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL)
474473

475-
#define INSTANTIATE_REQUANT_FLOAT_RELU(PACK_A) \
476-
INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, false); \
477-
INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, true);
474+
#define INSTANTIATE_REQUANT_FLOAT_RELU(PACK_A) \
475+
INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, false) \
476+
INSTANTIATE_REQUANT_FLOAT_Q_GRANS(PACK_A, true)
478477

479-
INSTANTIATE_REQUANT_FLOAT_RELU(PackAWithRowOffset);
480-
INSTANTIATE_REQUANT_FLOAT_RELU(PackAWithQuantRowOffset);
478+
INSTANTIATE_REQUANT_FLOAT_RELU(PackAWithRowOffset)
479+
INSTANTIATE_REQUANT_FLOAT_RELU(PackAWithQuantRowOffset)
481480

482481
#undef INSTANTIATE_REQUANT_FLOAT_RELU
483482
#undef INSTANTIATE_REQUANT_FLOAT_Q_GRANS
@@ -493,23 +492,23 @@ INSTANTIATE_REQUANT_FLOAT_RELU(PackAWithQuantRowOffset);
493492

494493
#define INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, SPATIAL_DIM) \
495494
INSTANTIATE_REQUANT_FLOAT_IM2COL_BASE( \
496-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR); \
495+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR) \
497496
INSTANTIATE_REQUANT_FLOAT_IM2COL_BASE( \
498-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP); \
497+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP) \
499498
INSTANTIATE_REQUANT_FLOAT_IM2COL_BASE( \
500-
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL);
499+
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL)
501500

502501
#define INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM(ACC_T, RELU) \
503-
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 1); \
504-
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 2); \
505-
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 3);
502+
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 1) \
503+
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 2) \
504+
INSTANTIATE_REQUANT_FLOAT_IM2COL_Q_GRANS(ACC_T, RELU, 3)
506505

507-
#define INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(ACC_T) \
508-
INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM(ACC_T, false); \
509-
INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM(ACC_T, true);
506+
#define INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(ACC_T) \
507+
INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM(ACC_T, false) \
508+
INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM(ACC_T, true)
510509

511-
INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(int32_t);
512-
INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(int16_t);
510+
INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(int32_t)
511+
INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU(int16_t)
513512

514513
#undef INSTANTIATE_REQUANT_FLOAT_IM2COL_RELU
515514
#undef INSTANTIATE_REQUANT_FLOAT_IM2COL_SPATIAL_DIM
@@ -531,17 +530,17 @@ template class ExecuteKernel<
531530
uint8_t, \
532531
DoSpmdmOnInpBuffer<uint8_t, int32_t, ReQuantizeOutput<RELU, Q_GRAN>>>;
533532

534-
#define INSTANTIATE_SPMDM_Q_GRANS(PACK_A, RELU) \
535-
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR); \
536-
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::GROUP); \
537-
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL);
533+
#define INSTANTIATE_SPMDM_Q_GRANS(PACK_A, RELU) \
534+
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR) \
535+
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::GROUP) \
536+
INSTANTIATE_SPMDM_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL)
538537

539-
#define INSTANTIATE_SPMDM_RELU(PACK_A) \
540-
INSTANTIATE_SPMDM_Q_GRANS(PACK_A, false); \
541-
INSTANTIATE_SPMDM_Q_GRANS(PACK_A, true);
538+
#define INSTANTIATE_SPMDM_RELU(PACK_A) \
539+
INSTANTIATE_SPMDM_Q_GRANS(PACK_A, false) \
540+
INSTANTIATE_SPMDM_Q_GRANS(PACK_A, true)
542541

543-
INSTANTIATE_SPMDM_RELU(PackAMatrix);
544-
INSTANTIATE_SPMDM_RELU(PackAWithRowOffset);
542+
INSTANTIATE_SPMDM_RELU(PackAMatrix)
543+
INSTANTIATE_SPMDM_RELU(PackAWithRowOffset)
545544

546545
#undef INSTANTIATE_SPMDM_RELU
547546
#undef INSTANTIATE_SPMDM_Q_GRANS
@@ -554,13 +553,13 @@ INSTANTIATE_SPMDM_RELU(PackAWithRowOffset);
554553
uint8_t, \
555554
DoSConvOnInpBuffer<uint8_t, int32_t, ReQuantizeOutput<RELU, Q_GRAN>>>;
556555

557-
#define INSTANTIATE_SCONV_Q_GRANS(RELU) \
558-
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::TENSOR); \
559-
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::GROUP); \
560-
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::OUT_CHANNEL);
556+
#define INSTANTIATE_SCONV_Q_GRANS(RELU) \
557+
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::TENSOR) \
558+
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::GROUP) \
559+
INSTANTIATE_SCONV_BASE(RELU, QuantizationGranularity::OUT_CHANNEL)
561560

562-
INSTANTIATE_SCONV_Q_GRANS(false);
563-
INSTANTIATE_SCONV_Q_GRANS(true);
561+
INSTANTIATE_SCONV_Q_GRANS(false)
562+
INSTANTIATE_SCONV_Q_GRANS(true)
564563

565564
#undef INSTANTIATE_SCONV_Q_GRANS
566565
#undef INSTANTIATE_SCONV_BASE
@@ -584,8 +583,8 @@ template class ExecuteKernel<
584583
INSTANTIATE_MEMCPY_BASE(PACK_A, int32_t) \
585584
INSTANTIATE_MEMCPY_BASE(PACK_A, int16_t)
586585

587-
INSTANTIATE_MEMCPY_ACC_T(PackAMatrix);
588-
INSTANTIATE_MEMCPY_ACC_T(PackAWithRowOffset);
586+
INSTANTIATE_MEMCPY_ACC_T(PackAMatrix)
587+
INSTANTIATE_MEMCPY_ACC_T(PackAWithRowOffset)
589588

590589
#undef INSTANTIATE_MEMCPY_ACC_T
591590
#undef INSTANTIATE_MEMCPY_BASE
@@ -598,12 +597,12 @@ INSTANTIATE_MEMCPY_ACC_T(PackAWithRowOffset);
598597
memCopy<>>;
599598

600599
#define INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM(ACC_T) \
601-
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 1); \
602-
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 2); \
603-
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 3);
600+
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 1) \
601+
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 2) \
602+
INSTANTIATE_MEMCPY_IM2COL_BASE(ACC_T, 3)
604603

605-
INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM(int32_t);
606-
INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM(int16_t);
604+
INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM(int32_t)
605+
INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM(int16_t)
607606

608607
#undef INSTANTIATE_MEMCPY_IM2COL_SPATIAL_DIM
609608
#undef INSTANTIATE_MEMCPY_IM2COL_BASE

‎src/Fbgemm.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ INSTANTIATE_RELU(int16_t)
436436
INSTANTIATE_Q_GRANS(PACK_A, true)
437437

438438
INSTANTIATE_RELU(PackAWithRowOffset)
439-
INSTANTIATE_RELU(PackAWithQuantRowOffset);
439+
INSTANTIATE_RELU(PackAWithQuantRowOffset)
440440

441441
#undef INSTANTIATE_RELU
442442
#undef INSTANTIATE_Q_GRANS

‎src/GroupwiseConv.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,8 +1368,8 @@ template FBGEMM_API int rowOffsetBufferSizeGConv<3>(
13681368
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::GROUP) \
13691369
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::OUT_CHANNEL)
13701370

1371-
INSTANTIATE_Q_GRANS(false);
1372-
INSTANTIATE_Q_GRANS(true);
1371+
INSTANTIATE_Q_GRANS(false)
1372+
INSTANTIATE_Q_GRANS(true)
13731373

13741374
#undef INSTANTIATE_Q_GRANS
13751375
#undef INSTANTIATE_SPATIAL_DIM

0 commit comments

Comments
 (0)