[Feat] ForwardDims Conv for NCHW and NHWC
Context
Now forward_dims works for NHWC and NCHW dataformat
Resolves issue #223 (closed)
Modified files
- feat:
Conv.hpp, nowConv_Op::inChannels()checks if the Weight Producer format is [Cout,H,W,Cin] or [Cout,Cin,H,W]; - upd:
Conv::forwardDims()accounts for weight data format (NHWC or NCHW)
Merge request reports
Activity
assigned to @wboussella
added Enhancement ⭐ Feature 🚀 StatusReview Ready TopicOperator labels
added 1 commit
- 191ac43d - New unit_test for forward_conv and some fix about nhwc format
added 53 commits
-
191ac43d...5efc366b - 51 commits from branch
eclipse/aidge:dev - a1a34161 - Conv fwd_dims both for nhwc and nchw in input and output
- 6c8e206e - New unit_test for forward_conv and some fix about nhwc format
-
191ac43d...5efc366b - 51 commits from branch
changed milestone to %aidge v0.6.0
added StatusWork in Progress label and removed StatusReview Ready label
@wboussella Could you fix the unit tests?
-
test_ExplicitTranspose.cpp does not pass its test because, during setDataFormat(conv), we never enter the condition:
if (mImpl && copyTrans && (dataFormat() != df) && df != DataFormat::Default && dataFormat() != DataFormat::Default) { copyTranspose(*this, getDataFormatTranspose(dataFormat(), df)); }Where copy Transpose, transposes dimensions, @pineapple proposes to change this function by calling, two different methods, copyTransposeData, copyTransposeDims()
added 1 commit
- ee939e36 - - Add new comments for Conv.hpp and Conv.cpp
mentioned in merge request !336
added 42 commits
-
167021e1...fcc408cd - 39 commits from branch
eclipse/aidge:dev - 7ff77b54 - Conv fwd_dims both for nhwc and nchw in input and output
- ad111c7f - New unit_test for forward_conv and some fix about nhwc format
- 769f310e - new comments for Conv.hpp and Conv.cpp
Toggle commit list-
167021e1...fcc408cd - 39 commits from branch
added StatusReview Ready label and removed StatusWork in Progress label
added 18 commits
-
769f310e...5efc366b - 12 commits from branch
eclipse/aidge:dev - a1a34161 - Conv fwd_dims both for nhwc and nchw in input and output
- 6c8e206e - New unit_test for forward_conv and some fix about nhwc format
- 167021e1 - new comments for Conv.hpp and Conv.cpp
- 7f6768d0 - Refactor setDataFormat method to improve data type handling and transformation logic
- a3ff2919 - setDataFormat fix, working without impl
- 4db496dc - New tests
Toggle commit list-
769f310e...5efc366b - 12 commits from branch
462 462 * data is copy-transposed. 463 463 */ 464 464 void setDataFormat(const DataFormat df, bool copyTrans = true) { 465 if (mImpl && copyTrans && (dataFormat() != df) && df != DataFormat::Default && dataFormat() != DataFormat::Default) { 466 copyTranspose(*this, getDataFormatTranspose(dataFormat(), df)); 465 if (!copyTrans || df == dataFormat()) { 466 mDataFormat = df; 467 return; 467 468 } 469 470 if ((df == DataFormat::Default && dataFormat() == DataFormat::Default) || changed this line in version 10 of the diff
