diff options
| author | Jianyu Huang <jianyuhuang@fb.com> | 2019-08-06 21:55:17 +0300 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2019-08-06 21:59:00 +0300 |
| commit | cf34b9a26b609109b18d6498f0608faddb7a911b (patch) | |
| tree | 1ceaddaf942edb9debcafad7491b750fc3a5f066 /src/PackAWithIm2Col.cc | |
| parent | d8b3323668fdd15dc70e9cb43ab16e96f4846eeb (diff) | |
Back out "[fbgemm] Integrate VNNI into FBGEMM master branch"
Summary:
Original commit changeset: fcaa13cc3159
ASMJIT requires the CMake version to be 3.8
However, FBGEMM and PyTorch only need the CMake version to be 3.5+.
This caused the build failure in FBGEMM:
https://circleci.com/gh/pytorch/FBGEMM/122#build-timing/containers/0
Reviewed By: dskhudia
Differential Revision: D16670547
fbshipit-source-id: 506714c3db1cb82cf98895f58f82f235128f5285
Diffstat (limited to 'src/PackAWithIm2Col.cc')
| -rw-r--r-- | src/PackAWithIm2Col.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/PackAWithIm2Col.cc b/src/PackAWithIm2Col.cc index 2aca27d..d731654 100644 --- a/src/PackAWithIm2Col.cc +++ b/src/PackAWithIm2Col.cc @@ -49,8 +49,7 @@ PackAWithIm2Col<T, accT, SPATIAL_DIM>::PackAWithIm2Col( if (!cpuinfo_initialize()) { throw std::runtime_error("Failed to initialize cpuinfo!"); } - if ((!fbgemmHasAvx512VnniSupport() && !fbgemmHasAvx512Support() && - !fbgemmHasAvx2Support())) { + if ((!fbgemmHasAvx512Support() && !fbgemmHasAvx2Support())) { assert(0 && "unknown architecure"); } @@ -59,12 +58,7 @@ PackAWithIm2Col<T, accT, SPATIAL_DIM>::PackAWithIm2Col( BaseType::bcol_ = params->KCB; row_interleave_B_ = params->ROW_INTERLEAVE; } else { - if (fbgemmHasAvx512VnniSupport()) { - BaseType::brow_ = PackingTraits<T, accT, inst_set_t::avx512_vnni>::MCB; - BaseType::bcol_ = PackingTraits<T, accT, inst_set_t::avx512_vnni>::KCB; - row_interleave_B_ = - PackingTraits<T, accT, inst_set_t::avx512_vnni>::ROW_INTERLEAVE; - } else if (fbgemmHasAvx512Support()) { + if (fbgemmHasAvx512Support()) { BaseType::brow_ = PackingTraits<T, accT, inst_set_t::avx512>::MCB; BaseType::bcol_ = PackingTraits<T, accT, inst_set_t::avx512>::KCB; row_interleave_B_ = @@ -484,9 +478,7 @@ int PackAWithIm2Col<T, accT, SPATIAL_DIM>::rowOffsetBufferSize( if (params) { return params->MCB; } else { - if (fbgemmHasAvx512VnniSupport()) { - return PackingTraits<T, accT, inst_set_t::avx512_vnni>::MCB; - } else if (fbgemmHasAvx512Support()) { + if (fbgemmHasAvx512Support()) { return PackingTraits<T, accT, inst_set_t::avx512>::MCB; } else if (fbgemmHasAvx2Support()) { return PackingTraits<T, accT, inst_set_t::avx2>::MCB; |