COMPMID-3490 - Nightly fails: android armv7 microtask error
authorManuel Bottini <manuel.bottini@arm.com>
Mon, 18 May 2020 14:00:10 +0000 (15:00 +0100)
committerManuel Bottini <manuel.bottini@arm.com>
Tue, 19 May 2020 10:55:53 +0000 (10:55 +0000)
- Removing OpenMP from failing references

Change-Id: I3a90347dccf55fa22893b42b5236e45f15da19e3
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3219
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
tests/validation/reference/ConvolutionLayer.cpp
tests/validation/reference/GEMM.cpp

index aed976e5ee95f26076c659489724c5d64e14f861..9675901542243d504322f73c0f7f4b22b818cf21 100644 (file)
@@ -69,7 +69,8 @@ SimpleTensor<T> convolution_layer_nchw(const SimpleTensor<T> &src, const SimpleT
     const int end_xi      = output_wh.first * stride_xi;
     const int end_yi      = output_wh.second * stride_yi;
     const int num_batches = src.shape().total_size() / (width_in * height_in * depth_in);
-#if defined(_OPENMP)
+
+#if defined(_OPENMP) && !( defined(__arm__) && defined(__ANDROID__))
     #pragma omp parallel for collapse(5)
 #endif /* _OPENMP */
     for(int r = 0; r < num_batches; ++r)
index 20def87a64e8930e0ca131eb89f13b8eb1db9314..63c7f53b488397223a137b9ba4f91425e375e8eb 100644 (file)
@@ -56,7 +56,7 @@ SimpleTensor<T> gemm(const SimpleTensor<T> &a, const SimpleTensor<T> &b, const S
     const int c_stride_z = N * M;
     const int c_stride_w = N * M * D;
 
-#if defined(_OPENMP)
+#if defined(_OPENMP) && !( defined(__arm__) && defined(__ANDROID__))
     #pragma omp parallel for collapse(2)
 #endif /* _OPENMP */
     for(int w = 0; w < W; ++w)