api: remove unused formats

Author: Fomenko, Evarist M

include/mkldnn.hpp

@@ -643,7 +643,6 @@ struct memory: public handle<mkldnn_memory_t> {
         ABcd4b4a = mkldnn_ABcd4b4a,
         aBCd4c16b4c = mkldnn_aBCd4c16b4c,
         aBCd4c4b = mkldnn_aBCd4c4b,
-        Abcd8a = mkldnn_Abcd8a,
         ABcd8a16b2a = mkldnn_ABcd8a16b2a,
         ABcd8a8b = mkldnn_ABcd8a8b,
         aBcd8b = mkldnn_aBcd8b,
@@ -686,7 +685,6 @@ struct memory: public handle<mkldnn_memory_t> {
         aBdc16b = mkldnn_aBdc16b,
         aBdc4b = mkldnn_aBdc4b,
         aBdc8b = mkldnn_aBdc8b,
-        aBdCe16b4c = mkldnn_aBdCe16b4c,
         aBdec16b = mkldnn_aBdec16b,
         aBdec4b = mkldnn_aBdec4b,
         aBdec8b = mkldnn_aBdec8b,
@@ -696,7 +694,6 @@ struct memory: public handle<mkldnn_memory_t> {
         Acb16a = mkldnn_Acb16a,
         Acb4a = mkldnn_Acb4a,
         Acb8a = mkldnn_Acb8a,
-        AcBd16a4b = mkldnn_AcBd16a4b,
         aCBd16b16c = mkldnn_aCBd16b16c,
         aCBde16b16c = mkldnn_aCBde16b16c,
         Acdb16a = mkldnn_Acdb16a,
@@ -764,35 +761,29 @@ struct memory: public handle<mkldnn_memory_t> {
         Owi4o = mkldnn_Owi4o,
         Owi8o = mkldnn_Owi8o,
         IOhw16o16i = mkldnn_IOhw16o16i,
-        OhIw16o4i = mkldnn_OhIw16o4i,
         Ohwi16o = mkldnn_Ohwi16o,
         Ohwi4o = mkldnn_Ohwi4o,
         Ohwi8o = mkldnn_Ohwi8o,
         OIhw16i16o = mkldnn_OIhw16i16o,
-        oIhw16i = mkldnn_oIhw16i,
         OIhw16o16i = mkldnn_OIhw16o16i,
         Oihw16o = mkldnn_Oihw16o,
         OIhw4i16o4i = mkldnn_OIhw4i16o4i,
         OIhw4i4o = mkldnn_OIhw4i4o,
         Oihw4o = mkldnn_Oihw4o,
         OIhw8i16o2i = mkldnn_OIhw8i16o2i,
         OIhw8i8o = mkldnn_OIhw8i8o,
-        oIhw8i = mkldnn_oIhw8i,
         OIhw8o16i2o = mkldnn_OIhw8o16i2o,
         OIhw8o8i = mkldnn_OIhw8o8i,
-        Oihw8o = mkldnn_Oihw8o,
         Odhwi16o = mkldnn_Odhwi16o,
         Odhwi4o = mkldnn_Odhwi4o,
         Odhwi8o = mkldnn_Odhwi8o,
         OIdhw16i16o = mkldnn_OIdhw16i16o,
-        oIdhw16i = mkldnn_oIdhw16i,
         OIdhw16o16i = mkldnn_OIdhw16o16i,
         Oidhw16o = mkldnn_Oidhw16o,
         OIdhw4i4o = mkldnn_OIdhw4i4o,
         Oidhw4o = mkldnn_Oidhw4o,
         OIdhw8i16o2i = mkldnn_OIdhw8i16o2i,
         OIdhw8i8o = mkldnn_OIdhw8i8o,
-        oIdhw8i = mkldnn_oIdhw8i,
         OIdhw8o8i = mkldnn_OIdhw8o8i,
         gIOw16o16i = mkldnn_gIOw16o16i,
         gOIw16i16o = mkldnn_gOIw16i16o,
@@ -809,7 +800,6 @@ struct memory: public handle<mkldnn_memory_t> {
         gOwi4o = mkldnn_gOwi4o,
         gOwi8o = mkldnn_gOwi8o,
         gIOhw16o16i = mkldnn_gIOhw16o16i,
-        gOhIw16o4i = mkldnn_gOhIw16o4i,
         gOhwi16o = mkldnn_gOhwi16o,
         gOhwi4o = mkldnn_gOhwi4o,
         gOhwi8o = mkldnn_gOhwi8o,
@@ -827,7 +817,6 @@ struct memory: public handle<mkldnn_memory_t> {
         gOIhw8i8o = mkldnn_gOIhw8i8o,
         gOIhw8o16i2o = mkldnn_gOIhw8o16i2o,
         gOIhw8o8i = mkldnn_gOIhw8o8i,
-        gOihw8o = mkldnn_gOihw8o,
         gOdhwi16o = mkldnn_gOdhwi16o,
         gOdhwi4o = mkldnn_gOdhwi4o,
         gOdhwi8o = mkldnn_gOdhwi8o,

include/mkldnn_types.h

@@ -207,7 +207,6 @@ typedef enum {
     mkldnn_ABcd4b4a,
     mkldnn_aBCd4c16b4c,
     mkldnn_aBCd4c4b,
-    mkldnn_Abcd8a,
     mkldnn_ABcd8a16b2a,
     mkldnn_ABcd8a8b,
     mkldnn_aBcd8b,
@@ -250,7 +249,6 @@ typedef enum {
     mkldnn_aBdc16b,
     mkldnn_aBdc4b,
     mkldnn_aBdc8b,
-    mkldnn_aBdCe16b4c,
     mkldnn_aBdec16b,
     mkldnn_aBdec4b,
     mkldnn_aBdec8b,
@@ -260,7 +258,6 @@ typedef enum {
     mkldnn_Acb16a,
     mkldnn_Acb4a,
     mkldnn_Acb8a,
-    mkldnn_AcBd16a4b,
     mkldnn_aCBd16b16c,
     mkldnn_aCBde16b16c,
     mkldnn_Acdb16a,
@@ -365,37 +362,31 @@ typedef enum {
 
     /* weights, 4D */
     mkldnn_IOhw16o16i = mkldnn_BAcd16a16b,
-    mkldnn_OhIw16o4i = mkldnn_AcBd16a4b,
     mkldnn_Ohwi16o = mkldnn_Acdb16a,
     mkldnn_Ohwi4o = mkldnn_Acdb4a,
     mkldnn_Ohwi8o = mkldnn_Acdb8a,
     mkldnn_OIhw16i16o = mkldnn_ABcd16b16a,
-    mkldnn_oIhw16i = mkldnn_aBcd16b,
     mkldnn_OIhw16o16i = mkldnn_ABcd16a16b,
     mkldnn_Oihw16o = mkldnn_Abcd16a,
     mkldnn_OIhw4i16o4i = mkldnn_ABcd4b16a4b,
     mkldnn_OIhw4i4o = mkldnn_ABcd4b4a,
     mkldnn_Oihw4o = mkldnn_Abcd4a,
     mkldnn_OIhw8i16o2i = mkldnn_ABcd8b16a2b,
     mkldnn_OIhw8i8o = mkldnn_ABcd8b8a,
-    mkldnn_oIhw8i = mkldnn_aBcd8b,
     mkldnn_OIhw8o16i2o = mkldnn_ABcd8a16b2a,
     mkldnn_OIhw8o8i = mkldnn_ABcd8a8b,
-    mkldnn_Oihw8o = mkldnn_Abcd8a,
 
     /* weights, 5D */
     mkldnn_Odhwi16o = mkldnn_Acdeb16a,
     mkldnn_Odhwi4o = mkldnn_Acdeb4a,
     mkldnn_Odhwi8o = mkldnn_Acdeb8a,
     mkldnn_OIdhw16i16o = mkldnn_ABcde16b16a,
-    mkldnn_oIdhw16i = mkldnn_aBcde16b,
     mkldnn_OIdhw16o16i = mkldnn_ABcde16a16b,
     mkldnn_Oidhw16o = mkldnn_Abcde16a,
     mkldnn_OIdhw4i4o = mkldnn_ABcde4b4a,
     mkldnn_Oidhw4o = mkldnn_Abcde4a,
     mkldnn_OIdhw8i16o2i = mkldnn_ABcde8b16a2b,
     mkldnn_OIdhw8i8o = mkldnn_ABcde8b8a,
-    mkldnn_oIdhw8i = mkldnn_aBcde8b,
     mkldnn_OIdhw8o8i = mkldnn_ABcde8a8b,
 
     /* weights w/ groups, 3D */
@@ -417,7 +408,6 @@ typedef enum {
 
     /* weights w/ groups, 4D */
     mkldnn_gIOhw16o16i = mkldnn_aCBde16b16c,
-    mkldnn_gOhIw16o4i = mkldnn_aBdCe16b4c,
     mkldnn_gOhwi16o = mkldnn_aBdec16b,
     mkldnn_gOhwi4o = mkldnn_aBdec4b,
     mkldnn_gOhwi8o = mkldnn_aBdec8b,
@@ -435,7 +425,6 @@ typedef enum {
     mkldnn_gOIhw8i8o = mkldnn_aBCde8c8b,
     mkldnn_gOIhw8o16i2o = mkldnn_aBCde8b16c2b,
     mkldnn_gOIhw8o8i = mkldnn_aBCde8b8c,
-    mkldnn_gOihw8o = mkldnn_aBcde8b,
 
     /* weights w/ groups, 6D */
     mkldnn_gOdhwi16o = mkldnn_aBdefc16b,

src/common/c_types_map.hpp

@@ -164,7 +164,6 @@ namespace format_tag {
     const format_tag_t ABcd4b4a = mkldnn_ABcd4b4a;
     const format_tag_t aBCd4c16b4c = mkldnn_aBCd4c16b4c;
     const format_tag_t aBCd4c4b = mkldnn_aBCd4c4b;
-    const format_tag_t Abcd8a = mkldnn_Abcd8a;
     const format_tag_t ABcd8a16b2a = mkldnn_ABcd8a16b2a;
     const format_tag_t ABcd8a8b = mkldnn_ABcd8a8b;
     const format_tag_t aBcd8b = mkldnn_aBcd8b;
@@ -207,7 +206,6 @@ namespace format_tag {
     const format_tag_t aBdc16b = mkldnn_aBdc16b;
     const format_tag_t aBdc4b = mkldnn_aBdc4b;
     const format_tag_t aBdc8b = mkldnn_aBdc8b;
-    const format_tag_t aBdCe16b4c = mkldnn_aBdCe16b4c;
     const format_tag_t aBdec16b = mkldnn_aBdec16b;
     const format_tag_t aBdec4b = mkldnn_aBdec4b;
     const format_tag_t aBdec8b = mkldnn_aBdec8b;
@@ -217,7 +215,6 @@ namespace format_tag {
     const format_tag_t Acb16a = mkldnn_Acb16a;
     const format_tag_t Acb4a = mkldnn_Acb4a;
     const format_tag_t Acb8a = mkldnn_Acb8a;
-    const format_tag_t AcBd16a4b = mkldnn_AcBd16a4b;
     const format_tag_t aCBd16b16c = mkldnn_aCBd16b16c;
     const format_tag_t aCBde16b16c = mkldnn_aCBde16b16c;
     const format_tag_t Acdb16a = mkldnn_Acdb16a;
@@ -285,35 +282,29 @@ namespace format_tag {
     const format_tag_t Owi4o = mkldnn_Owi4o;
     const format_tag_t Owi8o = mkldnn_Owi8o;
     const format_tag_t IOhw16o16i = mkldnn_IOhw16o16i;
-    const format_tag_t OhIw16o4i = mkldnn_OhIw16o4i;
     const format_tag_t Ohwi16o = mkldnn_Ohwi16o;
     const format_tag_t Ohwi4o = mkldnn_Ohwi4o;
     const format_tag_t Ohwi8o = mkldnn_Ohwi8o;
     const format_tag_t OIhw16i16o = mkldnn_OIhw16i16o;
-    const format_tag_t oIhw16i = mkldnn_oIhw16i;
     const format_tag_t OIhw16o16i = mkldnn_OIhw16o16i;
     const format_tag_t Oihw16o = mkldnn_Oihw16o;
     const format_tag_t OIhw4i16o4i = mkldnn_OIhw4i16o4i;
     const format_tag_t OIhw4i4o = mkldnn_OIhw4i4o;
     const format_tag_t Oihw4o = mkldnn_Oihw4o;
     const format_tag_t OIhw8i16o2i = mkldnn_OIhw8i16o2i;
     const format_tag_t OIhw8i8o = mkldnn_OIhw8i8o;
-    const format_tag_t oIhw8i = mkldnn_oIhw8i;
     const format_tag_t OIhw8o16i2o = mkldnn_OIhw8o16i2o;
     const format_tag_t OIhw8o8i = mkldnn_OIhw8o8i;
-    const format_tag_t Oihw8o = mkldnn_Oihw8o;
     const format_tag_t Odhwi16o = mkldnn_Odhwi16o;
     const format_tag_t Odhwi4o = mkldnn_Odhwi4o;
     const format_tag_t Odhwi8o = mkldnn_Odhwi8o;
     const format_tag_t OIdhw16i16o = mkldnn_OIdhw16i16o;
-    const format_tag_t oIdhw16i = mkldnn_oIdhw16i;
     const format_tag_t OIdhw16o16i = mkldnn_OIdhw16o16i;
     const format_tag_t Oidhw16o = mkldnn_Oidhw16o;
     const format_tag_t OIdhw4i4o = mkldnn_OIdhw4i4o;
     const format_tag_t Oidhw4o = mkldnn_Oidhw4o;
     const format_tag_t OIdhw8i16o2i = mkldnn_OIdhw8i16o2i;
     const format_tag_t OIdhw8i8o = mkldnn_OIdhw8i8o;
-    const format_tag_t oIdhw8i = mkldnn_oIdhw8i;
     const format_tag_t OIdhw8o8i = mkldnn_OIdhw8o8i;
     const format_tag_t gIOw16o16i = mkldnn_gIOw16o16i;
     const format_tag_t Goiw16g = mkldnn_Goiw16g;
@@ -331,7 +322,6 @@ namespace format_tag {
     const format_tag_t gOwi4o = mkldnn_gOwi4o;
     const format_tag_t gOwi8o = mkldnn_gOwi8o;
     const format_tag_t gIOhw16o16i = mkldnn_gIOhw16o16i;
-    const format_tag_t gOhIw16o4i = mkldnn_gOhIw16o4i;
     const format_tag_t gOhwi16o = mkldnn_gOhwi16o;
     const format_tag_t gOhwi4o = mkldnn_gOhwi4o;
     const format_tag_t gOhwi8o = mkldnn_gOhwi8o;
@@ -349,7 +339,6 @@ namespace format_tag {
     const format_tag_t gOIhw8i8o = mkldnn_gOIhw8i8o;
     const format_tag_t gOIhw8o16i2o = mkldnn_gOIhw8o16i2o;
     const format_tag_t gOIhw8o8i = mkldnn_gOIhw8o8i;
-    const format_tag_t gOihw8o = mkldnn_gOihw8o;
     const format_tag_t gOdhwi16o = mkldnn_gOdhwi16o;
     const format_tag_t gOdhwi4o = mkldnn_gOdhwi4o;
     const format_tag_t gOdhwi8o = mkldnn_gOdhwi8o;

src/common/memory_desc_wrapper.cpp

@@ -149,7 +149,6 @@ status_t memory_desc_wrapper::compute_blocking(memory_desc_t &memory_desc,
     C(aBCd16b16c, {0, 1, 2, 3}, {16, 16}, {1, 2});
     C(aBCd16c16b, {0, 1, 2, 3}, {16, 16}, {2, 1});
     C(ABcd4b16a4b, {0, 1, 2, 3}, {4, 16, 4}, {1, 0, 1});
-    C(Abcd8a, {0, 1, 2, 3}, {8}, {0});
     C(ABcd8a16b2a, {0, 1, 2, 3}, {8, 16, 2}, {0, 1, 0});
     C(ABcd8a8b, {0, 1, 2, 3}, {8, 8}, {0, 1});
     C(aBcd8b, {0, 1, 2, 3}, {8}, {1});
@@ -185,14 +184,12 @@ status_t memory_desc_wrapper::compute_blocking(memory_desc_t &memory_desc,
     C(aBCdef8c8b, {0, 1, 2, 3, 4, 5}, {8, 8}, {2, 1});
     C(aBdc16b, {0, 1, 3, 2}, {16}, {1});
     C(aBdc8b, {0, 1, 3, 2}, {8}, {1});
-    C(aBdCe16b4c, {0, 1, 3, 2, 4}, {16, 4}, {1, 2});
     C(aBdec16b, {0, 1, 3, 4, 2}, {16}, {1});
     C(aBdec8b, {0, 1, 3, 4, 2}, {8}, {1});
     C(aBdefc16b, {0, 1, 3, 4, 5, 2}, {16}, {1});
     C(aBdefc8b, {0, 1, 3, 4, 5, 2}, {8}, {1});
     C(Acb16a, {0, 2, 1}, {16}, {0});
     C(Acb8a, {0, 2, 1}, {8}, {0});
-    C(AcBd16a4b, {0, 2, 1, 3}, {16, 4}, {0, 1});
     C(aCBd16b16c, {0, 2, 1, 3}, {16, 16}, {1, 2});
     C(aCBde16b16c, {0, 2, 1, 3, 4}, {16, 16}, {1, 2});
     C(Acdb16a, {0, 2, 3, 1}, {16}, {0});

src/common/mkldnn_debug_autogenerated.cpp

@@ -102,7 +102,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_ABcd4b4a) return "ABcd4b4a";
     if (v == mkldnn_aBCd4c16b4c) return "aBCd4c16b4c";
     if (v == mkldnn_aBCd4c4b) return "aBCd4c4b";
-    if (v == mkldnn_Abcd8a) return "Abcd8a";
     if (v == mkldnn_ABcd8a16b2a) return "ABcd8a16b2a";
     if (v == mkldnn_ABcd8a8b) return "ABcd8a8b";
     if (v == mkldnn_aBcd8b) return "aBcd8b";
@@ -127,7 +126,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_aBCde4c4b) return "aBCde4c4b";
     if (v == mkldnn_Abcde8a) return "Abcde8a";
     if (v == mkldnn_ABcde8a8b) return "ABcde8a8b";
-    if (v == mkldnn_aBcde8b) return "aBcde8b";
     if (v == mkldnn_ABcde8b16a2b) return "ABcde8b16a2b";
     if (v == mkldnn_aBCde8b16c2b) return "aBCde8b16c2b";
     if (v == mkldnn_ABcde8b8a) return "ABcde8b8a";
@@ -145,7 +143,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_aBdc16b) return "aBdc16b";
     if (v == mkldnn_aBdc4b) return "aBdc4b";
     if (v == mkldnn_aBdc8b) return "aBdc8b";
-    if (v == mkldnn_aBdCe16b4c) return "aBdCe16b4c";
     if (v == mkldnn_aBdec16b) return "aBdec16b";
     if (v == mkldnn_aBdec4b) return "aBdec4b";
     if (v == mkldnn_aBdec8b) return "aBdec8b";
@@ -155,7 +152,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_Acb16a) return "Acb16a";
     if (v == mkldnn_Acb4a) return "Acb4a";
     if (v == mkldnn_Acb8a) return "Acb8a";
-    if (v == mkldnn_AcBd16a4b) return "AcBd16a4b";
     if (v == mkldnn_aCBd16b16c) return "aCBd16b16c";
     if (v == mkldnn_aCBde16b16c) return "aCBde16b16c";
     if (v == mkldnn_Acdb16a) return "Acdb16a";
@@ -222,35 +218,29 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_Owi4o) return "Owi4o";
     if (v == mkldnn_Owi8o) return "Owi8o";
     if (v == mkldnn_IOhw16o16i) return "IOhw16o16i";
-    if (v == mkldnn_OhIw16o4i) return "OhIw16o4i";
     if (v == mkldnn_Ohwi16o) return "Ohwi16o";
     if (v == mkldnn_Ohwi4o) return "Ohwi4o";
     if (v == mkldnn_Ohwi8o) return "Ohwi8o";
     if (v == mkldnn_OIhw16i16o) return "OIhw16i16o";
-    if (v == mkldnn_oIhw16i) return "oIhw16i";
     if (v == mkldnn_OIhw16o16i) return "OIhw16o16i";
     if (v == mkldnn_Oihw16o) return "Oihw16o";
     if (v == mkldnn_OIhw4i16o4i) return "OIhw4i16o4i";
     if (v == mkldnn_OIhw4i4o) return "OIhw4i4o";
     if (v == mkldnn_Oihw4o) return "Oihw4o";
     if (v == mkldnn_OIhw8i16o2i) return "OIhw8i16o2i";
     if (v == mkldnn_OIhw8i8o) return "OIhw8i8o";
-    if (v == mkldnn_oIhw8i) return "oIhw8i";
     if (v == mkldnn_OIhw8o16i2o) return "OIhw8o16i2o";
     if (v == mkldnn_OIhw8o8i) return "OIhw8o8i";
-    if (v == mkldnn_Oihw8o) return "Oihw8o";
     if (v == mkldnn_Odhwi16o) return "Odhwi16o";
     if (v == mkldnn_Odhwi4o) return "Odhwi4o";
     if (v == mkldnn_Odhwi8o) return "Odhwi8o";
     if (v == mkldnn_OIdhw16i16o) return "OIdhw16i16o";
-    if (v == mkldnn_oIdhw16i) return "oIdhw16i";
     if (v == mkldnn_OIdhw16o16i) return "OIdhw16o16i";
     if (v == mkldnn_Oidhw16o) return "Oidhw16o";
     if (v == mkldnn_OIdhw4i4o) return "OIdhw4i4o";
     if (v == mkldnn_Oidhw4o) return "Oidhw4o";
     if (v == mkldnn_OIdhw8i16o2i) return "OIdhw8i16o2i";
     if (v == mkldnn_OIdhw8i8o) return "OIdhw8i8o";
-    if (v == mkldnn_oIdhw8i) return "oIdhw8i";
     if (v == mkldnn_OIdhw8o8i) return "OIdhw8o8i";
     if (v == mkldnn_Goiw16g) return "Goiw16g";
     if (v == mkldnn_gIOw16o16i) return "gIOw16o16i";
@@ -268,7 +258,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_gOwi4o) return "gOwi4o";
     if (v == mkldnn_gOwi8o) return "gOwi8o";
     if (v == mkldnn_gIOhw16o16i) return "gIOhw16o16i";
-    if (v == mkldnn_gOhIw16o4i) return "gOhIw16o4i";
     if (v == mkldnn_gOhwi16o) return "gOhwi16o";
     if (v == mkldnn_gOhwi4o) return "gOhwi4o";
     if (v == mkldnn_gOhwi8o) return "gOhwi8o";
@@ -286,7 +275,6 @@ const char *mkldnn_fmt_tag2str(mkldnn_format_tag_t v) {
     if (v == mkldnn_gOIhw8i8o) return "gOIhw8i8o";
     if (v == mkldnn_gOIhw8o16i2o) return "gOIhw8o16i2o";
     if (v == mkldnn_gOIhw8o8i) return "gOIhw8o8i";
-    if (v == mkldnn_gOihw8o) return "gOihw8o";
     if (v == mkldnn_gOdhwi16o) return "gOdhwi16o";
     if (v == mkldnn_gOdhwi4o) return "gOdhwi4o";
     if (v == mkldnn_gOdhwi8o) return "gOdhwi8o";

src/common/tag_traits.hpp

@@ -144,7 +144,6 @@ DECL_TRAITS(ABcd16b16a, _AB, _16b16a, 4);
 DECL_TRAITS(aBCd16b16c, _BC, _16b16c, 4);
 DECL_TRAITS(aBCd16c16b, _BC, _16c16b, 4);
 DECL_TRAITS(ABcd4b16a4b, _AB, _4b16a4b, 4);
-DECL_TRAITS(Abcd8a, _A, _8a, 4);
 DECL_TRAITS(ABcd8a16b2a, _AB, _8a16b2a, 4);
 DECL_TRAITS(ABcd8a8b, _AB, _8a8b, 4);
 DECL_TRAITS(aBcd8b, _B, _8b, 4);
@@ -180,14 +179,12 @@ DECL_TRAITS(aBCdef8c16b2c, _BC, _8c16b2c, 6);
 DECL_TRAITS(aBCdef8c8b, _BC, _8c8b, 6);
 DECL_TRAITS(aBdc16b, _B, _16b, 4);
 DECL_TRAITS(aBdc8b, _B, _8b, 4);
-DECL_TRAITS(aBdCe16b4c, _BC, _16b4c, 5);
 DECL_TRAITS(aBdec16b, _B, _16b, 5);
 DECL_TRAITS(aBdec8b, _B, _8b, 5);
 DECL_TRAITS(aBdefc16b, _B, _16b, 6);
 DECL_TRAITS(aBdefc8b, _B, _8b, 6);
 DECL_TRAITS(Acb16a, _A, _16a, 3);
 DECL_TRAITS(Acb8a, _A, _8a, 3);
-DECL_TRAITS(AcBd16a4b, _AB, _16a4b, 4);
 DECL_TRAITS(aCBd16b16c, _BC, _16b16c, 4);
 DECL_TRAITS(aCBde16b16c, _BC, _16b16c, 5);
 DECL_TRAITS(Acdb16a, _A, _16a, 4);

tests/benchdnn/mkldnn_debug.cpp

@@ -115,8 +115,6 @@ mkldnn_format_tag_t str2tag(const char *str) {
     CASE(gOhwi16o);
     CASE(Goihw8g);
     CASE(Goihw16g);
-    CASE(oIhw8i);
-    CASE(oIhw16i);
     CASE(ncdhw);
     CASE(ndhwc);
     CASE(oidhw);