rebase on master conflict resolve

openvinotoolkit · May 7, 2021 · b1a9ec2 · b1a9ec2
1 parent 7607cb6
commit b1a9ec2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp
@@ -696,21 +696,21 @@ MKLDNNMVNNode::MKLDNNMVNNode(const std::shared_ptr<ngraph::Node>& op, const mkld
 
 void MKLDNNMVNNode::transformTo5DCase(const SizeVector& dims) {
     switch (dims.size()) {
-        // for 1 and 2 rank, if across_channels is true, adjust shape to fully vectorize under unified 5d procedure.
+        // for 1 and 2 rank, if acrossChannels_ is true, adjust shape to fully vectorize under unified 5d procedure.
         // otherwise there are not enough data in spatial dimension to process in one kernel.
         case 1 :  // C
-            if (across_channels) {
+            if (acrossChannels_) {
                 shape5D = std::make_tuple(1, 1, 1, 1, dims[0]);
-                across_channels = false;
+                acrossChannels_ = false;
                 break;
             } else {
                 shape5D = std::make_tuple(1, dims[0], 1, 1, 1);
                 break;
             }
         case 2 :  // NC
-            if (across_channels) {
+            if (acrossChannels_) {
                 shape5D = std::make_tuple(1, dims[0], 1, dims[1], 1);
-                across_channels = false;
+                acrossChannels_ = false;
                 break;
             } else {
                 shape5D = std::make_tuple(dims[0], dims[1], 1, 1, 1);