This is an automated email from the ASF dual-hosted git repository. anirudh2290 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push: new ac5036d update docs to explain CPU incompatibilities (#11931) ac5036d is described below commit ac5036da4f72be1a6e03246579b7b5a5a7fa2d57 Author: Thomas Delteil <thomas.delte...@gmail.com> AuthorDate: Wed Aug 8 18:19:42 2018 -0700 update docs to explain CPU incompatibilities (#11931) --- src/operator/nn/convolution-inl.h | 3 ++- src/operator/nn/convolution.cc | 2 +- src/operator/nn/deconvolution-inl.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/operator/nn/convolution-inl.h b/src/operator/nn/convolution-inl.h index d40abaf..a5f384e 100644 --- a/src/operator/nn/convolution-inl.h +++ b/src/operator/nn/convolution-inl.h @@ -103,7 +103,8 @@ struct ConvolutionParam : public dmlc::Parameter<ConvolutionParam> { .add_enum("NDHWC", mshadow::kNDHWC) .set_default(dmlc::optional<int>()) .describe("Set layout for input, output and weight. Empty for\n " - "default layout: NCW for 1d, NCHW for 2d and NCDHW for 3d."); + "default layout: NCW for 1d, NCHW for 2d and NCDHW for 3d." + "NHWC and NDHWC are only supported on GPU."); } // Adjusts kernel size for effects of dilation in the dimension `dim`. index_t DilatedKernelSize(int dim) const { diff --git a/src/operator/nn/convolution.cc b/src/operator/nn/convolution.cc index ef70ccd..e879623 100644 --- a/src/operator/nn/convolution.cc +++ b/src/operator/nn/convolution.cc @@ -426,7 +426,7 @@ then we have:: If ``no_bias`` is set to be true, then the ``bias`` term is ignored. The default data ``layout`` is *NCHW*, namely *(batch_size, channel, height, -width)*. We can choose other layouts such as *NHWC*. +width)*. We can choose other layouts such as *NWC*. If ``num_group`` is larger than 1, denoted by *g*, then split the input ``data`` evenly into *g* parts along the channel axis, and also evenly split ``weight`` diff --git a/src/operator/nn/deconvolution-inl.h b/src/operator/nn/deconvolution-inl.h index b41ecf4..c7ccfb2 100644 --- a/src/operator/nn/deconvolution-inl.h +++ b/src/operator/nn/deconvolution-inl.h @@ -113,7 +113,8 @@ struct DeconvolutionParam : public dmlc::Parameter<DeconvolutionParam> { .add_enum("NDHWC", mshadow::kNDHWC) .set_default(dmlc::optional<int>()) .describe("Set layout for input, output and weight. Empty for " - "default layout, NCW for 1d, NCHW for 2d and NCDHW for 3d."); + "default layout, NCW for 1d, NCHW for 2d and NCDHW for 3d." + "NHWC and NDHWC are only supported on GPU."); } template<size_t ndim>