message: Don't use NCHW or NHCW in tf.layers.conv1d
  * Don't use NCHW or NHCW for conv1d
  Fixes deprecation warning when using tf.layers.conv1d
diff: @@ -150,14 +150,12 @@ class _NonAtrousConvolution(object):
  conv_dims))
  if conv_dims == 1:
  # conv1d uses the 2-d data format names
  - if data_format is None or data_format == "NWC":
  - data_format_2d = "NHWC"
  - elif data_format == "NCW":
  - data_format_2d = "NCHW"
  - else:
  + if data_format is None:
  + data_format = "NWC"
  + elif data_format not in {"NCW", "NWC", "NCHW", "NHWC"}:
  raise ValueError("data_format must be \"NWC\" or \"NCW\".")
  self.strides = strides[0]
  - self.data_format = data_format_2d
  + self.data_format = data_format
  self.conv_op = self._conv1d
  elif conv_dims == 2:
  if data_format is None or data_format == "NHWC":
  