[CPU] A new transformation that adds a convert layer if there is no reorders that support the data type conversion. #3498
Conversation
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
|
@yury-intel Could you please review? |
yury-intel
approved these changes
Dec 10, 2020
|
@yury-intel thanks! |
|
@dmitry-gorokhov could you please review this PR? |
dmitry-gorokhov
requested changes
Dec 21, 2020
inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp
Outdated
Show resolved
Hide resolved
inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp
Outdated
Show resolved
Hide resolved
inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/AddConverToReorder.cpp
Outdated
Show resolved
Hide resolved
inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/AddConverToReorder.cpp
Outdated
Show resolved
Hide resolved
maxnick
force-pushed
the
AddConvertToReorder
branch
2 times, most recently
from
e1639f3 to
e1fe187
Compare
alexey-varyzgin
approved these changes
Dec 24, 2020
maxnick
force-pushed
the
AddConvertToReorder
branch
2 times, most recently
from
9d15d26 to
d51ebad
Compare
inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp
Outdated
Show resolved
Hide resolved
inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp
Outdated
Show resolved
Hide resolved
inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp
Outdated
Show resolved
Hide resolved
inference-engine/src/mkldnn_plugin/nodes/common/tensor_desc_creator.cpp
Outdated
Show resolved
Hide resolved
maxnick
force-pushed
the
AddConvertToReorder
branch
from
d51ebad to
677601e
Compare
maxnick
force-pushed
the
AddConvertToReorder
branch
3 times, most recently
from
7b35e35 to
0caa99e
Compare
maxnick
force-pushed
the
AddConvertToReorder
branch
2 times, most recently
from
4d080ef to
007851c
Compare
…put and output Data in the CNNLayer object.
…y reorders cases.
maxnick
force-pushed
the
AddConvertToReorder
branch
from
cc64b40 to
30259a7
Compare
dmitry-gorokhov
approved these changes
Feb 8, 2021
| @@ -115,6 +115,41 @@ class MKLDNNGraph { | |||
| MKLDNNNodePtr InsertReorder(MKLDNNEdgePtr edge, std::string layerName, const InferenceEngine::TensorDesc& inDesc, | |||
| const InferenceEngine::TensorDesc& outDesc, bool isOptimized = false, InferenceEngine::Blob::Ptr scales = nullptr); | |||
|
|
|||
| /** | |||
| * @brief Insert MKLDNNNode at the edge-specified location. | |||
| * This method supports two regimes. First, the node is inserted without initialization (i.e. supported descriptors initialization, | |||
There was a problem hiding this comment.
minor: regimes -> mode
| const auto& blockingDesc = config.inConfs[0].desc.getBlockingDesc(); // inp/out layouts must be the same | ||
| dataConfigOut.desc = TensorDesc(output->getPrecision(), input->getDims(), blockingDesc); | ||
| config.outConfs.push_back(dataConfigOut); | ||
| supportedPrimitiveDescriptors.emplace_back(config, impl_desc_type::unknown, MKLDNNMemoryDesc(config.outConfs.front().desc).getFormat()); |
There was a problem hiding this comment.
Why cannot you just do smt like: dataConfigOut.desc = dataIn.desc and then update dataConfigOut.desc precision?
|
|
||
| class CreatorsMapFilterConstIterator; | ||
|
|
||
| class TensorDescCreator { |
There was a problem hiding this comment.
Two things about TensorDescCreator and related logic:
- We definitely lack brief description of its API.
- It should be covered by unit tests (w/o connection to any graph patterns).
I think both tasks can be out of scope of this PR, but we should create follow up ticket.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation of this PR is described in the ticket #39726. The main idea is to add Convert layer if a data type conversion is required for which there is no suitable reorder case. This transformation works on the mkldnn graph optimizer level.