Merge pull request #3263 from hedaoyuan/simplify_crossmapnormaloptest

Simplify CrossMapNormalOpTest and BlockExpandOpTest.

paddle/function/BlockExpandOpTest.cpp

@@ -18,10 +18,10 @@ limitations under the License. */
 namespace paddle {
 
 TEST(BlockExpandForward, real) {
-  for (size_t batchSize : {5, 32}) {
-    for (size_t channels : {1, 5, 32}) {
-      for (size_t inputHeight : {5, 33, 100}) {
-        for (size_t inputWidth : {5, 32, 96}) {
+  for (size_t batchSize : {5}) {
+    for (size_t channels : {1, 5}) {
+      for (size_t inputHeight : {5, 33}) {
+        for (size_t inputWidth : {5, 32}) {
           for (size_t block : {1, 3, 5}) {
             for (size_t stride : {1, 2}) {
               for (size_t padding : {0, 1}) {
@@ -61,10 +61,10 @@ TEST(BlockExpandForward, real) {
 }
 
 TEST(BlockExpandBackward, real) {
-  for (size_t batchSize : {5, 32}) {
-    for (size_t channels : {1, 5, 32}) {
-      for (size_t inputHeight : {5, 33, 100}) {
-        for (size_t inputWidth : {5, 32, 96}) {
+  for (size_t batchSize : {5}) {
+    for (size_t channels : {1, 5}) {
+      for (size_t inputHeight : {5, 33}) {
+        for (size_t inputWidth : {5, 32}) {
           for (size_t block : {1, 3, 5}) {
             for (size_t stride : {1, 2}) {
               for (size_t padding : {0, 1}) {

paddle/function/CrossMapNormalOpTest.cpp

@@ -18,11 +18,11 @@ limitations under the License. */
 namespace paddle {
 
 TEST(CrossMapNormal, real) {
-  for (size_t numSamples : {5, 32}) {
-    for (size_t channels : {1, 5, 32}) {
-      for (size_t imgSizeH : {5, 33, 100}) {
-        for (size_t imgSizeW : {5, 32, 96}) {
-          for (size_t size : {1, 2, 3, 5, 7}) {
+  for (size_t numSamples : {5}) {
+    for (size_t channels : {1, 5}) {
+      for (size_t imgSizeH : {5, 33}) {
+        for (size_t imgSizeW : {5, 32}) {
+          for (size_t size : {1, 3}) {
             VLOG(3) << " numSamples=" << numSamples << " channels=" << channels
                     << " imgSizeH=" << imgSizeH << " imgSizeW=" << imgSizeW
                     << " size=" << size;
@@ -48,11 +48,11 @@ TEST(CrossMapNormal, real) {
 }
 
 TEST(CrossMapNormalGrad, real) {
-  for (size_t numSamples : {5, 32}) {
-    for (size_t channels : {1, 5, 32}) {
-      for (size_t imgSizeH : {5, 33, 100}) {
-        for (size_t imgSizeW : {5, 32, 96}) {
-          for (size_t size : {1, 2, 3, 5, 7}) {
+  for (size_t numSamples : {5}) {
+    for (size_t channels : {1, 5}) {
+      for (size_t imgSizeH : {5, 33}) {
+        for (size_t imgSizeW : {5, 32}) {
+          for (size_t size : {1, 3}) {
             VLOG(3) << " numSamples=" << numSamples << " channels=" << channels
                     << " imgSizeH=" << imgSizeH << " imgSizeW=" << imgSizeW
                     << " size=" << size;