Minor fix

src/maxpool_layer.c

@@ -98,10 +98,12 @@ maxpool_layer make_maxpool_layer(int batch, int h, int w, int c, int size, int s
 
     #endif  // GPU
 	l.bflops = (l.size*l.size*l.c * l.out_h*l.out_w) / 1000000000.;
-    if(stride_x == stride_y)
+    if (maxpool_depth)
-        fprintf(stderr, "max               %d x %d/%2d   %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride_x, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
+        fprintf(stderr, "max-depth         %2dx%2d/%2d   %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride_x, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
+    else if(stride_x == stride_y)
+        fprintf(stderr, "max               %2dx%2d/%2d   %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride_x, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
     else
-        fprintf(stderr, "max             %d x %d/%2dx%2d %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride_x, stride_y, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
+        fprintf(stderr, "max              %2dx%2d/%2dx%2d %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride_x, stride_y, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
 
     if (l.antialiasing) {
         printf("AA:  ");

src/sam_layer.c

@@ -18,7 +18,7 @@ layer make_sam_layer(int batch, int index, int w, int h, int c, int w2, int h2,
     l.out_h = h2;
     l.out_c = c2;
     assert(l.out_c == l.c);
-    assert(l.w == l.out_w & l.h == l.out_h);
+    assert(l.w == l.out_w && l.h == l.out_h);
 
     l.outputs = l.out_w*l.out_h*l.out_c;
     l.inputs = l.outputs;

src/scale_channels_layer.c

@@ -13,7 +13,7 @@ layer make_scale_channels_layer(int batch, int index, int w, int h, int c, int w
     l.w = w;
     l.h = h;
     l.c = c;
-    assert(w == 1 & h == 1);
+    assert(w == 1 && h == 1);
 
     l.out_w = w2;
     l.out_h = h2;