From 9ef124cc15fbce6c0e224f46beca277494ccefe7 Mon Sep 17 00:00:00 2001 From: Chao Liu Date: Thu, 30 May 2019 21:29:08 -0500 Subject: [PATCH] fix build issue --- .../blockwise_generic_tensor_slice_op.hip.hpp | 12 ++++++------ ..._gemm_v3_lds_double_buffer_nchw_cyxk_nkhw.hip.hpp | 2 +- ..._gemm_v4_lds_double_buffer_nchw_kcyx_nkhw.hip.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/blockwise_generic_tensor_slice_op.hip.hpp b/src/include/blockwise_generic_tensor_slice_op.hip.hpp index 9edb69a172..e4dc02ca02 100644 --- a/src/include/blockwise_generic_tensor_slice_op.hip.hpp +++ b/src/include/blockwise_generic_tensor_slice_op.hip.hpp @@ -332,7 +332,7 @@ struct BlockwiseGenericTensorSliceCopy_v1 #endif // update "mThreadSrcOriginalMultiId" - static_for<0, src_partial_original_dims.GetSize(), 1>{}([&](auto I_) { + static_for<0, decltype(src_partial_original_dims)::GetSize(), 1>{}([&](auto I_) { constexpr auto I = decltype(I_){}; constexpr index_t idim_original = src_partial_original_dims.Get(I); @@ -365,18 +365,18 @@ struct BlockwiseGenericTensorSliceCopy_v1 constexpr index_t idim_original = SrcDesc::GetContainedOriginalDimensions(IDim).Front(); - static_if{}([&](auto) { - mThreadSrcOffset += StepSize * SrcDesc::GetStride(IDim); + static_if{}([&](auto fwd) { + mThreadSrcOffset += StepSize * fwd(SrcDesc{}).GetStride(IDim); mThreadSrcOriginalMultiId[idim_original] += StepSize; - mThreadSrcPartialOffsets[idim] += StepSize * SrcDesc::GetStride(IDim); + mThreadSrcPartialOffsets[idim] += StepSize * fwd(SrcDesc{}).GetStride(IDim); }).Else([&](auto) { - mThreadSrcOffset -= StepSize * SrcDesc::GetStride(IDim); + mThreadSrcOffset -= StepSize * fwd(SrcDesc{}).GetStride(IDim); mThreadSrcOriginalMultiId[idim_original] -= StepSize; - mThreadSrcPartialOffsets[idim] -= StepSize * SrcDesc::GetStride(IDim); + mThreadSrcPartialOffsets[idim] -= StepSize * fwd(SrcDesc{}).GetStride(IDim); }); }); } diff --git a/src/include/gridwise_convolution_implicit_gemm_v3_lds_double_buffer_nchw_cyxk_nkhw.hip.hpp b/src/include/gridwise_convolution_implicit_gemm_v3_lds_double_buffer_nchw_cyxk_nkhw.hip.hpp index ac359e609a..8076fa8d2a 100644 --- a/src/include/gridwise_convolution_implicit_gemm_v3_lds_double_buffer_nchw_cyxk_nkhw.hip.hpp +++ b/src/include/gridwise_convolution_implicit_gemm_v3_lds_double_buffer_nchw_cyxk_nkhw.hip.hpp @@ -223,7 +223,7 @@ struct GridwiseConvolutionImplicitGemm_v3_lds_double_buffer_nchw_cyxk_nkhw const auto run_blockwise_gemm = [&](auto... Xs) { #if 1 return blockwise_gemm.Run(Xs...); -#elif 0 +#else return blockwise_gemm.Run_asm(Xs...); #endif }; diff --git a/src/include/gridwise_convolution_implicit_gemm_v4_lds_double_buffer_nchw_kcyx_nkhw.hip.hpp b/src/include/gridwise_convolution_implicit_gemm_v4_lds_double_buffer_nchw_kcyx_nkhw.hip.hpp index ae6593e6de..163f39db5b 100644 --- a/src/include/gridwise_convolution_implicit_gemm_v4_lds_double_buffer_nchw_kcyx_nkhw.hip.hpp +++ b/src/include/gridwise_convolution_implicit_gemm_v4_lds_double_buffer_nchw_kcyx_nkhw.hip.hpp @@ -235,7 +235,7 @@ struct GridwiseConvolutionImplicitGemm_v4_lds_double_buffer_nchw_kcyx_nkhw const auto run_blockwise_gemm = [&](auto... Xs) { #if 1 return blockwise_gemm.Run(Xs...); -#elif 0 +#else return blockwise_gemm.Run_asm(Xs...); #endif };