Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / src / include / to_string_utils.h

diff --git a/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h b/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
index 5d83c5b..f274381 100644 (file)
--- a/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
+++ b/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
@@ -1,5 +1,5 @@
 /*
-// Copyright (c) 2017 Intel Corporation
+// Copyright (c) 2017-2018 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,33 +26,15 @@ inline std::string bool_to_str(bool cond)
     return cond ? "true" : "false";
 }
 
-inline std::string get_extr_type(const char* str)
+inline std::string get_extr_type(const std::string& str)
 {
-    if (!str)
-    {
-        return{};
-    }
+    auto begin = str.find('<');
+    auto end = str.find('>');
 
-    while (*str && *str != '<')
-    {
-        ++str;
-    }
-    if (!*str)
-    {
-        return{};
-    }
+    if (begin == std::string::npos || end == std::string::npos)
+        return {};
 
-    auto end = str;
-    while (*end && *end != '>')
-    {
-        ++end;
-    }
-    if (!*end)
-    {
-        return{};
-    }
-
-    return{ str + 1, end };
+    return str.substr(begin + 1, (end - begin) -1);
 }
 
 inline std::string dt_to_str(data_types dt)
@@ -60,6 +42,7 @@ inline std::string dt_to_str(data_types dt)
     switch (dt)
     {
     case data_types::i8: return "i8";
+    case data_types::u8: return "u8";
     case data_types::i32: return "i32";
     case data_types::i64: return "i64";
     case data_types::f16: return "f16";
@@ -73,18 +56,36 @@ inline std::string fmt_to_str(format fmt)
 {
     switch (fmt.value)
     {
-    case format::bfyx: return "bfyx";
-    case format::byxf: return "byxf";
     case format::yxfb: return "yxfb";
+    case format::byxf: return "byxf";
+    case format::bfyx: return "bfyx";
     case format::fyxb: return "fyxb";
-    case format::bs_x_bsv16: return "bs_x_bsv16";
+    case format::os_iyx_osv16: return "os_iyx_osv16";
+    case format::os_iyx_osv32: return "os_iyx_osv32";
+    case format::os_iyx_osv64: return "os_iyx_osv64";
     case format::bs_xs_xsv8_bsv8: return "bs_xs_xsv8_bsv8";
     case format::bs_xs_xsv8_bsv16: return "bs_xs_xsv8_bsv16";
-    case format::os_iyx_osv16: return "os_iyx_osv16";
+    case format::bs_x_bsv16: return "bs_x_bsv16";
+    case format::bf8_xy16: return "bf8_xy16";
+    case format::image_2d_weights_c4_fyx_b: return "image_2d_weights_c4_fyx_b";
+    case format::image_2d_weights_c1_b_fyx: return "image_2d_weights_c1_b_fyx";
+    case format::winograd_2x3_s1_data: return "winograd_2x3_s1_data";
+    case format::winograd_2x3_s1_weights: return "winograd_2x3_s1_weights";
+    case format::winograd_2x3_s1_fused_weights: return "winograd_2x3_s1_fused_weights";
+    case format::winograd_6x3_s1_fused_weights: return "winograd_6x3_s1_fused_weights";
+    case format::image_2d_weights_winograd_6x3_s1_fbxyb: return "image_2d_weights_winograd_6x3_s1_fbxyb";
+    case format::image_2d_weights_winograd_6x3_s1_xfbyb: return "image_2d_weights_winograd_6x3_s1_xfbyb";
     case format::os_is_yx_isa8_osv8_isv4: return "os_is_yx_isa8_osv8_isv4";
+    case format::os_is_yx_isa8_osv8_isv4_swizzled_by_4: return "os_is_yx_isa8_osv8_isv4_swizzled_by_4";
     case format::is_o_yx_isv32: return "is_o_yx_isv32";
+    case format::is_o32_yx_isv32_swizzled_by_4: return "is_o32_yx_isv32_swizzled_by_4";
+    case format::os_is_y_x8_osv8_isv4: return "os_is_y_x8_osv8_isv4";
     case format::byxf_af32: return "byxf_af32";
+    case format::byx8_f4: return "byx8_f4";
     case format::fs_bs_yx_bsv4_fsv32: return "fs_bs_yx_bsv4_fsv32";
+    case format::bf_lyx_yx: return "bf_lyx_yx";
+    case format::b_fs_yx_fsv4: return "b_fs_yx_fs4"; break;
+    case format::os_is_yx_osv16_isv4: return "os_is_yx_osv16_isv4"; break;
     default:
         return "unknown (" + std::to_string(fmt.value) + ")";
     }