Add global_pooling_dim flags

modules/dnn/src/layers/layers_common.cpp

@@ -150,18 +150,12 @@ void getPoolingKernelParams(const LayerParams &params, std::vector<size_t>& kern
 {
     bool is_global = params.get<bool>("global_pooling", false);
     globalPooling = std::vector<bool>(3, is_global);
-    if (params.has("global_d"))
-    {
-        globalPooling[0] = params.get<bool>("global_d");
-    }
-    else if (params.has("global_h"))
-    {
-        globalPooling[1] = params.get<bool>("global_h");
-    }
-    else if (params.has("global_w"))
-    {
-        globalPooling[2] = params.get<bool>("global_w");
-    }
+    if (params.has("global_pooling_d"))
+        globalPooling[0] = params.get<bool>("global_pooling_d");
+    else if (params.has("global_pooling_h"))
+        globalPooling[1] = params.get<bool>("global_pooling_h");
+    else if (params.has("global_pooling_w"))
+        globalPooling[2] = params.get<bool>("global_pooling_w");
 
     if (is_global)
     {

modules/dnn/src/tensorflow/tf_importer.cpp

@@ -1961,7 +1961,7 @@ void TFImporter::populateNet(Net dstNet)
                 CV_Assert(layer_id.find(avgName) == layer_id.end());
                 avgLp.set("pool", "ave");
                 // pooling kernel H x 1
-                avgLp.set("global_h", true);
+                avgLp.set("global_pooling_h", true);
                 avgLp.set("kernel_size", 1);
                 int avgId = dstNet.addLayer(avgName, "Pooling", avgLp);
                 layer_id[avgName] = avgId;