fix and speedup ci conv test

paddle/fluid/lite/core/op_registry.h

@@ -153,12 +153,9 @@ class KernelRegistor : public lite::Registor<KernelType> {
  public:
   KernelRegistor(const std::string &op_type, const std::string &alias)
       : Registor<KernelType>([=] {
-<<<<<<< HEAD
-=======
           VLOG(3) << "Register kernel " << op_type << " for "
                   << TargetToStr(target) << " " << PrecisionToStr(precision)
                   << " " << DataLayoutToStr(layout) << " alias " << alias;
->>>>>>> gitlab/develop
           KernelRegistry::Global().Register<target, precision, layout>(
               op_type, [=]() -> std::unique_ptr<KernelType> {
                 std::unique_ptr<KernelType> x(new KernelType);

paddle/fluid/lite/kernels/arm/conv_compute_test.cc

@@ -124,6 +124,7 @@ TEST(conv_arm, init) {
 
 TEST(conv_arm, compute) {
   DeviceInfo::Init();
+#if 0
   for (auto n : {1, 2}) {
     for (auto ic : {6, 32 /*, 128*/}) {
       for (auto oc : {6, 32 /*, 128*/}) {
@@ -136,6 +137,20 @@ TEST(conv_arm, compute) {
                     for (auto stride : {1, 2}) {
                       for (auto padding : {0, 1, 2}) {
                         for (auto ks : {1, 3, 5}) {
+#else
+  for (auto n : {1}) {
+    for (auto ic : {6}) {
+      for (auto oc : {6}) {
+        for (auto ih : {9}) {
+          for (auto iw : {9}) {
+            for (auto flag_bias : {false, true}) {
+              for (auto flag_relu : {false, true}) {
+                for (auto depthwise : {false, true}) {
+                  for (auto dilation : {1}) {
+                    for (auto stride : {1}) {
+                      for (auto padding : {0, 1}) {
+                        for (auto ks : {1, 3, 5}) {
+#endif
                           int group = 1;
                           if (depthwise) {  // depthwise convolution ?
                             group = oc = ic;