diff options
| author | dskhudia <dskhudia@fb.com> | 2018-11-06 00:17:52 +0300 |
|---|---|---|
| committer | dskhudia <dskhudia@fb.com> | 2018-11-06 00:17:52 +0300 |
| commit | b96bc0bf311f7abdc83ffd3af0a485b4aef53f7c (patch) | |
| tree | 2a6c276d20753abe94c526aab7b109305e3d1d78 /include/fbgemm/Fbgemm.h | |
| parent | 14adee1ac506e067489406af689ae9b73fb581bd (diff) | |
generalized conv_param_t and download third party libraries in build dir
Diffstat (limited to 'include/fbgemm/Fbgemm.h')
| -rw-r--r-- | include/fbgemm/Fbgemm.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/fbgemm/Fbgemm.h b/include/fbgemm/Fbgemm.h index 2f9ddc7..23412be 100644 --- a/include/fbgemm/Fbgemm.h +++ b/include/fbgemm/Fbgemm.h @@ -438,11 +438,11 @@ class PackBMatrix final : public PackMatrix<PackBMatrix<T, accT>, T, accT> { * Im2col is fused with packing here. The source matrix is already * quantized. */ -template <typename T, typename accT = std::int32_t> -class PackAWithIm2Col final - : public PackMatrix<PackAWithIm2Col<T, accT>, T, accT> { +template <typename T, typename accT = std::int32_t, int SPATIAL_DIM = 2> +class PackAWithIm2Col + : public PackMatrix<PackAWithIm2Col<T, accT, SPATIAL_DIM>, T, accT> { public: - using This = PackAWithIm2Col<T, accT>; + using This = PackAWithIm2Col<T, accT, SPATIAL_DIM>; using BaseType = PackMatrix<This, T, accT>; using inpType = T; using accType = accT; @@ -452,7 +452,7 @@ class PackAWithIm2Col final * TODO: Currently only groups == 1 supported */ PackAWithIm2Col( - const conv_param_t& conv_param, + const conv_param_t<SPATIAL_DIM>& conv_param, const T* sdata, inpType* pmat = nullptr, std::int32_t zero_pt = 0, @@ -487,7 +487,7 @@ class PackAWithIm2Col final } private: - const conv_param_t& conv_p_; + const conv_param_t<SPATIAL_DIM>& conv_p_; const T* sdata_; std::int32_t* row_offset_; bool rowOffsetAllocatedHere; @@ -942,8 +942,8 @@ template < typename outT, typename processOutputType> void convDepthwiseSeparable( - const conv_param_t& conv_param_dw, - const conv_param_t& conv_param_1x1, + const conv_param_t<>& conv_param_dw, + const conv_param_t<>& conv_param_1x1, packingAMatrix& packdw, packingBMatrix& packed_1x1, outT* out, |