[GitHub] [incubator-mxnet] wkcn commented on a change in pull request #18504: [Improvement] Invoke mkldnn and cudnn BatchNorm when axis != 1

[GitBox]

wkcn commented on a change in pull request #18504:
URL: https://github.com/apache/incubator-mxnet/pull/18504#discussion_r449349061



##########
File path: src/operator/nn/cudnn/cudnn_batch_norm-inl.h
##########
@@ -262,15 +262,26 @@ class CuDNNBatchNormOp {
 
  private:
   void Init(const TBlob &in_data) {
-    if (in_data.ndim() == 4) {
-      for (int i = 0; i < 4; ++i)
-        shape_[i] = in_data.shape_[i];
+    CHECK_GE(param_.axis, 0);
+    CHECK_LT(param_.axis, in_data.ndim());
+    if (param_.axis == 1) {
+      if (in_data.ndim() == 4) {
+        for (int i = 0; i < 4; ++i)
+          shape_[i] = in_data.shape_[i];
+      } else {
+        // when in_data.ndim() != 4
+        shape_[0] = in_data.shape_[0];
+        shape_[1] = in_data.ndim() > 1 ? in_data.shape_[1] : 1;
+        shape_[2] = 1;
+        shape_[3] = in_data.shape_.ProdShape(2, in_data.ndim());
+      }
     } else {
-      // when in_data.ndim() != 4
-      shape_[0] = in_data.shape_[0];
-      shape_[1] = in_data.ndim() > 1 ? in_data.shape_[1] : 1;
+      // reshape to (N, C, 1, D), C is the `param_.axis` dimension
+      shape_[0] = static_cast<dim_t>(in_data.shape_.ProdShape(0, param_.axis));
+      shape_[1] = in_data.shape_[param_.axis];
       shape_[2] = 1;
-      shape_[3] = in_data.shape_.ProdShape(2, in_data.ndim());
+      shape_[3] = static_cast<dim_t>(in_data.shape_.ProdShape(param_.axis + 1,
+            static_cast<int>(in_data.ndim())));

Review comment:
       Yes, the dtype of `.ndim()` is `int32_t`.
   
   variable|dtype
   ---|---
   ProdShape | size_t
   shape_[i] | dim_t, int64_t
   ndim() | int32_t
   
   The signature of `ProdShape` is `size_t ProdShape(int dimstart, int dimend) 
const`.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org