From 0287a432da8794551d7c207a45fa0ce6a5149caf Mon Sep 17 00:00:00 2001 From: "Delteil, Thomas" Date: Mon, 30 Jul 2018 10:15:36 -0700 Subject: [PATCH] update docs to explain CPU incompatibilities --- 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 d40abaf1fd66..a5f384ec44a8 100644 --- a/src/operator/nn/convolution-inl.h +++ b/src/operator/nn/convolution-inl.h @@ -103,7 +103,8 @@ struct ConvolutionParam : public dmlc::Parameter { .add_enum("NDHWC", mshadow::kNDHWC) .set_default(dmlc::optional()) .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 ef70ccd6ec1e..e87962363ff5 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 b41ecf4aa41e..c7ccfb2fb4e8 100644 --- a/src/operator/nn/deconvolution-inl.h +++ b/src/operator/nn/deconvolution-inl.h @@ -113,7 +113,8 @@ struct DeconvolutionParam : public dmlc::Parameter { .add_enum("NDHWC", mshadow::kNDHWC) .set_default(dmlc::optional()) .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