Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / src / permute.cpp

diff --git a/inference-engine/thirdparty/clDNN/src/permute.cpp b/inference-engine/thirdparty/clDNN/src/permute.cpp
index af32597..38e684e 100644 (file)
--- a/inference-engine/thirdparty/clDNN/src/permute.cpp
+++ b/inference-engine/thirdparty/clDNN/src/permute.cpp
@@ -31,42 +31,18 @@ primitive_type_id permute_type_id()
     return &instance;
 }
 
-static std::vector<uint16_t> get_permute_order(permute_node const& node, format::type fmt)
-{
-
-    CLDNN_ERROR_NOT_PROPER_FORMAT(node.id(), "node format", fmt, "byxf, yxfb, bfyx, fyxb", format::byxf, format::yxfb, format::bfyx, format::fyxb);
-    switch (fmt)
-    {
-        // For input formats:
-        // 0 - batch (b), 1 - feature (f), 2, 3 - spatial (x -> 2, y -> 3)
-    case format::byxf:
-        return{ 0, 3, 2, 1 };
-
-    case format::yxfb:
-        return{ 3, 2, 1, 0 };
-
-    case format::bfyx:
-        return{ 0, 1, 3, 2 };
-
-    case format::fyxb:
-        return{ 1, 3, 2, 0 };
-
-    default:
-        throw std::invalid_argument("This format is not supported in GPU permute_inst");
-    }
-}
 
 layout permute_inst::calc_output_layout(permute_node const& node)
 {
+    assert((bool)node.get_primitive()->output_data_type == false
+           && "Output data type forcing is not supported for permute_node!");
     auto input_layout = node.input().get_output_layout();
     auto permute_order = node.get_primitive()->permute_order;
-    auto input_sizes_ordered = input_layout.size.sizes(input_layout.format);
-
-    const auto& fmt_2_bfxy = get_permute_order(node, input_layout.format);
     std::vector<tensor::value_type> output_sizes;
-    for (auto i : fmt_2_bfxy)
+
+    for (size_t x = 0; x < permute_order.size(); x++)
     {
-        output_sizes.push_back(input_sizes_ordered[permute_order[i]]);
+        output_sizes.push_back(input_layout.size.raw[permute_order[x]]);
     }
 
     auto input_size = tensor(output_sizes);