Fix transposed convolutions #2487
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,16 +56,13 @@ static inline auto MakeFwdCtxAndProblem(miopenHandle_t handle, | |
| const auto direction = | ||
| (conv.mode != miopenTranspose) ? Direction::Forward : Direction::BackwardData; | ||
|
|
||
| /// \anchor transpose_convolutions_x_y_swapping | ||
| /// In transpose mode we exchange x with y. From the other hand, when Backward* | ||
| /// ProblemDescription instances are constructed, x and y shall be swapped as well. | ||
| /// As transpose mode swaps Forward with Backward AND x with y, the order of | ||
| /// ctor arguments remains the same. | ||
| auto problem = ProblemDescription{ | ||
| miopen::deref(xDesc), miopen::deref(wDesc), miopen::deref(yDesc), conv, direction}; | ||
|
Comment on lines
+59
to
+65
There was a problem hiding this comment. |
||
|
|
||
| auto ctx = ExecutionContext{&miopen::deref(handle)}; | ||
| problem.SetupFloats(ctx); | ||
|
|
@@ -82,16 +79,9 @@ static inline auto MakeBwdCtxAndProblem(miopenHandle_t handle, | |
| const auto direction = | ||
| (conv.mode != miopenTranspose) ? Direction::BackwardData : Direction::Forward; | ||
|
|
||
| /// \ref transpose_convolutions_x_y_swapping | ||
| auto problem = ProblemDescription{ | ||
| miopen::deref(dyDesc), miopen::deref(wDesc), miopen::deref(dxDesc), conv, direction}; | ||
|
Comment on lines
+82
to
+84
There was a problem hiding this comment. Part 2. This is the main difference from #2476. Other changes in this file are NFC. There was a problem hiding this comment. |
||
|
|
||
| auto ctx = ExecutionContext{&miopen::deref(handle)}; | ||
| problem.SetupFloats(ctx); | ||
|
|
@@ -488,7 +478,7 @@ miopenFindConvolutionForwardAlgorithm(miopenHandle_t handle, | |
|
|
||
| miopen::debug::LogCmdFindConvolution( | ||
| xDesc, wDesc, convDesc, yDesc, miopen::debug::ConvDirection::Fwd, false); | ||
|
|
||
| if(miopen::deref(convDesc).mode == miopenTranspose) | ||
| return miopen::try_([&] { | ||
| miopen::deref(convDesc).FindConvBwdDataAlgorithm(miopen::deref(handle), | ||
|
|
@@ -561,7 +551,6 @@ extern "C" miopenStatus_t miopenConvolutionForward(miopenHandle_t handle, | |
| miopen::debug::LogCmdConvolution( | ||
| xDesc, wDesc, convDesc, yDesc, miopen::debug::ConvDirection::Fwd, false); | ||
|
|
||
| if(miopen::deref(convDesc).mode == miopenTranspose) | ||
| return miopen::try_([&] { | ||
| // It is guaranteed that enum values are equal, see conv_algo_name.cpp | ||
|
|
@@ -1065,7 +1054,7 @@ miopenFindConvolutionBackwardDataAlgorithm(miopenHandle_t handle, | |
|
|
||
| miopen::debug::LogCmdFindConvolution( | ||
| dxDesc, wDesc, convDesc, dyDesc, miopen::debug::ConvDirection::Bwd, false); | ||
|
|
||
| if(miopen::deref(convDesc).mode == miopenTranspose) | ||
| return miopen::try_([&] { | ||
| miopen::deref(convDesc).FindConvFwdAlgorithm(miopen::deref(handle), | ||
|
|
@@ -1139,7 +1128,6 @@ miopenConvolutionBackwardData(miopenHandle_t handle, | |
| miopen::debug::LogCmdConvolution( | ||
| dxDesc, wDesc, convDesc, dyDesc, miopen::debug::ConvDirection::Bwd, false); | ||
|
|
||
| if(miopen::deref(convDesc).mode == miopenTranspose) | ||
| return miopen::try_([&] { | ||
| // It is guaranteed that enum values are equal, see conv_algo_name.cpp | ||
|
|
@@ -1245,15 +1233,13 @@ miopenFindConvolutionBackwardWeightsAlgorithm(miopenHandle_t handle, | |
| xDesc, dwDesc, convDesc, dyDesc, miopen::debug::ConvDirection::WrW, false); | ||
|
|
||
| return miopen::try_([&] { | ||
| const auto trans = (miopen::deref(convDesc).mode == miopenTranspose); | ||
| miopen::deref(convDesc).FindConvBwdWeightsAlgorithm( | ||
| miopen::deref(handle), | ||
| trans ? miopen::deref(xDesc) : miopen::deref(dyDesc), | ||
| trans ? DataCast(x) : DataCast(dy), | ||
| trans ? miopen::deref(dyDesc) : miopen::deref(xDesc), | ||
| trans ? DataCast(dy) : DataCast(x), | ||
| miopen::deref(dwDesc), | ||
| DataCast(dw), | ||
| requestAlgoCount, | ||
|
|
@@ -1298,16 +1284,14 @@ miopenConvolutionBackwardWeights(miopenHandle_t handle, | |
| xDesc, dwDesc, convDesc, dyDesc, miopen::debug::ConvDirection::WrW, false); | ||
|
|
||
| return miopen::try_([&] { | ||
| const auto trans = (miopen::deref(convDesc).mode == miopenTranspose); | ||
| miopen::deref(convDesc).ConvolutionBackwardWeights( | ||
| miopen::deref(handle), | ||
| alpha, | ||
| trans ? miopen::deref(xDesc) : miopen::deref(dyDesc), | ||
| trans ? DataCast(x) : DataCast(dy), | ||
| trans ? miopen::deref(dyDesc) : miopen::deref(xDesc), | ||
| trans ? DataCast(dy) : DataCast(x), | ||
| algo, | ||
| beta, | ||
| miopen::deref(dwDesc), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,21 +117,28 @@ std::string ConvArgsForMIOpenDriver(const miopen::TensorDescriptor& xDesc, | |
| std::stringstream ss; | ||
| if(print_for_conv_driver) | ||
| ConvDataType(ss, xDesc); | ||
|
|
||
| /// \todo Dimensions (N, C, H, W, K..) are always parsed as if layout is NC(D)HW. | ||
| /// For other layouts, invalid values are printed. | ||
|
|
||
| if(convDesc.GetSpatialDimension() == 2) | ||
| { | ||
| ss << " -n " << xDesc.GetLengths()[0] // | ||
| << " -c " << xDesc.GetLengths()[1] // | ||
| << " -H " << xDesc.GetLengths()[2] // | ||
| << " -W " << xDesc.GetLengths()[3] // | ||
| << " -k " | ||
| << (convDesc.mode == miopenTranspose // | ||
| ? wDesc.GetLengths()[1] // | ||
| : wDesc.GetLengths()[0]) // | ||
|
Comment on lines
+130
to
+133
There was a problem hiding this comment. @JehandadKhan This resolves #2459 (comment) |
||
| << " -y " << wDesc.GetLengths()[2] // | ||
| << " -x " << wDesc.GetLengths()[3] // | ||
| << " -p " << convDesc.GetConvPads()[0] // | ||
| << " -q " << convDesc.GetConvPads()[1] // | ||
| << " -u " << convDesc.GetConvStrides()[0] // | ||
| << " -v " << convDesc.GetConvStrides()[1] // | ||
| << " -l " << convDesc.GetConvDilations()[0] // | ||
| << " -j " << convDesc.GetConvDilations()[1]; | ||
| std::string x_layout = xDesc.GetLayout("NCHW"); | ||
| std::string w_layout = wDesc.GetLayout("NCHW"); | ||
| std::string y_layout = yDesc.GetLayout("NCHW"); | ||
|
|
@@ -150,25 +157,28 @@ std::string ConvArgsForMIOpenDriver(const miopen::TensorDescriptor& xDesc, | |
| } | ||
| else if(convDesc.GetSpatialDimension() == 3) | ||
| { | ||
| ss << " -n " << xDesc.GetLengths()[0] // | ||
| << " -c " << xDesc.GetLengths()[1] // | ||
| << " --in_d " << xDesc.GetLengths()[2] // | ||
| << " -H " << xDesc.GetLengths()[3] // | ||
| << " -W " << xDesc.GetLengths()[4] // | ||
| << " -k " | ||
| << (convDesc.mode == miopenTranspose // | ||
| ? wDesc.GetLengths()[1] // | ||
| : wDesc.GetLengths()[0]) // | ||
| << " --fil_d " << wDesc.GetLengths()[2] // | ||
| << " -y " << wDesc.GetLengths()[3] // | ||
| << " -x " << wDesc.GetLengths()[4] // | ||
| << " --pad_d " << convDesc.GetConvPads()[0] // | ||
| << " -p " << convDesc.GetConvPads()[1] // | ||
| << " -q " << convDesc.GetConvPads()[2] // | ||
| << " --conv_stride_d " << convDesc.GetConvStrides()[0] // | ||
| << " -u " << convDesc.GetConvStrides()[1] // | ||
| << " -v " << convDesc.GetConvStrides()[2] // | ||
| << " --dilation_d " << convDesc.GetConvDilations()[0] // | ||
| << " -l " << convDesc.GetConvDilations()[1] // | ||
| << " -j " << convDesc.GetConvDilations()[2] // | ||
| << " --spatial_dim 3"; | ||
| std::string x_layout = xDesc.GetLayout("NCDHW"); | ||
| std::string w_layout = wDesc.GetLayout("NCDHW"); | ||
| std::string y_layout = yDesc.GetLayout("NCDHW"); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is for @muralinr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks for adding me