message: Use new interface to popconv
diff: @@ -79,13 +79,13 @@ CreateConv2D(poplar::Graph &graph,
  unsigned int s_y = window.dimensions(0).stride();
  unsigned int s_x = window.dimensions(1).stride();
  - unsigned int p_y = window.dimensions(0).padding_low();
  - unsigned int p_x = window.dimensions(1).padding_low();
  + unsigned int pl_y = window.dimensions(0).padding_low();
  + unsigned int pl_x = window.dimensions(1).padding_low();
  - if (window.dimensions(0).padding_low() !=
  - window.dimensions(0).padding_high() ||
  - window.dimensions(1).padding_low() !=
  - window.dimensions(1).padding_high()) {
  + unsigned int ph_y = window.dimensions(0).padding_high();
  + unsigned int ph_x = window.dimensions(1).padding_high();
  +
  + if (pl_y != ph_y || pl_x != ph_x) {
  return port::Status(
  port::error::FAILED_PRECONDITION,
  port::StrCat("Unequal paddings not supported on ", inst->name()));
  @@ -94,19 +94,23 @@ CreateConv2D(poplar::Graph &graph,
  poplar::Tensor conv_in = popconv::createInput(graph, dtype,
  n_b, n_y, n_x, n_i,
  f_y, f_x, n_o,
  - s_y, s_x, p_y, p_x,
  + {s_y, s_x},
  + {pl_y, pl_x},
  + {ph_y, ph_x},
  false, "", opts);
  poplar::Tensor conv_kernel = popconv::createWeights(graph, conv_in,
  f_y, f_x, n_o,
  - s_y, s_x, p_y, p_x,
  + {s_y, s_x},
  + {pl_y, pl_x},
  + {ph_y, ph_x},
  false, opts);
  - popconv::mapActivations(graph, conv_in, conv_kernel,
  - s_y, s_x, p_y, p_x, false, opts);
  + popconv::mapActivations(graph, conv_in, conv_kernel, {s_y, s_x},
  + {pl_y, pl_x}, {ph_y, ph_x}, false, opts);
  - popconv::mapWeights(conv_kernel, graph, conv_in,
  - s_y, s_x, p_y, p_x, false, opts);
  + popconv::mapWeights(conv_kernel, graph, conv_in, {s_y, s_x}, {pl_y, pl_x},
  + {ph_y, ph_x}, false, opts);
  poplar::program::Sequence prog;
  @@ -136,11 +140,14 @@ CreateConv2D(poplar::Graph &graph,
  prog.add(poplar::program::Copy(kernel, conv_kernel));
  popstd::mapActivations(graph, in);
  - popconv::mapWeights(kernel, graph, in, s_y, s_x, p_y, p_x, false, opts);
  + popconv::mapWeights(kernel, graph, in, {s_y, s_x}, {pl_y, pl_x},
  + {ph_y, ph_x}, false, opts);
  // Add the convolution
  poplar::Tensor out = popconv::convolution(graph,
  - {s_y, s_x}, {p_y, p_x},
  + {s_y, s_x},
  + {pl_y, pl_x},
  + {ph_y, ph_x},
  n_o, in, kernel, dtype,
  false, false, prog, "", opts);
  