Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / mkl-dnn / src / cpu / cpu_memory.cpp

diff --git a/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_memory.cpp b/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_memory.cpp
index 4bbff22..e1c2dd6 100644 (file)
--- a/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_memory.cpp
+++ b/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_memory.cpp
@@ -63,6 +63,7 @@ typed_zero_pad_data(
 
 template <data_type_t dt, memory_format_t fmt>
 typename utils::enable_if<false
+|| format_traits<fmt>::blk_fmt == bf::_4o
 || format_traits<fmt>::blk_fmt == bf::_8o
 || format_traits<fmt>::blk_fmt == bf::_16o
 >::type typed_zero_pad_weights(const memory_desc_wrapper &m_d,
@@ -234,10 +235,10 @@ void typed_zero_pad_generic_blocked(const memory_desc_wrapper &m_d,
     assert(step_dim >= 0 && "no zero padding is required");
     if (step_dim < 0) return;
 
-    parallel_nd(nelems, [&](ptrdiff_t e) {
+    parallel_nd(nelems / step, [&](ptrdiff_t e1) {
         bool need_zero = false;
 
-        ptrdiff_t idx = e / step;
+        ptrdiff_t idx = e1;
         for (int d = step_dim; d >= 0; --d) {
             if (idx % pdims[d] >= dims[d]) {
                 need_zero = true;
@@ -248,14 +249,14 @@ void typed_zero_pad_generic_blocked(const memory_desc_wrapper &m_d,
 
         if (need_zero) {
             for (ptrdiff_t e0 = 0; e0 < step; ++e0)
-                data[m_d.off_l(e + e0, true)] = 0;
+                data[m_d.off_l(e1 * step + e0, true)] = 0;
         }
     });
 }
 
 template <data_type_t dt>
-status_t cpu_memory_t::typed_zero_pad() {
-    const memory_desc_wrapper mpd(&conf_);
+status_t cpu_memory_t::typed_zero_pad() const {
+    const memory_desc_wrapper mpd(pd());
 
     // FIXME: guard this check for non-blocked layout
     if (mpd.nelems(false) == mpd.nelems(true))
@@ -267,9 +268,12 @@ status_t cpu_memory_t::typed_zero_pad() {
     /* data */
 #   define MAYBE_DATA(f) if (fmt == f) \
     { typed_zero_pad_data<dt, f>(mpd, data); return success; }
+    MAYBE_DATA(nCw4c);
     MAYBE_DATA(nCw8c);
     MAYBE_DATA(nCw16c);
+    MAYBE_DATA(nChw4c);
     MAYBE_DATA(nChw8c);
+    MAYBE_DATA(nCdhw4c);
     MAYBE_DATA(nCdhw8c);
     MAYBE_DATA(nChw16c);
     MAYBE_DATA(nCdhw16c);
@@ -277,10 +281,12 @@ status_t cpu_memory_t::typed_zero_pad() {
     /* weights */
 #   define MAYBE_WEIGHTS(f) if (fmt == f) \
     { typed_zero_pad_weights<dt, f>(mpd, data); return success; }
+    MAYBE_WEIGHTS(OIdhw4i4o);
     MAYBE_WEIGHTS(OIdhw8i8o);
     MAYBE_WEIGHTS(OIdhw8o8i);
     MAYBE_WEIGHTS(OIdhw16i16o);
     MAYBE_WEIGHTS(OIdhw16o16i);
+    MAYBE_WEIGHTS(Oidhw4o);
     MAYBE_WEIGHTS(Oidhw16o);
     MAYBE_WEIGHTS(Odhwi16o);
     MAYBE_WEIGHTS(Odhwi8o);
@@ -288,15 +294,18 @@ status_t cpu_memory_t::typed_zero_pad() {
     MAYBE_WEIGHTS(oIhw16i);
     MAYBE_WEIGHTS(oIdhw8i);
     MAYBE_WEIGHTS(oIdhw16i);
+    MAYBE_WEIGHTS(OIhw4i4o);
     MAYBE_WEIGHTS(OIhw8i8o);
     MAYBE_WEIGHTS(OIhw16i16o);
     MAYBE_WEIGHTS(OIhw4i16o4i);
     MAYBE_WEIGHTS(OIhw4i16o4i_s8s8);
+    MAYBE_WEIGHTS(OIw4i4o);
     MAYBE_WEIGHTS(Owi8o);
     MAYBE_WEIGHTS(OIw8i8o);
     MAYBE_WEIGHTS(OIw8o8i);
     MAYBE_WEIGHTS(OIw16i16o);
     MAYBE_WEIGHTS(OIw16o16i);
+    MAYBE_WEIGHTS(Oiw4o);
     MAYBE_WEIGHTS(Oiw16o);
     MAYBE_WEIGHTS(Owi16o);
     MAYBE_WEIGHTS(OIw8i16o2i);
@@ -308,18 +317,27 @@ status_t cpu_memory_t::typed_zero_pad() {
     MAYBE_WEIGHTS(OIhw8o8i);
     MAYBE_WEIGHTS(OIhw16o16i);
     MAYBE_WEIGHTS(IOhw16o16i);
+    MAYBE_WEIGHTS(Oihw4o);
     MAYBE_WEIGHTS(Oihw16o);
     MAYBE_WEIGHTS(Ohwi8o);
+    MAYBE_WEIGHTS(Ohwi4o);
     MAYBE_WEIGHTS(Ohwi16o);
+    MAYBE_WEIGHTS(gOIhw4o4i_s8s8);
+    MAYBE_WEIGHTS(gOIhw4o4i_s8s8);
+    MAYBE_WEIGHTS(gOIhw4i4o);
     MAYBE_WEIGHTS(gOIhw8i8o);
     MAYBE_WEIGHTS(gOIhw16i16o);
     MAYBE_WEIGHTS(gOIhw4i16o4i);
     MAYBE_WEIGHTS(gOIhw4i16o4i_s8s8);
+    MAYBE_WEIGHTS(gOIhw2i8o4i);
+    MAYBE_WEIGHTS(gOIhw2i8o4i_s8s8);
+    MAYBE_WEIGHTS(gOIw4i4o);
     MAYBE_WEIGHTS(gOwi8o);
     MAYBE_WEIGHTS(gOIw8i8o);
     MAYBE_WEIGHTS(gOIw8o8i);
     MAYBE_WEIGHTS(gOIw16i16o);
     MAYBE_WEIGHTS(gOIw16o16i);
+    MAYBE_WEIGHTS(gOiw4o);
     MAYBE_WEIGHTS(gOiw16o);
     MAYBE_WEIGHTS(gOwi16o);
     MAYBE_WEIGHTS(gOIw8i16o2i);
@@ -331,13 +349,17 @@ status_t cpu_memory_t::typed_zero_pad() {
     MAYBE_WEIGHTS(gOIhw8o8i);
     MAYBE_WEIGHTS(gOIhw16o16i);
     MAYBE_WEIGHTS(gIOhw16o16i);
+    MAYBE_WEIGHTS(gOihw4o);
     MAYBE_WEIGHTS(gOihw16o);
     MAYBE_WEIGHTS(gOhwi8o);
+    MAYBE_WEIGHTS(gOhwi4o);
     MAYBE_WEIGHTS(gOhwi16o);
+    MAYBE_WEIGHTS(gOIdhw4i4o);
     MAYBE_WEIGHTS(gOIdhw8i8o);
     MAYBE_WEIGHTS(gOIdhw8o8i);
     MAYBE_WEIGHTS(gOIdhw16i16o);
     MAYBE_WEIGHTS(gOIdhw16o16i);
+    MAYBE_WEIGHTS(gOidhw4o);
     MAYBE_WEIGHTS(gOidhw16o);
     MAYBE_WEIGHTS(gOdhwi16o);
     MAYBE_WEIGHTS(gOdhwi8o);
@@ -354,8 +376,8 @@ status_t cpu_memory_t::typed_zero_pad() {
     return unimplemented;
 }
 
-status_t cpu_memory_t::zero_pad() {
-    memory_desc_wrapper md(&conf_);
+status_t cpu_memory_t::zero_pad() const {
+    memory_desc_wrapper md(pd());
     const bool skip_zeroing = false
         || data_ == nullptr
         || md.is_zero()
@@ -368,6 +390,7 @@ status_t cpu_memory_t::zero_pad() {
         case s16: return typed_zero_pad<s16>();
         case s8: return typed_zero_pad<s8>();
         case u8: return typed_zero_pad<u8>();
+        case bin: return typed_zero_pad<u8>();
         default: assert(!"memory is undefined"); return unimplemented;
     }
     return unimplemented;