Skip to content

Commit

Permalink
remove pendatic to avoid compile error (pytorch#701)
Browse files Browse the repository at this point in the history 
Summary: Pull Request resolved: pytorch#701

Reviewed By: dskhudia

Differential Revision: D30955087

fbshipit-source-id: 903598551adac15690198a14f11283774c81194c
  • Loading branch information
@jspark1105 @facebook-github-bot
jspark1105 authored and facebook-github-bot committed Sep 16, 2021
1 parent e187e74 commit 91fc122
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion include/fbgemm/FbgemmConvert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,4 @@ FBGEMM_API void RoundToFloat16(
bool clamp = false,
bool clamp_denorms = false);

}; // namespace fbgemm
} // namespace fbgemm
4 changes: 2 additions & 2 deletions src/EmbeddingSpMDM.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1253,8 +1253,8 @@ void compressed_indices_remap(
INDEX_TYPE* out_offsets, \
float* out_weights);

INSTANTIATE_REMAP_BASE(int32_t);
INSTANTIATE_REMAP_BASE(int64_t);
INSTANTIATE_REMAP_BASE(int32_t)
INSTANTIATE_REMAP_BASE(int64_t)

#undef INSTANTIATE_REMAP_BASE

Expand Down
8 changes: 4 additions & 4 deletions src/EmbeddingSpMDMAvx512.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,10 @@ void compressed_indices_remap_avx512(
INDEX_TYPE* out_offsets, \
float* out_weights);

INSTANTIATE_REMAP_BASE(int32_t, true);
INSTANTIATE_REMAP_BASE(int32_t, false);
INSTANTIATE_REMAP_BASE(int64_t, true);
INSTANTIATE_REMAP_BASE(int64_t, false);
INSTANTIATE_REMAP_BASE(int32_t, true)
INSTANTIATE_REMAP_BASE(int32_t, false)
INSTANTIATE_REMAP_BASE(int64_t, true)
INSTANTIATE_REMAP_BASE(int64_t, false)

#undef INSTANTIATE_REMAP_BASE

Expand Down
142 changes: 71 additions & 71 deletions src/Fbgemm.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,19 +280,19 @@ template class FBGEMM_API

#define INSTANTIATE_BASE(FNAME, RELU, Q_GRAN) \
template class FBGEMM_API \
FNAME<std::uint8_t, std::int32_t, ReQuantizeOutput<RELU, Q_GRAN>>
FNAME<std::uint8_t, std::int32_t, ReQuantizeOutput<RELU, Q_GRAN>>;

#define INSTANTIATE_Q_GRAN(FNAME, RELU) \
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BASE(FNAME, RELU, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_RELU(FNAME) \
INSTANTIATE_Q_GRAN(FNAME, false); \
INSTANTIATE_Q_GRAN(FNAME, true);
INSTANTIATE_Q_GRAN(FNAME, false) \
INSTANTIATE_Q_GRAN(FNAME, true)

INSTANTIATE_RELU(DoSpmdmOnInpBuffer);
INSTANTIATE_RELU(DoSConvOnInpBuffer);
INSTANTIATE_RELU(DoSpmdmOnInpBuffer)
INSTANTIATE_RELU(DoSConvOnInpBuffer)

#undef INSTANTIATE_RELU
#undef INSTANTIATE_Q_GRAN
Expand All @@ -311,12 +311,12 @@ template class FBGEMM_API DoSpmdmOnInpBuffer<
INSTANTIATE_BASE(RELU, Q_GRAN, float)

#define INSTANTIATE_Q_GRAN(RELU) \
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BIAS_T(RELU, QuantizationGranularity::OUT_CHANNEL)

INSTANTIATE_Q_GRAN(false);
INSTANTIATE_Q_GRAN(true);
INSTANTIATE_Q_GRAN(false)
INSTANTIATE_Q_GRAN(true)

#undef INSTANTIATE_Q_GRAN
#undef INSTANTIATE_BIAS_T
Expand All @@ -336,24 +336,24 @@ INSTANTIATE_Q_GRAN(true);
const BlockingFactors* blocking_params);

#define INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, Q_GRAN) \
INSTANTIATE_BASE(PACK_A, ACC_T, RELU, Q_GRAN, float); \
INSTANTIATE_BASE(PACK_A, ACC_T, RELU, Q_GRAN, int32_t);
INSTANTIATE_BASE(PACK_A, ACC_T, RELU, Q_GRAN, float) \
INSTANTIATE_BASE(PACK_A, ACC_T, RELU, Q_GRAN, int32_t)

#define INSTANTIATE_Q_GRANS(PACK_A, ACC_T, RELU) \
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BIAS_T(PACK_A, ACC_T, RELU, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_RELU(PACK_A, ACC_T) \
INSTANTIATE_Q_GRANS(PACK_A, ACC_T, false); \
INSTANTIATE_Q_GRANS(PACK_A, ACC_T, true);
INSTANTIATE_Q_GRANS(PACK_A, ACC_T, false) \
INSTANTIATE_Q_GRANS(PACK_A, ACC_T, true)

#define INSTANTIATE_ACC_T(PACK_A) \
INSTANTIATE_RELU(PACK_A, int32_t); \
INSTANTIATE_RELU(PACK_A, int16_t);
INSTANTIATE_RELU(PACK_A, int32_t) \
INSTANTIATE_RELU(PACK_A, int16_t)

INSTANTIATE_ACC_T(PackAMatrix);
INSTANTIATE_ACC_T(PackAWithRowOffset);
INSTANTIATE_ACC_T(PackAMatrix)
INSTANTIATE_ACC_T(PackAWithRowOffset)

#undef INSTANTIATE_ACC_T
#undef INSTANTIATE_RELU
Expand All @@ -377,28 +377,28 @@ INSTANTIATE_ACC_T(PackAWithRowOffset);
const BlockingFactors* blocking_params);

#define INSTANTIATE_BIAS_T(ACC_T, RELU, SPATIAL_DIM, Q_GRAN) \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, float); \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, int32_t);
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, float) \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, Q_GRAN, int32_t)

#define INSTANTIATE_Q_GRANS(ACC_T, RELU, SPATIAL_DIM) \
INSTANTIATE_BIAS_T( \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR); \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR) \
INSTANTIATE_BIAS_T( \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP); \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP) \
INSTANTIATE_BIAS_T( \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL);
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_SPATIAL_DIM(ACC_T, RELU) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 1); \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 2); \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 3);
INSTANTIATE_Q_GRANS(ACC_T, RELU, 1) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 2) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 3)

#define INSTANTIATE_RELU(ACC_T) \
INSTANTIATE_SPATIAL_DIM(ACC_T, false); \
INSTANTIATE_SPATIAL_DIM(ACC_T, true);
INSTANTIATE_SPATIAL_DIM(ACC_T, false) \
INSTANTIATE_SPATIAL_DIM(ACC_T, true)

INSTANTIATE_RELU(int32_t);
INSTANTIATE_RELU(int16_t);
INSTANTIATE_RELU(int32_t)
INSTANTIATE_RELU(int16_t)

#undef INSTANTIATE_RELU
#undef INSTANTIATE_SPATIAL_DIM
Expand All @@ -421,15 +421,15 @@ INSTANTIATE_RELU(int16_t);
const BlockingFactors* blocking_params);

#define INSTANTIATE_Q_GRANS(PACK_A, RELU) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_RELU(PACK_A) \
INSTANTIATE_Q_GRANS(PACK_A, false); \
INSTANTIATE_Q_GRANS(PACK_A, true);
INSTANTIATE_Q_GRANS(PACK_A, false) \
INSTANTIATE_Q_GRANS(PACK_A, true)

INSTANTIATE_RELU(PackAWithRowOffset);
INSTANTIATE_RELU(PackAWithRowOffset)
INSTANTIATE_RELU(PackAWithQuantRowOffset);

#undef INSTANTIATE_RELU
Expand All @@ -452,22 +452,22 @@ INSTANTIATE_RELU(PackAWithQuantRowOffset);
const BlockingFactors* blocking_params);

#define INSTANTIATE_Q_GRANS(ACC_T, RELU, SPATIAL_DIM) \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR); \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP); \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::TENSOR) \
INSTANTIATE_BASE(ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::GROUP) \
INSTANTIATE_BASE( \
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL);
ACC_T, RELU, SPATIAL_DIM, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_SPATIAL_DIM(ACC_T, RELU) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 1); \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 2); \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 3);
INSTANTIATE_Q_GRANS(ACC_T, RELU, 1) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 2) \
INSTANTIATE_Q_GRANS(ACC_T, RELU, 3)

#define INSTANTIATE_RELU(ACC_T) \
INSTANTIATE_SPATIAL_DIM(ACC_T, false); \
INSTANTIATE_SPATIAL_DIM(ACC_T, true);
INSTANTIATE_SPATIAL_DIM(ACC_T, false) \
INSTANTIATE_SPATIAL_DIM(ACC_T, true)

INSTANTIATE_RELU(int32_t);
INSTANTIATE_RELU(int16_t);
INSTANTIATE_RELU(int32_t)
INSTANTIATE_RELU(int16_t)

#undef INSTANTIATE_RELU
#undef INSTANTIATE_SPATIAL_DIM
Expand Down Expand Up @@ -503,16 +503,16 @@ template FBGEMM_API void fbgemmPacked(
const BlockingFactors* blocking_params);

#define INSTANTIATE_Q_GRANS(PACK_A, RELU) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BASE(PACK_A, RELU, QuantizationGranularity::OUT_CHANNEL)

#define INSTANTIATE_RELU(PACK_A) \
INSTANTIATE_Q_GRANS(PACK_A, false); \
INSTANTIATE_Q_GRANS(PACK_A, true);
INSTANTIATE_Q_GRANS(PACK_A, false) \
INSTANTIATE_Q_GRANS(PACK_A, true)

INSTANTIATE_RELU(PackAMatrix);
INSTANTIATE_RELU(PackAWithRowOffset);
INSTANTIATE_RELU(PackAMatrix)
INSTANTIATE_RELU(PackAWithRowOffset)

#undef INSTANTIATE_Q_GRANS
#undef INSTANTIATE_BASE
Expand All @@ -534,12 +534,12 @@ INSTANTIATE_RELU(PackAWithRowOffset);
const BlockingFactors* blocking_params);

#define INSTANTIATE_Q_GRANS(RELU) \
INSTANTIATE_BASE(RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_BASE(RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_BASE(RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_BASE(RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_BASE(RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_BASE(RELU, QuantizationGranularity::OUT_CHANNEL)

INSTANTIATE_Q_GRANS(false);
INSTANTIATE_Q_GRANS(true);
INSTANTIATE_Q_GRANS(false)
INSTANTIATE_Q_GRANS(true)

#undef INSTANTIATE_Q_GRANS
#undef INSTANTIATE_BASE
Expand Down Expand Up @@ -574,8 +574,8 @@ template FBGEMM_API void fbgemmPacked(
INSTANTIATE_BASE(PACK_A, int32_t) \
INSTANTIATE_BASE(PACK_A, int16_t)

INSTANTIATE_ACC_T(PackAMatrix);
INSTANTIATE_ACC_T(PackAWithRowOffset);
INSTANTIATE_ACC_T(PackAMatrix)
INSTANTIATE_ACC_T(PackAWithRowOffset)

#undef INSTANTIATE_ACC_T
#undef INSTANTIATE_BASE
Expand All @@ -596,12 +596,12 @@ INSTANTIATE_ACC_T(PackAWithRowOffset);
const BlockingFactors* blocking_params);

#define INSTANTIATE_SPATIAL_DIM(ACC_T) \
INSTANTIATE_BASE(ACC_T, 1); \
INSTANTIATE_BASE(ACC_T, 2); \
INSTANTIATE_BASE(ACC_T, 3);
INSTANTIATE_BASE(ACC_T, 1) \
INSTANTIATE_BASE(ACC_T, 2) \
INSTANTIATE_BASE(ACC_T, 3)

INSTANTIATE_SPATIAL_DIM(int32_t);
INSTANTIATE_SPATIAL_DIM(int16_t);
INSTANTIATE_SPATIAL_DIM(int32_t)
INSTANTIATE_SPATIAL_DIM(int16_t)

#undef INSTANTIATE_SPATIAL_DIM
#undef INSTANTIATE_BASE
Expand Down
22 changes: 11 additions & 11 deletions src/FbgemmConv.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,24 +382,24 @@ int fbgemmConv(
const BlockingFactors* blocking_params);

#define INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, SPATIAL_DIM) \
INSTANTIATE_BASE(ACC_T, Q_GRAN, RELU, SPATIAL_DIM, float); \
INSTANTIATE_BASE(ACC_T, Q_GRAN, RELU, SPATIAL_DIM, int32_t);
INSTANTIATE_BASE(ACC_T, Q_GRAN, RELU, SPATIAL_DIM, float) \
INSTANTIATE_BASE(ACC_T, Q_GRAN, RELU, SPATIAL_DIM, int32_t)

#define INSTANTIATE_SPATIAL_DIM(ACC_T, Q_GRAN, RELU) \
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 1); \
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 2); \
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 3);
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 1) \
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 2) \
INSTANTIATE_BIAS_T(ACC_T, Q_GRAN, RELU, 3)

#define INSTANTIATE_RELU(ACC_T, Q_GRAN) \
INSTANTIATE_SPATIAL_DIM(ACC_T, Q_GRAN, true); \
INSTANTIATE_SPATIAL_DIM(ACC_T, Q_GRAN, false);
INSTANTIATE_SPATIAL_DIM(ACC_T, Q_GRAN, true) \
INSTANTIATE_SPATIAL_DIM(ACC_T, Q_GRAN, false)

#define INSTANTIATE_Q_GRANS(ACC_T) \
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::TENSOR); \
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::GROUP); \
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::TENSOR) \
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::GROUP) \
INSTANTIATE_RELU(ACC_T, QuantizationGranularity::OUT_CHANNEL)

INSTANTIATE_Q_GRANS(std::int32_t);
INSTANTIATE_Q_GRANS(std::int32_t)

#undef INSTANTIATE_Q_GRANS
#undef INSTANTIATE_RELU
Expand Down
2 changes: 1 addition & 1 deletion src/FbgemmI8Depthwise2DAvx2-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ static ALWAYS_INLINE void depthwise_2d_(
} // for each n

fbgemmAlignedFree(row_offsets);
};
}

// Dispatch A_SYMMETRIC and B_SYMMETRIC
template <
Expand Down
4 changes: 2 additions & 2 deletions src/FbgemmI8Depthwise3DAvx2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ static ALWAYS_INLINE void depthwise_3d_same_pad_(
} // t
} // for each n
fbgemmAlignedFree(row_offsets);
};
}

// Dispatch A_SYMMETRIC and B_SYMMETRIC
template <
Expand Down Expand Up @@ -1143,7 +1143,7 @@ void depthwise_3d_per_channel_quantization_same_pad(
act_times_w_scale,
thread_id,
num_threads);
};
}

template FBGEMM_API void depthwise_3d_per_channel_quantization_same_pad(
const conv_param_t<3>& conv_p,
Expand Down
16 changes: 8 additions & 8 deletions src/GroupwiseConv.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1887,18 +1887,18 @@ template FBGEMM_API int rowOffsetBufferSizeGConv<3>(
int num_threads);

#define INSTANTIATE_BIAS_T(RELU, Q_GRAN, SPATIAL_DIM) \
INSTANTIATE_BASE(RELU, Q_GRAN, SPATIAL_DIM, float); \
INSTANTIATE_BASE(RELU, Q_GRAN, SPATIAL_DIM, int32_t);
INSTANTIATE_BASE(RELU, Q_GRAN, SPATIAL_DIM, float) \
INSTANTIATE_BASE(RELU, Q_GRAN, SPATIAL_DIM, int32_t)

#define INSTANTIATE_SPATIAL_DIM(RELU, Q_GRAN) \
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 1); \
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 2); \
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 3);
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 1) \
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 2) \
INSTANTIATE_BIAS_T(RELU, Q_GRAN, 3)

#define INSTANTIATE_Q_GRANS(RELU) \
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::TENSOR); \
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::GROUP); \
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::OUT_CHANNEL);
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::TENSOR) \
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::GROUP) \
INSTANTIATE_SPATIAL_DIM(RELU, QuantizationGranularity::OUT_CHANNEL)

INSTANTIATE_Q_GRANS(false);
INSTANTIATE_Q_GRANS(true);
Expand Down
4 changes: 2 additions & 2 deletions src/RefImplementations.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1957,8 +1957,8 @@ FBGEMM_API void compressed_indices_remap_ref(
INDEX_TYPE* out_offsets, \
float* out_weights);

INSTANTIATE_REMAP_BASE(int32_t);
INSTANTIATE_REMAP_BASE(int64_t);
INSTANTIATE_REMAP_BASE(int32_t)
INSTANTIATE_REMAP_BASE(int64_t)

#undef INSTANTIATE_REMAP_BASE

Expand Down
Loading

0 comments on commit 91fc122

Please sign in to comment.