Merge branch 'rm-conv-bm' into 'master'

Remove some duplicate convolution benchmark cases.

See merge request !270

mace/ops/conv_2d_benchmark.cc

@@ -113,39 +113,21 @@ static void Conv2d(int iters,
 BM_CONV_2D(1, 256, 64, 64, 3, 3, 1, 1, VALID, 256);
 
 BM_CONV_2D(1, 512, 15, 15, 1, 1, 1, 1, VALID, 1024);
-BM_CONV_2D(1, 64, 60, 60, 1, 1, 1, 1, VALID, 128);
 BM_CONV_2D(1, 32, 60, 60, 1, 1, 1, 1, VALID, 128);
 
 BM_CONV_2D(1, 128, 60, 60, 3, 3, 1, 1, VALID, 128);
 BM_CONV_2D(1, 32, 60, 60, 3, 3, 1, 1, SAME, 32);
 BM_CONV_2D(1, 3, 512, 512, 7, 7, 2, 1, SAME, 64);
-BM_CONV_2D(1, 512, 64, 64, 1, 1, 1, 1, SAME, 256);
 
 BM_CONV_2D(1, 128, 16, 16, 3, 3, 1, 1, VALID, 32);
 BM_CONV_2D(1, 128, 64, 64, 3, 3, 1, 1, VALID, 32);
-BM_CONV_2D(1, 128, 128, 128, 3, 3, 1, 1, VALID, 32);
 
 BM_CONV_2D(1, 3, 480, 480, 1, 1, 1, 1, VALID, 3);
 
 BM_CONV_2D(1, 64, 32, 32, 1, 1, 1, 1, VALID, 128);
 BM_CONV_2D(1, 64, 33, 31, 1, 1, 1, 1, VALID, 128);  // Test bad alignments
-BM_CONV_2D(1, 3, 512, 512, 1, 1, 1, 1, VALID, 3);
-BM_CONV_2D(1, 32, 112, 112, 1, 1, 1, 1, VALID, 64);
-BM_CONV_2D(1, 64, 56, 56, 1, 1, 1, 1, VALID, 128);
-BM_CONV_2D(1, 256, 28, 28, 1, 1, 1, 1, VALID, 256);
-BM_CONV_2D(1, 1024, 7, 7, 1, 1, 1, 1, VALID, 1024);
-BM_CONV_2D(1, 64, 32, 32, 3, 3, 1, 1, VALID, 128);
-BM_CONV_2D(1, 64, 33, 31, 3, 3, 1, 1, VALID, 128);
-BM_CONV_2D(1, 3, 512, 512, 3, 3, 1, 1, VALID, 3);
-BM_CONV_2D(1, 64, 32, 32, 3, 3, 1, 1, SAME, 128);
-BM_CONV_2D(1, 64, 33, 31, 3, 3, 1, 1, SAME, 128);
-BM_CONV_2D(1, 64, 32, 32, 3, 3, 2, 1, VALID, 128);
-BM_CONV_2D(1, 3, 512, 512, 3, 3, 2, 1, VALID, 3);
-BM_CONV_2D(1, 64, 33, 31, 3, 3, 2, 1, VALID, 128);
 BM_CONV_2D(1, 64, 32, 32, 3, 3, 2, 1, SAME, 128);
 BM_CONV_2D(1, 64, 33, 31, 3, 3, 2, 1, SAME, 128);
-BM_CONV_2D(1, 64, 32, 32, 5, 5, 1, 1, VALID, 128);
-BM_CONV_2D(1, 64, 32, 31, 5, 5, 1, 1, VALID, 128);
 BM_CONV_2D(1, 64, 32, 32, 5, 5, 1, 1, SAME, 128);
 BM_CONV_2D(1, 64, 32, 31, 5, 5, 1, 1, SAME, 128);