add support for three-dimentional input in reduce max test=develop

lite/backends/arm/math/reduce_max.cc

@@ -46,6 +46,68 @@ void reduce_n<float>(const float* src,
   }
 }
 
+template <>
+void reduce_first_of_three<float>(const float* src,
+                         float* dst,
+                         int first_in,
+                         int second_in,
+                         int third_in){
+  for (int i = 0; i < second_in; i++){
+    for (int j = 0; j < third_in; j++){
+      dst[i*third_in+j] = src[i*third_in+j];
+      for (int k = 1; k < first_in; k++){
+        dst[i*third_in+j] = src[k*second_in*third_in+i*third_in+j] > dst[i*third_in+j] ? src[k*second_in*third_in+i*third_in+j] : dst[i*third_in+j];
+      }
+    }
+  }
+}
+
+template <>
+void reduce_second_of_three<float>(const float* src,
+                         float* dst,
+                         int first_in,
+                         int second_in,
+                         int third_in){
+  for (int i = 0; i < first_in; i++){
+    for (int j = 0; j < third_in; j++){
+      dst[i*third_in+j] = src[i*second_in*third_in+j];
+      for (int k = 1; k < second_in; k++){
+        dst[i*third_in+j] = src[i*second_in*third_in+third_in*k+j] > dst[i*third_in+j] ? src[i*second_in*third_in+third_in*k+j] : dst[i*third_in+j];
+      }
+    }
+  }
+}
+
+template <>
+void reduce_third_of_three<float>(const float* src,
+                         float* dst,
+                         int first_in,
+                         int second_in,
+                         int third_in){
+  for (int i = 0; i < first_in; i++){
+    for (int j = 0; j < second_in; j++){
+      dst[i*second_in+j] = src[i*second_in*third_in+j*second_in];
+      for (int k = 0; k< third_in; k++){
+        dst[i*second_in+j] = src[i*second_in*third_in+j*second_in+k] > dst[i*second_in+j] ? src[i*second_in*third_in+j*second_in+k] : dst[i*second_in+j];
+      }
+    }
+  }
+}
+
+template <>
+void reduce_all_of_three<float>(const float* src,
+                                 float* dst,
+                                 int first_in,
+                                 int second_in,
+                                 int third_in){
+  float max = src[0];
+  int total_element = first_in * second_in * third_in;
+  for (int i = 0; i <total_element; i++){
+    max = src[i] > max ? src[i] : max;
+  }
+  dst[0] = max;
+}
+
 template <>
 void reduce_c<float>(const float* src,
                      float* dst,

lite/backends/arm/math/reduce_max.h

@@ -35,6 +35,34 @@ void reduce_c(const T* src,
               int height_in,
               int width_in);
 
+template <typename T>
+void reduce_all_of_three(const T* src,
+                         T* dst,
+                         int first_in,
+                         int second_in,
+                         int third_in);
+
+template <typename T>
+void reduce_first_of_three(const T* src,
+                            T* dst,
+                            int first_in,
+                            int second_in,
+                            int third_in);
+
+template <typename T>
+void reduce_second_of_three(const T* src,
+                            T* dst,
+                            int first_in,
+                            int second_in,
+                            int third_in);
+
+template <typename T>
+void reduce_third_of_three(const T* src,
+                            T* dst,
+                            int first_in,
+                            int second_in,
+                            int third_in);
+
 template <typename T>
 void reduce_h(const T* src,
               T* dst,

lite/kernels/arm/reduce_max_compute.cc

@@ -25,6 +25,7 @@ void ReduceMaxCompute::Run() {
   auto& param = Param<operators::ReduceMaxParam>();
   const float* input = param.X->data<float>();
   auto x_dims = param.X->dims();
+  
   int x_rank = x_dims.size();
   float* output = param.Out->mutable_data<float>();
   bool keep_dim = param.keep_dim;
@@ -37,10 +38,43 @@ void ReduceMaxCompute::Run() {
       }
     }
   }
+
+  if (x_dims.size()==3){
+    if (dim.size() == 0 || dim.size() == 3){
+      lite::arm::math::reduce_all_of_three(input, output, x_dims[0], x_dims[1], x_dims[2]);
+    }
+    else if (dim.size() == 1){
+      switch (dim[0])
+      {
+      case 0:
+        lite::arm::math::reduce_first_of_three(input, output, x_dims[0], x_dims[1], x_dims[2]);
+        break;
+      case 1:
+        lite::arm::math::reduce_second_of_three(input, output, x_dims[0], x_dims[1], x_dims[2]);
+        break;
+
+      case 2:
+        lite::arm::math::reduce_third_of_three(input, output, x_dims[0], x_dims[1], x_dims[2]);
+        break;
+      default:
+        LOG(FATAL) << "error!!!";
+      }
+    }
+    else if (dim.size() == 2){
+      
+    }
+    else {
+      LOG(FATAL) << "dim size should not larger than 3!!!";
+    }
+    
+  }
+
+  else if (x_dims.size()==4){
     int n_in = x_dims[0];
     int c_in = x_dims[1];
     int h_in = x_dims[2];
     int w_in = x_dims[3];
+
     if (dim.size() == 0) {
       lite::arm::math::reduce_all(input, output, n_in, c_in, h_in, w_in);
     } else if (dim.size() == 1) {
@@ -73,6 +107,8 @@ void ReduceMaxCompute::Run() {
     } else {
       LOG(FATAL) << "dim's size over than 2, which is not supported now!!";
     }
+  }
+  
 }
 
 }  // namespace arm

lite/tests/kernels/reduce_max_compute_test.cc

@@ -190,6 +190,71 @@ void reduce_hw(const float* src,
   reduce_w(tmp_out, dst, num_in, channel_in, 1, width_in);
 }
 
+void reduce_first_of_three(const float* src,
+                           float* dst,
+                           int first_in,
+                           int second_in,
+                           int third_in){
+
+  for (int i = 0; i < second_in; i++){
+    for (int j = 0; j < third_in; j++){
+      dst[i*third_in+j] = src[i*third_in+j];
+      for (int k = 1; k < first_in; k++){
+        dst[i*third_in+j] = src[k*second_in*third_in+i*third_in+j] > dst[i*third_in+j] ? src[k*second_in*third_in+i*third_in+j] : dst[i*third_in+j];
+      }
+    }
+  }
+}
+
+
+void reduce_second_of_three(const float* src,
+                            float* dst,
+                            int first_in,
+                            int second_in,
+                            int third_in){
+
+  for (int i = 0; i < first_in; i++){
+    for (int j = 0; j < third_in; j++){
+      dst[i*third_in+j] = src[i*second_in*third_in+j];
+      for (int k = 1; k < second_in; k++){
+        dst[i*third_in+j] = src[i*second_in*third_in+third_in*k+j] > dst[i*third_in+j] ? src[i*second_in*third_in+third_in*k+j] : dst[i*third_in+j];
+      }
+    }
+  }
+}
+
+
+void reduce_third_of_three(const float* src,
+                           float* dst,
+                           int first_in,
+                           int second_in,
+                           int third_in){
+
+  for (int i = 0; i < first_in; i++){
+    for (int j = 0; j < second_in; j++){
+      dst[i*second_in+j] = src[i*second_in*third_in+j*second_in];
+      for (int k = 0; k< third_in; k++){
+        dst[i*second_in+j] = src[i*second_in*third_in+j*second_in+k] > dst[i*second_in+j] ? src[i*second_in*third_in+j*second_in+k] : dst[i*second_in+j];
+      }
+    }
+  }
+}
+
+
+void reduce_all_of_three(const float* src,
+                         float* dst,
+                         int first_in,
+                         int second_in,
+                         int third_in){
+  float max = src[0];
+  int total_element = first_in * second_in * third_in;
+  for (int i = 0; i <total_element; i++){
+    max = src[i] > max ? src[i] : max;
+  }
+  dst[0] = max;
+}
+
+
 class ReduceMaxComputeTester : public arena::TestCase {
  protected:
   // common attributes for this op.
@@ -256,11 +321,41 @@ class ReduceMaxComputeTester : public arena::TestCase {
     }
 
     auto* out_data = out->mutable_data<float>();
+    
+    if (x_dims_.size()==3){
+      if (dim_.size() == 0 || dim_.size() == 3){
+        reduce_all_of_three(x_data, out_data, x_dims_[0], x_dims_[1], x_dims_[2]);
+      }
+      else if (dim_.size() == 1){
+        switch (dim_[0])
+        {
+        case 0:
+          reduce_first_of_three(x_data, out_data, x_dims_[0], x_dims_[1], x_dims_[2]);
+          break;
+        case 1:
+          reduce_second_of_three(x_data, out_data, x_dims_[0], x_dims_[1], x_dims_[2]);
+          break;
+
+        case 2:
+          reduce_third_of_three(x_data, out_data, x_dims_[0], x_dims_[1], x_dims_[2]);
+          break;
+        default:
+          LOG(FATAL) << "error!!!";
+        }
+      }
+      else if (dim_.size() == 2){
+        LOG(FATAL) << "invalid dims_!!";              
+      }
+      else {
+        LOG(FATAL) << "dim size should not larger than 3!!!";
+      }
+    
+    }
+    else if (x_dims_.size()==4){
       int in_n = x_dims_[0];
       int in_c = x_dims_[1];
       int in_h = x_dims_[2];
       int in_w = x_dims_[3];
-
       if (dim_.size() == 0) {
         reduce_all(x_data, out_data, in_n, in_c, in_h, in_w);
       } else if (dim_.size() == 1) {
@@ -291,6 +386,11 @@ class ReduceMaxComputeTester : public arena::TestCase {
           LOG(FATAL) << "invalid dims_!!";
         } 
       }
+
+    }
+
+
+    
   }
 
   void PrepareOpDesc(cpp::OpDesc* op_desc) {
@@ -333,6 +433,28 @@ void test_reduce_max(Place place) {
   }
 }
 
+void test_reduce_max_for_three(Place place) {
+  std::vector<std::vector<int>> reduce_dim{
+      {0}, {1}, {2}};
+  for (auto f : {1, 3}) {
+    for (auto s : {1, 2}) {
+      for (auto t : {1, 3}) {
+        for (bool keep_dim : {false, true}) {
+          for (auto dim : reduce_dim) {
+            auto x_dims = DDim(std::vector<int64_t>({f, s, t}));
+            std::unique_ptr<arena::TestCase> tester(
+                new ReduceMaxComputeTester(
+                    place, "def", dim, keep_dim, x_dims));
+            arena::Arena arena(std::move(tester), place, 2e-5);
+            arena.TestPrecision();
+            }
+          }
+        }
+      }
+    }
+  }
+
+
 TEST(ReduceMax, precision) {
 // #ifdef LITE_WITH_X86
 //   Place place(TARGET(kX86));
@@ -340,6 +462,7 @@ TEST(ReduceMax, precision) {
 #ifdef LITE_WITH_ARM
   Place place(TARGET(kARM));
   test_reduce_max(place);
+  test_reduce_max_for_three(place);
 #endif
 }